Upgrade to package:objective_c` 4.0 (#1406)

dart-lang · Nov 15, 2024 · e37093f · e37093f
1 parent e509abb
commit e37093f
Show file tree

Hide file tree

Showing 9 changed files with 29,541 additions and 22,462 deletions.
diff --git a/pkgs/cupertino_http/CHANGELOG.md b/pkgs/cupertino_http/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2-wip
+
+* Upgrade to `package:objective_c` 4.0.
+
 ## 2.0.1
 
 * Fix a [bug](https://github.com/dart-lang/http/issues/1398) where

diff --git a/pkgs/cupertino_http/darwin/cupertino_http/Sources/cupertino_http/native_cupertino_bindings.m b/pkgs/cupertino_http/darwin/cupertino_http/Sources/cupertino_http/native_cupertino_bindings.m
diff --git a/pkgs/cupertino_http/darwin/cupertino_http/Sources/cupertino_http/utils.m b/pkgs/cupertino_http/darwin/cupertino_http/Sources/cupertino_http/utils.m
@@ -10,12 +10,3 @@ _DidFinish adaptFinishWithLock(_DidFinishWithLock block) {
     [lock unlock];
   };
 }
-
-void doNotCall() {
-  // TODO(https://github.com/dart-lang/native/issues/1672): Remove
-  // when fixed.
-  // Force the protocol information to be available at runtime.
-  @protocol (NSURLSessionDataDelegate);
-  @protocol (NSURLSessionDownloadDelegate);
-  @protocol (NSURLSessionWebSocketDelegate);
-}
diff --git a/pkgs/cupertino_http/example/integration_test/utils_test.dart b/pkgs/cupertino_http/example/integration_test/utils_test.dart
@@ -36,14 +36,14 @@ void main() {
     test('non-string value', () {
       final d = objc.NSMutableDictionary.new1()
         ..setObject_forKey_(
-            objc.NSNumber.numberWithInteger_(5), 'key'.toNSString());
+            objc.NSNumberCreation.numberWithInteger_(5), 'key'.toNSString());
       expect(() => stringNSDictionaryToMap(d), throwsUnsupportedError);
     });
 
     test('non-string key', () {
       final d = objc.NSMutableDictionary.new1()
         ..setObject_forKey_(
-            'value'.toNSString(), objc.NSNumber.numberWithInteger_(5));
+            'value'.toNSString(), objc.NSNumberCreation.numberWithInteger_(5));
       expect(() => stringNSDictionaryToMap(d), throwsUnsupportedError);
     });
   });

diff --git a/pkgs/cupertino_http/example/pubspec.yaml b/pkgs/cupertino_http/example/pubspec.yaml
@@ -31,7 +31,7 @@ dev_dependencies:
   http_profile: ^0.1.0
   integration_test:
     sdk: flutter
-  objective_c: ^3.0.0
+  objective_c: ^4.0.0
   test: ^1.21.1
   web_socket_conformance_tests:
     path: ../../web_socket_conformance_tests/

diff --git a/pkgs/cupertino_http/ffigen.yaml b/pkgs/cupertino_http/ffigen.yaml
@@ -31,6 +31,7 @@ preamble: |
   // ignore_for_file: return_of_invalid_type
 objc-interfaces:
   include:
+    - 'NSCondition'
     - 'NSHTTPURLResponse'
     - 'NSMutableURLRequest'
     - 'NSOperationQueue'
@@ -43,6 +44,11 @@ objc-interfaces:
     - 'NSURLSessionTask'
     - 'NSURLSessionWebSocketMessage'
     - 'NSURLSessionWebSocketTask'
+objc-protocols:
+  include:
+    - 'NSURLSessionDataDelegate'
+    - 'NSURLSessionDownloadDelegate'
+    - 'NSURLSessionWebSocketDelegate'
 comments:
   style: any
   length: full

diff --git a/pkgs/cupertino_http/lib/src/cupertino_api.dart b/pkgs/cupertino_http/lib/src/cupertino_api.dart
@@ -939,7 +939,7 @@ class URLSession extends _ObjectHolder<ncb.NSURLSession> {
           .registerName('URLSession:downloadTask:didFinishDownloadingToURL:');
       final signature = objc.getProtocolMethodSignature(
           downloadDelegate, didFinishDownloadingToURL,
-          isRequired: true, isInstanceMethod: true);
+          isRequired: true, isInstanceMethod: true)!;
       protoBuilder.implementMethod(didFinishDownloadingToURL, signature,
           linkedLibs.adaptFinishWithLock(asyncFinishDownloading));
     }