[cronet_http] Upgrade jni and jnigen to 0.12.0 (#1311)

dart-lang · Oct 2, 2024 · f59cd79 · f59cd79
1 parent aded576
commit f59cd79
Show file tree

Hide file tree

Showing 12 changed files with 2,335 additions and 2,315 deletions.
diff --git a/pkgs/cronet_http/CHANGELOG.md b/pkgs/cronet_http/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Throw `ClientException` if `CronetClient.send` runs out of Java heap while
   allocating memory for the request body.
+* Upgrade `package:jni` and `package:jnigen` to 0.12.0.
 
 ## 1.3.2
 

diff --git a/pkgs/cronet_http/android/build.gradle b/pkgs/cronet_http/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/pkgs/cronet_http/example/android/app/build.gradle b/pkgs/cronet_http/example/android/app/build.gradle
@@ -28,6 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 android {
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
+    namespace 'io.flutter.cronet_http_example'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/pkgs/cronet_http/example/android/app/src/debug/AndroidManifest.xml b/pkgs/cronet_http/example/android/app/src/debug/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.flutter.cronet_http_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
diff --git a/pkgs/cronet_http/example/android/app/src/main/AndroidManifest.xml b/pkgs/cronet_http/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.flutter.cronet_http_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
    <application
         android:label="cronet_http_example"

diff --git a/pkgs/cronet_http/example/android/app/src/profile/AndroidManifest.xml b/pkgs/cronet_http/example/android/app/src/profile/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.flutter.cronet_http_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
diff --git a/pkgs/cronet_http/example/android/build.gradle b/pkgs/cronet_http/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/pkgs/cronet_http/example/android/gradle/wrapper/gradle-wrapper.properties b/pkgs/cronet_http/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/pkgs/cronet_http/jnigen.yaml b/pkgs/cronet_http/jnigen.yaml
@@ -18,6 +18,3 @@ classes:
   - 'org.chromium.net.UploadDataProviders'
   - 'org.chromium.net.UrlRequest'
   - 'org.chromium.net.UrlResponseInfo'
-
-enable_experiment:
-  - 'interface_implementation'
diff --git a/pkgs/cronet_http/lib/src/cronet_client.dart b/pkgs/cronet_http/lib/src/cronet_client.dart
@@ -157,7 +157,7 @@ jb.UrlRequestCallbackProxy_UrlRequestCallbackInterface _urlRequestCallbacks(
   // The order of callbacks generated by Cronet is documented here:
   // https://developer.android.com/guide/topics/connectivity/cronet/lifecycle
   return jb.UrlRequestCallbackProxy_UrlRequestCallbackInterface.implement(
-      jb.$UrlRequestCallbackProxy_UrlRequestCallbackInterfaceImpl(
+      jb.$UrlRequestCallbackProxy_UrlRequestCallbackInterface(
     onResponseStarted: (urlRequest, responseInfo) {
       responseStream = StreamController();
       final responseHeaders =
@@ -377,7 +377,7 @@ class CronetClient extends BaseClient {
 
     final builder = engine._engine.newUrlRequestBuilder(
       request.url.toString().toJString(),
-      jb.UrlRequestCallbackProxy.new1(
+      jb.UrlRequestCallbackProxy(
           _urlRequestCallbacks(request, responseCompleter, profile)),
       _executor,
     )..setHttpMethod(request.method.toJString());
@@ -407,7 +407,7 @@ class CronetClient extends BaseClient {
       }
 
       builder.setUploadDataProvider(
-          jb.UploadDataProviders.create2(data), _executor);
+          jb.UploadDataProviders.create$2(data), _executor);
     }
     builder.build().start();
     return responseCompleter.future;