diff --git a/pkgs/cronet_http/CHANGELOG.md b/pkgs/cronet_http/CHANGELOG.md index 25d0df3e37..20c7625a71 100644 --- a/pkgs/cronet_http/CHANGELOG.md +++ b/pkgs/cronet_http/CHANGELOG.md @@ -1,6 +1,7 @@ ## 1.3.1-wip * Add relevant rules with the ProGuard to avoid runtime exceptions. +* Upgrade `package:jnigen` to 0.9.2 to fix a bug for 32-bit architectures. ## 1.3.0 diff --git a/pkgs/cronet_http/lib/src/jni/jni_bindings.dart b/pkgs/cronet_http/lib/src/jni/jni_bindings.dart index 4db04a9c6a..8dcf00b01e 100644 --- a/pkgs/cronet_http/lib/src/jni/jni_bindings.dart +++ b/pkgs/cronet_http/lib/src/jni/jni_bindings.dart @@ -749,7 +749,7 @@ class URL extends jni.JObject { ( ffi.Pointer, ffi.Pointer, - ffi.Int64, + ffi.Int32, ffi.Pointer )>)>>("globalEnv_NewObject") .asFunction< @@ -831,7 +831,7 @@ class URL extends jni.JObject { ( ffi.Pointer, ffi.Pointer, - ffi.Int64, + ffi.Int32, ffi.Pointer, ffi.Pointer )>)>>("globalEnv_NewObject") @@ -1544,7 +1544,7 @@ class Executors extends jni.JObject { static final _newFixedThreadPool = ProtectedJniExtensions.lookup< ffi.NativeFunction< jni.JniResult Function(ffi.Pointer, - jni.JMethodIDPtr, ffi.VarArgs<(ffi.Int64,)>)>>( + jni.JMethodIDPtr, ffi.VarArgs<(ffi.Int32,)>)>>( "globalEnv_CallStaticObjectMethod") .asFunction< jni.JniResult Function( @@ -1568,7 +1568,7 @@ class Executors extends jni.JObject { static final _newWorkStealingPool = ProtectedJniExtensions.lookup< ffi.NativeFunction< jni.JniResult Function(ffi.Pointer, - jni.JMethodIDPtr, ffi.VarArgs<(ffi.Int64,)>)>>( + jni.JMethodIDPtr, ffi.VarArgs<(ffi.Int32,)>)>>( "globalEnv_CallStaticObjectMethod") .asFunction< jni.JniResult Function( @@ -1619,7 +1619,7 @@ class Executors extends jni.JObject { jni.JniResult Function( ffi.Pointer, jni.JMethodIDPtr, - ffi.VarArgs<(ffi.Int64, ffi.Pointer)>)>>( + ffi.VarArgs<(ffi.Int32, ffi.Pointer)>)>>( "globalEnv_CallStaticObjectMethod") .asFunction< jni.JniResult Function(ffi.Pointer, jni.JMethodIDPtr, int, @@ -1808,7 +1808,7 @@ class Executors extends jni.JObject { static final _newScheduledThreadPool = ProtectedJniExtensions.lookup< ffi.NativeFunction< jni.JniResult Function(ffi.Pointer, - jni.JMethodIDPtr, ffi.VarArgs<(ffi.Int64,)>)>>( + jni.JMethodIDPtr, ffi.VarArgs<(ffi.Int32,)>)>>( "globalEnv_CallStaticObjectMethod") .asFunction< jni.JniResult Function( @@ -1834,7 +1834,7 @@ class Executors extends jni.JObject { jni.JniResult Function( ffi.Pointer, jni.JMethodIDPtr, - ffi.VarArgs<(ffi.Int64, ffi.Pointer)>)>>( + ffi.VarArgs<(ffi.Int32, ffi.Pointer)>)>>( "globalEnv_CallStaticObjectMethod") .asFunction< jni.JniResult Function(ffi.Pointer, jni.JMethodIDPtr, int, @@ -2457,7 +2457,7 @@ class CronetEngine_Builder extends jni.JObject { static final _enableQuic = ProtectedJniExtensions.lookup< ffi.NativeFunction< jni.JniResult Function(ffi.Pointer, jni.JMethodIDPtr, - ffi.VarArgs<(ffi.Int64,)>)>>("globalEnv_CallObjectMethod") + ffi.VarArgs<(ffi.Uint8,)>)>>("globalEnv_CallObjectMethod") .asFunction< jni.JniResult Function( ffi.Pointer, jni.JMethodIDPtr, int)>(); @@ -2480,7 +2480,7 @@ class CronetEngine_Builder extends jni.JObject { static final _enableHttp2 = ProtectedJniExtensions.lookup< ffi.NativeFunction< jni.JniResult Function(ffi.Pointer, jni.JMethodIDPtr, - ffi.VarArgs<(ffi.Int64,)>)>>("globalEnv_CallObjectMethod") + ffi.VarArgs<(ffi.Uint8,)>)>>("globalEnv_CallObjectMethod") .asFunction< jni.JniResult Function( ffi.Pointer, jni.JMethodIDPtr, int)>(); @@ -2503,7 +2503,7 @@ class CronetEngine_Builder extends jni.JObject { static final _enableSdch = ProtectedJniExtensions.lookup< ffi.NativeFunction< jni.JniResult Function(ffi.Pointer, jni.JMethodIDPtr, - ffi.VarArgs<(ffi.Int64,)>)>>("globalEnv_CallObjectMethod") + ffi.VarArgs<(ffi.Uint8,)>)>>("globalEnv_CallObjectMethod") .asFunction< jni.JniResult Function( ffi.Pointer, jni.JMethodIDPtr, int)>(); @@ -2526,7 +2526,7 @@ class CronetEngine_Builder extends jni.JObject { static final _enableBrotli = ProtectedJniExtensions.lookup< ffi.NativeFunction< jni.JniResult Function(ffi.Pointer, jni.JMethodIDPtr, - ffi.VarArgs<(ffi.Int64,)>)>>("globalEnv_CallObjectMethod") + ffi.VarArgs<(ffi.Uint8,)>)>>("globalEnv_CallObjectMethod") .asFunction< jni.JniResult Function( ffi.Pointer, jni.JMethodIDPtr, int)>(); @@ -2549,7 +2549,7 @@ class CronetEngine_Builder extends jni.JObject { static final _enableHttpCache = ProtectedJniExtensions.lookup< ffi.NativeFunction< jni.JniResult Function(ffi.Pointer, - jni.JMethodIDPtr, ffi.VarArgs<(ffi.Int64, ffi.Int64)>)>>( + jni.JMethodIDPtr, ffi.VarArgs<(ffi.Int32, ffi.Int64)>)>>( "globalEnv_CallObjectMethod") .asFunction< jni.JniResult Function( @@ -2579,8 +2579,8 @@ class CronetEngine_Builder extends jni.JObject { ffi.VarArgs< ( ffi.Pointer, - ffi.Int64, - ffi.Int64 + ffi.Int32, + ffi.Int32 )>)>>("globalEnv_CallObjectMethod") .asFunction< jni.JniResult Function(ffi.Pointer, jni.JMethodIDPtr, @@ -2612,7 +2612,7 @@ class CronetEngine_Builder extends jni.JObject { ( ffi.Pointer, ffi.Pointer, - ffi.Int64, + ffi.Uint8, ffi.Pointer )>)>>("globalEnv_CallObjectMethod") .asFunction< @@ -2654,7 +2654,7 @@ class CronetEngine_Builder extends jni.JObject { jni.JniResult Function( ffi.Pointer, jni.JMethodIDPtr, - ffi.VarArgs<(ffi.Int64,)>)>>("globalEnv_CallObjectMethod") + ffi.VarArgs<(ffi.Uint8,)>)>>("globalEnv_CallObjectMethod") .asFunction< jni.JniResult Function( ffi.Pointer, jni.JMethodIDPtr, int)>(); @@ -2818,7 +2818,7 @@ class CronetEngine extends jni.JObject { jni.JThrowablePtr Function( ffi.Pointer, jni.JMethodIDPtr, - ffi.VarArgs<(ffi.Pointer, ffi.Int64)>)>>( + ffi.VarArgs<(ffi.Pointer, ffi.Uint8)>)>>( "globalEnv_CallVoidMethod") .asFunction< jni.JThrowablePtr Function(ffi.Pointer, jni.JMethodIDPtr, @@ -3179,8 +3179,8 @@ class UploadDataProviders extends jni.JObject { ffi.VarArgs< ( ffi.Pointer, - ffi.Int64, - ffi.Int64 + ffi.Int32, + ffi.Int32 )>)>>("globalEnv_CallStaticObjectMethod") .asFunction< jni.JniResult Function(ffi.Pointer, jni.JMethodIDPtr, @@ -3393,7 +3393,7 @@ class UrlRequest_Builder extends jni.JObject { static final _setPriority = ProtectedJniExtensions.lookup< ffi.NativeFunction< jni.JniResult Function(ffi.Pointer, jni.JMethodIDPtr, - ffi.VarArgs<(ffi.Int64,)>)>>("globalEnv_CallObjectMethod") + ffi.VarArgs<(ffi.Int32,)>)>>("globalEnv_CallObjectMethod") .asFunction< jni.JniResult Function( ffi.Pointer, jni.JMethodIDPtr, int)>(); @@ -3927,7 +3927,7 @@ class UrlRequest_StatusListener extends jni.JObject { jni.JThrowablePtr Function( ffi.Pointer, jni.JMethodIDPtr, - ffi.VarArgs<(ffi.Int64,)>)>>("globalEnv_CallVoidMethod") + ffi.VarArgs<(ffi.Int32,)>)>>("globalEnv_CallVoidMethod") .asFunction< jni.JThrowablePtr Function( ffi.Pointer, jni.JMethodIDPtr, int)>(); diff --git a/pkgs/cronet_http/pubspec.yaml b/pkgs/cronet_http/pubspec.yaml index 8d7c5d2f61..d82e69a04b 100644 --- a/pkgs/cronet_http/pubspec.yaml +++ b/pkgs/cronet_http/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: dev_dependencies: dart_flutter_team_lints: ^2.0.0 - jnigen: ^0.9.1 + jnigen: ^0.9.2 xml: ^6.1.0 yaml_edit: ^2.0.3