[jnigen] Use isolate_id instead of thread_id (https://github.com/dart-lang/jnigen/issues/360)
diff --git a/pkgs/jni/example/pubspec.lock b/pkgs/jni/example/pubspec.lock index 1fd2db8..0824b6e 100644 --- a/pkgs/jni/example/pubspec.lock +++ b/pkgs/jni/example/pubspec.lock
@@ -5,26 +5,26 @@ dependency: transitive description: name: _fe_analyzer_shared - sha256: a36ec4843dc30ea6bf652bf25e3448db6c5e8bcf4aa55f063a5d1dad216d8214 + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a url: "https://pub.dev" source: hosted - version: "58.0.0" + version: "61.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: cc4242565347e98424ce9945c819c192ec0838cb9d1f6aa4a97cc96becbc5b27 + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.13.0" args: dependency: transitive description: name: args - sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.2" async: dependency: transitive description: @@ -61,10 +61,10 @@ dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" convert: dependency: transitive description: @@ -85,10 +85,10 @@ dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" cupertino_icons: dependency: "direct main" description: @@ -109,10 +109,10 @@ dependency: "direct main" description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.0" file: dependency: transitive description: @@ -135,10 +135,10 @@ dependency: "direct dev" description: name: flutter_lints - sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" flutter_test: dependency: "direct dev" description: flutter @@ -161,10 +161,10 @@ dependency: transitive description: name: glob - sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" http_multi_server: dependency: transitive description: @@ -213,34 +213,34 @@ dependency: transitive description: name: lints - sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.1" logging: dependency: transitive description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" matcher: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -293,10 +293,10 @@ dependency: transitive description: name: plugin_platform_interface - sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" pool: dependency: transitive description: @@ -317,42 +317,42 @@ dependency: transitive description: name: pub_semver - sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" shelf: dependency: transitive description: name: shelf - sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.1" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler - sha256: aef74dc9195746a384843102142ab65b6a4735bb3beea791e63527b88cc83306 + sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" shelf_static: dependency: transitive description: name: shelf_static - sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c + sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8 + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" sky_engine: dependency: transitive description: flutter @@ -378,10 +378,10 @@ dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -426,34 +426,34 @@ dependency: "direct dev" description: name: test - sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4" + sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46" url: "https://pub.dev" source: hosted - version: "1.24.1" + version: "1.24.3" test_api: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" test_core: dependency: transitive description: name: test_core - sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93" + sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.5.3" typed_data: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" vector_math: dependency: transitive description: @@ -466,18 +466,26 @@ dependency: transitive description: name: vm_service - sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe + sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f url: "https://pub.dev" source: hosted - version: "11.3.0" + version: "11.7.1" watcher: dependency: transitive description: name: watcher - sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: @@ -506,10 +514,10 @@ dependency: transitive description: name: yaml - sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.1.0 <4.0.0" flutter: ">=2.11.0"
diff --git a/pkgs/jni/example/pubspec.yaml b/pkgs/jni/example/pubspec.yaml index 30408f9..ce06464 100644 --- a/pkgs/jni/example/pubspec.yaml +++ b/pkgs/jni/example/pubspec.yaml
@@ -18,7 +18,7 @@ version: 1.0.0+1 environment: - sdk: '>=2.17.5 <4.0.0' + sdk: '>=3.1.0 <4.0.0' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions
diff --git a/pkgs/jni/java/src/main/java/com/github/dart_lang/jni/PortProxy.java b/pkgs/jni/java/src/main/java/com/github/dart_lang/jni/PortProxy.java index bae1c32..77cff13 100644 --- a/pkgs/jni/java/src/main/java/com/github/dart_lang/jni/PortProxy.java +++ b/pkgs/jni/java/src/main/java/com/github/dart_lang/jni/PortProxy.java
@@ -12,12 +12,12 @@ } private final long port; - private final long threadId; + private final long isolateId; private final long functionPtr; - private PortProxy(long port, long threadId, long functionPtr) { + private PortProxy(long port, long isolateId, long functionPtr) { this.port = port; - this.threadId = threadId; + this.isolateId = isolateId; this.functionPtr = functionPtr; } @@ -60,16 +60,16 @@ } } - public static Object newInstance(String binaryName, long port, long threadId, long functionPtr) + public static Object newInstance(String binaryName, long port, long isolateId, long functionPtr) throws ClassNotFoundException { Class<?> clazz = Class.forName(binaryName); return Proxy.newProxyInstance( - clazz.getClassLoader(), new Class[] {clazz}, new PortProxy(port, threadId, functionPtr)); + clazz.getClassLoader(), new Class[] {clazz}, new PortProxy(port, isolateId, functionPtr)); } @Override public Object invoke(Object proxy, Method method, Object[] args) { - Object[] result = _invoke(port, threadId, functionPtr, proxy, getDescriptor(method), args); + Object[] result = _invoke(port, isolateId, functionPtr, proxy, getDescriptor(method), args); _cleanUp((Long) result[0]); return result[1]; } @@ -79,7 +79,7 @@ /// [1]: The result of the invocation. private native Object[] _invoke( long port, - long threadId, + long isolateId, long functionPtr, Object proxy, String methodDescriptor,
diff --git a/pkgs/jni/lib/src/jni.dart b/pkgs/jni/lib/src/jni.dart index 8145642..d6836b0 100644 --- a/pkgs/jni/lib/src/jni.dart +++ b/pkgs/jni/lib/src/jni.dart
@@ -64,8 +64,10 @@ _dylibDir = dylibDir; } + /// Initializes DartApiDL used for Continuations and interface implementation. static void initDLApi() { - // Initializing DartApiDL used for Continuations. + assert(NativeApi.majorVersion == 2); + assert(NativeApi.minorVersion >= 3); final result = _bindings.InitDartApiDL(NativeApi.initializeApiDLData); assert(result == 0); }
diff --git a/pkgs/jni/lib/src/jobject.dart b/pkgs/jni/lib/src/jobject.dart index 26df6be..c5e88c1 100644 --- a/pkgs/jni/lib/src/jobject.dart +++ b/pkgs/jni/lib/src/jobject.dart
@@ -128,7 +128,7 @@ : (T == JObject ? JObject.fromRef : JString.fromRef); result = ctor(ref) as T; break; - case Pointer<Void>: // JObjectPtr + case const (Pointer<Void>): // JObjectPtr finalCallType = _getCallType( callType, JniCallType.objectType, {JniCallType.objectType}); result = function(finalCallType).object as T;
diff --git a/pkgs/jni/lib/src/jvalues.dart b/pkgs/jni/lib/src/jvalues.dart index cc99b11..84439bf 100644 --- a/pkgs/jni/lib/src/jvalues.dart +++ b/pkgs/jni/lib/src/jvalues.dart
@@ -22,8 +22,8 @@ case bool: pos.ref.z = arg ? 1 : 0; break; - case Pointer<Void>: - case Pointer<Never>: // for nullptr + case const (Pointer<Void>): + case const (Pointer<Never>): // for nullptr pos.ref.l = arg; break; case double:
diff --git a/pkgs/jni/lib/src/third_party/jni_bindings_generated.dart b/pkgs/jni/lib/src/third_party/jni_bindings_generated.dart index ef83bb5..bdd6ab7 100644 --- a/pkgs/jni/lib/src/third_party/jni_bindings_generated.dart +++ b/pkgs/jni/lib/src/third_party/jni_bindings_generated.dart
@@ -257,13 +257,13 @@ /// /// If [exception] is null, it means the result is valid. /// It's assumed that the caller knows the expected type in [result]. -class JniResult extends ffi.Struct { +final class JniResult extends ffi.Struct { external JValue value; external JThrowablePtr exception; } -class JValue extends ffi.Union { +final class JValue extends ffi.Union { @JBooleanMarker() external int z; @@ -306,7 +306,7 @@ typedef JThrowablePtr = JObjectPtr; /// Similar to [JniResult] but for class lookups. -class JniClassLookupResult extends ffi.Struct { +final class JniClassLookupResult extends ffi.Struct { external JClassPtr value; external JThrowablePtr exception; @@ -315,7 +315,7 @@ typedef JClassPtr = JObjectPtr; /// Similar to [JniResult] but for method/field ID lookups. -class JniPointerResult extends ffi.Struct { +final class JniPointerResult extends ffi.Struct { external ffi.Pointer<ffi.Void> value; external JThrowablePtr exception; @@ -323,7 +323,7 @@ /// JniExceptionDetails holds 2 jstring objects, one is the result of /// calling `toString` on exception object, other is stack trace; -class JniExceptionDetails extends ffi.Struct { +final class JniExceptionDetails extends ffi.Struct { external JStringPtr message; external JStringPtr stacktrace; @@ -337,7 +337,7 @@ /// Flutter embedding checks for pending JNI exceptions before an FFI transition, which requires us /// to check for and clear the exception before returning to dart code, which requires these functions /// to return result types. -class JniAccessorsStruct extends ffi.Struct { +final class JniAccessorsStruct extends ffi.Struct { external ffi.Pointer< ffi.NativeFunction< JniClassLookupResult Function( @@ -378,8 +378,8 @@ newObject; external ffi.Pointer< - ffi.NativeFunction< - JniResult Function(JSizeMarker length, ffi.Int type)>> + ffi + .NativeFunction<JniResult Function(JSizeMarker length, ffi.Int type)>> newPrimitiveArray; external ffi.Pointer< @@ -421,27 +421,27 @@ typedef JMethodIDPtr = ffi.Pointer<jmethodID_>; -class jmethodID_ extends ffi.Opaque {} +final class jmethodID_ extends ffi.Opaque {} /// "cardinal indices and sizes" typedef JSizeMarker = JIntMarker; typedef JArrayPtr = JObjectPtr; typedef JFieldIDPtr = ffi.Pointer<jfieldID_>; -class jfieldID_ extends ffi.Opaque {} +final class jfieldID_ extends ffi.Opaque {} typedef JavaVM = ffi.Pointer<JNIInvokeInterface>; /// JNI invocation interface. -class JNIInvokeInterface extends ffi.Struct { +final class JNIInvokeInterface extends ffi.Struct { external ffi.Pointer<ffi.Void> reserved0; external ffi.Pointer<ffi.Void> reserved1; external ffi.Pointer<ffi.Void> reserved2; - external ffi.Pointer< - ffi.NativeFunction<JIntMarker Function(ffi.Pointer<JavaVM1> vm)>> + external ffi + .Pointer<ffi.NativeFunction<JIntMarker Function(ffi.Pointer<JavaVM1> vm)>> DestroyJavaVM; external ffi.Pointer< @@ -451,8 +451,8 @@ ffi.Pointer<ffi.Pointer<JniEnv>> p_env, ffi.Pointer<ffi.Void> thr_args)>> AttachCurrentThread; - external ffi.Pointer< - ffi.NativeFunction<JIntMarker Function(ffi.Pointer<JavaVM1> vm)>> + external ffi + .Pointer<ffi.NativeFunction<JIntMarker Function(ffi.Pointer<JavaVM1> vm)>> DetachCurrentThread; external ffi.Pointer< @@ -474,7 +474,7 @@ typedef JniEnv = ffi.Pointer<JNINativeInterface>; /// Table of interface function pointers. -class JNINativeInterface extends ffi.Struct { +final class JNINativeInterface extends ffi.Struct { external ffi.Pointer<ffi.Void> reserved0; external ffi.Pointer<ffi.Void> reserved1; @@ -551,12 +551,12 @@ ffi.NativeFunction<JThrowablePtr Function(ffi.Pointer<JniEnv1> env)>> ExceptionOccurred; - external ffi.Pointer< - ffi.NativeFunction<ffi.Void Function(ffi.Pointer<JniEnv1> env)>> + external ffi + .Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<JniEnv1> env)>> ExceptionDescribe; - external ffi.Pointer< - ffi.NativeFunction<ffi.Void Function(ffi.Pointer<JniEnv1> env)>> + external ffi + .Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<JniEnv1> env)>> ExceptionClear; external ffi.Pointer< @@ -1933,7 +1933,7 @@ typedef JFloatArrayPtr = JArrayPtr; typedef JDoubleArrayPtr = JArrayPtr; -class JNINativeMethod extends ffi.Struct { +final class JNINativeMethod extends ffi.Struct { external ffi.Pointer<ffi.Char> name; external ffi.Pointer<ffi.Char> signature; @@ -1950,7 +1950,7 @@ static const int JNIWeakGlobalRefType = 3; } -class JavaVMInitArgs extends ffi.Struct { +final class JavaVMInitArgs extends ffi.Struct { /// use JNI_VERSION_1_2 or later @JIntMarker() external int version; @@ -1966,13 +1966,13 @@ /// JNI 1.2+ initialization. (As of 1.6, the pre-1.2 structures are no /// longer supported.) -class JavaVMOption extends ffi.Struct { +final class JavaVMOption extends ffi.Struct { external ffi.Pointer<ffi.Char> optionString; external ffi.Pointer<ffi.Void> extraInfo; } -class CallbackResult extends ffi.Struct { +final class CallbackResult extends ffi.Struct { external MutexLock lock; external ConditionVariable cond; @@ -1987,7 +1987,7 @@ typedef pthread_mutex_t = __darwin_pthread_mutex_t; typedef __darwin_pthread_mutex_t = _opaque_pthread_mutex_t; -class _opaque_pthread_mutex_t extends ffi.Struct { +final class _opaque_pthread_mutex_t extends ffi.Struct { @ffi.Long() external int __sig; @@ -1999,7 +1999,7 @@ typedef pthread_cond_t = __darwin_pthread_cond_t; typedef __darwin_pthread_cond_t = _opaque_pthread_cond_t; -class _opaque_pthread_cond_t extends ffi.Struct { +final class _opaque_pthread_cond_t extends ffi.Struct { @ffi.Long() external int __sig; @@ -2007,7 +2007,7 @@ external ffi.Array<ffi.Char> __opaque; } -class GlobalJniEnvStruct extends ffi.Struct { +final class GlobalJniEnvStruct extends ffi.Struct { external ffi.Pointer<ffi.Void> reserved0; external ffi.Pointer<ffi.Void> reserved1; @@ -2030,12 +2030,12 @@ ffi.NativeFunction< JniClassLookupResult Function(ffi.Pointer<ffi.Char> name)>> FindClass; - external ffi.Pointer< - ffi.NativeFunction<JniPointerResult Function(JObjectPtr method)>> + external ffi + .Pointer<ffi.NativeFunction<JniPointerResult Function(JObjectPtr method)>> FromReflectedMethod; - external ffi.Pointer< - ffi.NativeFunction<JniPointerResult Function(JObjectPtr field)>> + external ffi + .Pointer<ffi.NativeFunction<JniPointerResult Function(JObjectPtr field)>> FromReflectedField; external ffi.Pointer< @@ -2080,33 +2080,34 @@ FatalError; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JIntMarker capacity)>> + .Pointer<ffi.NativeFunction<JniResult Function(JIntMarker capacity)>> PushLocalFrame; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JObjectPtr result)>> + .Pointer<ffi.NativeFunction<JniResult Function(JObjectPtr result)>> PopLocalFrame; external ffi.Pointer<ffi.NativeFunction<JniResult Function(JObjectPtr obj)>> NewGlobalRef; - external ffi.Pointer< - ffi.NativeFunction<JThrowablePtr Function(JObjectPtr globalRef)>> + external ffi + .Pointer<ffi.NativeFunction<JThrowablePtr Function(JObjectPtr globalRef)>> DeleteGlobalRef; - external ffi.Pointer< - ffi.NativeFunction<JThrowablePtr Function(JObjectPtr localRef)>> + external ffi + .Pointer<ffi.NativeFunction<JThrowablePtr Function(JObjectPtr localRef)>> DeleteLocalRef; external ffi.Pointer< - ffi.NativeFunction< - JniResult Function(JObjectPtr ref1, JObjectPtr ref2)>> IsSameObject; + ffi + .NativeFunction<JniResult Function(JObjectPtr ref1, JObjectPtr ref2)>> + IsSameObject; external ffi.Pointer<ffi.NativeFunction<JniResult Function(JObjectPtr obj)>> NewLocalRef; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JIntMarker capacity)>> + .Pointer<ffi.NativeFunction<JniResult Function(JIntMarker capacity)>> EnsureLocalCapacity; external ffi.Pointer<ffi.NativeFunction<JniResult Function(JClassPtr clazz)>> @@ -2132,8 +2133,9 @@ GetObjectClass; external ffi.Pointer< - ffi.NativeFunction< - JniResult Function(JObjectPtr obj, JClassPtr clazz)>> IsInstanceOf; + ffi + .NativeFunction<JniResult Function(JObjectPtr obj, JClassPtr clazz)>> + IsInstanceOf; external ffi.Pointer< ffi.NativeFunction< @@ -2878,7 +2880,7 @@ NewString; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JStringPtr string)>> + .Pointer<ffi.NativeFunction<JniResult Function(JStringPtr string)>> GetStringLength; external ffi.Pointer< @@ -2898,7 +2900,7 @@ NewStringUTF; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JStringPtr string)>> + .Pointer<ffi.NativeFunction<JniResult Function(JStringPtr string)>> GetStringUTFLength; external ffi.Pointer< @@ -2933,35 +2935,35 @@ SetObjectArrayElement; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> + .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> NewBooleanArray; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> + .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> NewByteArray; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> + .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> NewCharArray; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> + .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> NewShortArray; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> + .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> NewIntArray; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> + .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> NewLongArray; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> + .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> NewFloatArray; external ffi - .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> + .Pointer<ffi.NativeFunction<JniResult Function(JSizeMarker length)>> NewDoubleArray; external ffi.Pointer< @@ -3257,8 +3259,8 @@ ffi.Pointer<ffi.Void> address, JLongMarker capacity)>> NewDirectByteBuffer; - external ffi.Pointer< - ffi.NativeFunction<JniPointerResult Function(JObjectPtr buf)>> + external ffi + .Pointer<ffi.NativeFunction<JniPointerResult Function(JObjectPtr buf)>> GetDirectBufferAddress; external ffi.Pointer<ffi.NativeFunction<JniResult Function(JObjectPtr buf)>>
diff --git a/pkgs/jni/pubspec.yaml b/pkgs/jni/pubspec.yaml index 8344249..d4a8da9 100644 --- a/pkgs/jni/pubspec.yaml +++ b/pkgs/jni/pubspec.yaml
@@ -3,12 +3,12 @@ # BSD-style license that can be found in the LICENSE file. name: jni -description: Library to access JNI from dart and flutter +description: Library to access JNI from Dart and Flutter. version: 0.6.0-wip.2 repository: https://github.com/dart-lang/jnigen/tree/main/jni environment: - sdk: '>=2.17.1 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: '>=2.11.0' dependencies: @@ -21,7 +21,7 @@ dev_dependencies: ## Pin ffigen version because we are depending on internal APIs. - ffigen: 7.2.10 + ffigen: 8.0.2 flutter_lints: ^2.0.0 test: ^1.21.1 logging: ^1.1.1
diff --git a/pkgs/jni/src/dartjni.c b/pkgs/jni/src/dartjni.c index df8feb7..5c34c36 100644 --- a/pkgs/jni/src/dartjni.c +++ b/pkgs/jni/src/dartjni.c
@@ -623,7 +623,7 @@ return (JniResult){.value = {.j = 0}, .exception = check_exception()}; jobject _result = (*jniEnv)->CallStaticObjectMethod( jniEnv, _c_PortProxy, _m_PortProxy__newInstance, binaryName, port, - thread_id(), functionPtr); + (jlong)Dart_CurrentIsolate_DL(), functionPtr); return to_global_ref_result(_result); } @@ -645,13 +645,13 @@ Java_com_github_dart_1lang_jni_PortProxy__1invoke(JNIEnv* env, jobject thiz, jlong port, - jlong threadId, + jlong isolateId, jlong functionPtr, jobject proxy, jstring methodDescriptor, jobjectArray args) { CallbackResult* result = (CallbackResult*)malloc(sizeof(CallbackResult)); - if (threadId != thread_id()) { + if (isolateId != (jlong)Dart_CurrentIsolate_DL()) { init_lock(&result->lock); init_cond(&result->cond); acquire_lock(&result->lock);
diff --git a/pkgs/jni/src/dartjni.h b/pkgs/jni/src/dartjni.h index cca31f4..0a7f669 100644 --- a/pkgs/jni/src/dartjni.h +++ b/pkgs/jni/src/dartjni.h
@@ -124,16 +124,6 @@ #endif -static inline uint64_t thread_id() { -#ifdef _WIN32 - return GetCurrentThreadId(); -#elif defined __APPLE__ - return pthread_mach_thread_np(pthread_self()); -#else - return pthread_self(); -#endif -} - typedef struct CallbackResult { MutexLock lock; ConditionVariable cond;
diff --git a/pkgs/jnigen/android_test_runner/pubspec.yaml b/pkgs/jnigen/android_test_runner/pubspec.yaml index a457e77..fccc86e 100644 --- a/pkgs/jnigen/android_test_runner/pubspec.yaml +++ b/pkgs/jnigen/android_test_runner/pubspec.yaml
@@ -19,7 +19,7 @@ version: 1.0.0+1 environment: - sdk: '>=2.19.6 <3.0.0' + sdk: '>=3.1.0 <4.0.0' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions
diff --git a/pkgs/jnigen/example/in_app_java/lib/android_utils.dart b/pkgs/jnigen/example/in_app_java/lib/android_utils.dart index b14813f..c4a8f04 100644 --- a/pkgs/jnigen/example/in_app_java/lib/android_utils.dart +++ b/pkgs/jnigen/example/in_app_java/lib/android_utils.dart
@@ -323,9 +323,9 @@ static const EMOJI_FALLBACK = 2; static final _init = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("EmojiCompat__init") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "EmojiCompat__init") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public androidx.emoji2.text.EmojiCompat init(android.content.Context context) @@ -373,9 +373,9 @@ } static final _init2 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("EmojiCompat__init2") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "EmojiCompat__init2") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public androidx.emoji2.text.EmojiCompat init(androidx.emoji2.text.EmojiCompat.Config config) @@ -414,9 +414,9 @@ } static final _reset = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("EmojiCompat__reset") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "EmojiCompat__reset") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public androidx.emoji2.text.EmojiCompat reset(androidx.emoji2.text.EmojiCompat.Config config) @@ -432,9 +432,9 @@ } static final _reset1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("EmojiCompat__reset1") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "EmojiCompat__reset1") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public androidx.emoji2.text.EmojiCompat reset(androidx.emoji2.text.EmojiCompat emojiCompat) @@ -480,9 +480,9 @@ } static final _load = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("EmojiCompat__load") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "EmojiCompat__load") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void load() @@ -549,9 +549,9 @@ } static final _getLoadState = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("EmojiCompat__getLoadState") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "EmojiCompat__getLoadState") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int getLoadState() @@ -565,8 +565,8 @@ } static final _isEmojiSpanIndicatorEnabled = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "EmojiCompat__isEmojiSpanIndicatorEnabled") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -579,8 +579,8 @@ } static final _getEmojiSpanIndicatorColor = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "EmojiCompat__getEmojiSpanIndicatorColor") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -977,9 +977,9 @@ } static final _getAssetSignature = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("EmojiCompat__getAssetSignature") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "EmojiCompat__getAssetSignature") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getAssetSignature() @@ -1066,9 +1066,9 @@ /// The type which includes information such as the signature of this class. static const type = $EmojiCompat_ConfigType(); static final _ctor = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("EmojiCompat_Config__ctor") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "EmojiCompat_Config__ctor") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: protected void <init>(androidx.emoji2.text.EmojiCompat.MetadataRepoLoader metadataLoader) @@ -1345,8 +1345,8 @@ } static final _getMetadataRepoLoader = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "EmojiCompat_Config__getMetadataRepoLoader") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1664,8 +1664,8 @@ } static final _onInitialized = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "EmojiCompat_InitCallback__onInitialized") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1914,9 +1914,9 @@ /// The type which includes information such as the signature of this class. static const type = $DefaultEmojiCompatConfigType(); static final _create = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("DefaultEmojiCompatConfig__create") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "DefaultEmojiCompatConfig__create") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public androidx.emoji2.text.FontRequestEmojiCompatConfig create(android.content.Context context) @@ -1972,9 +1972,9 @@ class DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API28 extends DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API19 { @override - late final jni.JObjType< - DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API28> $type = - type; + late final jni + .JObjType<DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API28> + $type = type; DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API28.fromRef( jni.JObjectPtr ref, @@ -2017,8 +2017,8 @@ } class $DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API28Type - extends jni.JObjType< - DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API28> { + extends jni + .JObjType<DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API28> { const $DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API28Type(); @override @@ -2059,9 +2059,9 @@ class DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API19 extends DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper { @override - late final jni.JObjType< - DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API19> $type = - type; + late final jni + .JObjType<DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API19> + $type = type; DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API19.fromRef( jni.JObjectPtr ref, @@ -2126,8 +2126,8 @@ } class $DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API19Type - extends jni.JObjType< - DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API19> { + extends jni + .JObjType<DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API19> { const $DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper_API19Type(); @override @@ -2169,8 +2169,8 @@ extends jni.JObject { @override late final jni - .JObjType<DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper> - $type = type; + .JObjType<DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper> $type = + type; DefaultEmojiCompatConfig_DefaultEmojiCompatConfigHelper.fromRef( jni.JObjectPtr ref, @@ -2303,7 +2303,7 @@ extends jni.JObject { @override late final jni - .JObjType<DefaultEmojiCompatConfig_DefaultEmojiCompatConfigFactory> + .JObjType<DefaultEmojiCompatConfig_DefaultEmojiCompatConfigFactory> $type = type; DefaultEmojiCompatConfig_DefaultEmojiCompatConfigFactory.fromRef( @@ -2314,8 +2314,8 @@ static const type = $DefaultEmojiCompatConfig_DefaultEmojiCompatConfigFactoryType(); static final _ctor = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "DefaultEmojiCompatConfig_DefaultEmojiCompatConfigFactory__ctor") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -2399,9 +2399,9 @@ static const PARTITION_NAME_SYSTEM = r"""system"""; static final _getName = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Build_Partition__getName") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Build_Partition__getName") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getName() @@ -2411,9 +2411,9 @@ } static final _getFingerprint = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Build_Partition__getFingerprint") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Build_Partition__getFingerprint") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getFingerprint() @@ -2423,8 +2423,8 @@ } static final _getBuildTimeMillis = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "Build_Partition__getBuildTimeMillis") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -2449,9 +2449,9 @@ } static final _hashCode1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Build_Partition__hashCode1") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Build_Partition__hashCode1") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int hashCode() @@ -3207,8 +3207,9 @@ } static final _ctor3 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>("HashMap__ctor3") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "HashMap__ctor3") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void <init>(java.util.Map map) @@ -3228,8 +3229,9 @@ } static final _size = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>("HashMap__size") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "HashMap__size") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int size() @@ -3238,9 +3240,9 @@ } static final _isEmpty = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("HashMap__isEmpty") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "HashMap__isEmpty") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean isEmpty() @@ -3331,8 +3333,9 @@ } static final _clear = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>("HashMap__clear") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "HashMap__clear") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void clear() @@ -3356,8 +3359,9 @@ } static final _keySet = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>("HashMap__keySet") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "HashMap__keySet") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.util.Set keySet() @@ -3367,8 +3371,9 @@ } static final _values = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>("HashMap__values") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "HashMap__values") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.util.Collection values() @@ -3378,9 +3383,9 @@ } static final _entrySet = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("HashMap__entrySet") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "HashMap__entrySet") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.util.Set entrySet() @@ -3606,8 +3611,9 @@ } static final _clone = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>("HashMap__clone") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "HashMap__clone") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Object clone()
diff --git a/pkgs/jnigen/example/in_app_java/pubspec.yaml b/pkgs/jnigen/example/in_app_java/pubspec.yaml index 7ab467b..2d97acf 100644 --- a/pkgs/jnigen/example/in_app_java/pubspec.yaml +++ b/pkgs/jnigen/example/in_app_java/pubspec.yaml
@@ -8,7 +8,7 @@ version: 1.0.0+1 environment: - sdk: ">=2.17.6 <4.0.0" + sdk: ">=3.1.0 <4.0.0" dependencies: flutter:
diff --git a/pkgs/jnigen/example/in_app_java/src/android_utils/dartjni.h b/pkgs/jnigen/example/in_app_java/src/android_utils/dartjni.h index cca31f4..0a7f669 100644 --- a/pkgs/jnigen/example/in_app_java/src/android_utils/dartjni.h +++ b/pkgs/jnigen/example/in_app_java/src/android_utils/dartjni.h
@@ -124,16 +124,6 @@ #endif -static inline uint64_t thread_id() { -#ifdef _WIN32 - return GetCurrentThreadId(); -#elif defined __APPLE__ - return pthread_mach_thread_np(pthread_self()); -#else - return pthread_self(); -#endif -} - typedef struct CallbackResult { MutexLock lock; ConditionVariable cond;
diff --git a/pkgs/jnigen/example/kotlin_plugin/example/pubspec.yaml b/pkgs/jnigen/example/kotlin_plugin/example/pubspec.yaml index 2da89b5..0f6224e 100644 --- a/pkgs/jnigen/example/kotlin_plugin/example/pubspec.yaml +++ b/pkgs/jnigen/example/kotlin_plugin/example/pubspec.yaml
@@ -6,7 +6,7 @@ version: 1.0.0+1 environment: - sdk: ">=2.19.0-444.3.beta <4.0.0" + sdk: ">=3.1.0 <4.0.0" dependencies: flutter:
diff --git a/pkgs/jnigen/example/kotlin_plugin/pubspec.yaml b/pkgs/jnigen/example/kotlin_plugin/pubspec.yaml index e054689..fd89ad6 100644 --- a/pkgs/jnigen/example/kotlin_plugin/pubspec.yaml +++ b/pkgs/jnigen/example/kotlin_plugin/pubspec.yaml
@@ -8,7 +8,7 @@ publish_to: none environment: - sdk: '>=2.19.0-444.3.beta <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=1.17.0" dependencies:
diff --git a/pkgs/jnigen/example/kotlin_plugin/src/dartjni.h b/pkgs/jnigen/example/kotlin_plugin/src/dartjni.h index cca31f4..0a7f669 100644 --- a/pkgs/jnigen/example/kotlin_plugin/src/dartjni.h +++ b/pkgs/jnigen/example/kotlin_plugin/src/dartjni.h
@@ -124,16 +124,6 @@ #endif -static inline uint64_t thread_id() { -#ifdef _WIN32 - return GetCurrentThreadId(); -#elif defined __APPLE__ - return pthread_mach_thread_np(pthread_self()); -#else - return pthread_self(); -#endif -} - typedef struct CallbackResult { MutexLock lock; ConditionVariable cond;
diff --git a/pkgs/jnigen/example/notification_plugin/example/pubspec.yaml b/pkgs/jnigen/example/notification_plugin/example/pubspec.yaml index cbcaed9..35f3357 100644 --- a/pkgs/jnigen/example/notification_plugin/example/pubspec.yaml +++ b/pkgs/jnigen/example/notification_plugin/example/pubspec.yaml
@@ -20,7 +20,7 @@ version: 1.0.0+1 environment: - sdk: '>=2.17.6 <4.0.0' + sdk: '>=3.1.0 <4.0.0' dependencies: flutter:
diff --git a/pkgs/jnigen/example/notification_plugin/pubspec.yaml b/pkgs/jnigen/example/notification_plugin/pubspec.yaml index f2a6e1b..1f6cf49 100644 --- a/pkgs/jnigen/example/notification_plugin/pubspec.yaml +++ b/pkgs/jnigen/example/notification_plugin/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/dart-lang/jnigen environment: - sdk: '>=2.17.6 <4.0.0' + sdk: '>=3.1.0 <4.0.0' flutter: ">=2.11.0" dependencies:
diff --git a/pkgs/jnigen/example/notification_plugin/src/dartjni.h b/pkgs/jnigen/example/notification_plugin/src/dartjni.h index cca31f4..0a7f669 100644 --- a/pkgs/jnigen/example/notification_plugin/src/dartjni.h +++ b/pkgs/jnigen/example/notification_plugin/src/dartjni.h
@@ -124,16 +124,6 @@ #endif -static inline uint64_t thread_id() { -#ifdef _WIN32 - return GetCurrentThreadId(); -#elif defined __APPLE__ - return pthread_mach_thread_np(pthread_self()); -#else - return pthread_self(); -#endif -} - typedef struct CallbackResult { MutexLock lock; ConditionVariable cond;
diff --git a/pkgs/jnigen/example/pdfbox_plugin/dart_example/pubspec.yaml b/pkgs/jnigen/example/pdfbox_plugin/dart_example/pubspec.yaml index ed37559..4af3cf1 100644 --- a/pkgs/jnigen/example/pdfbox_plugin/dart_example/pubspec.yaml +++ b/pkgs/jnigen/example/pdfbox_plugin/dart_example/pubspec.yaml
@@ -5,7 +5,7 @@ # homepage: https://www.example.com environment: - sdk: '>=2.17.6 <4.0.0' + sdk: '>=3.1.0 <4.0.0' dependencies: path: ^1.8.0
diff --git a/pkgs/jnigen/example/pdfbox_plugin/example/pubspec.yaml b/pkgs/jnigen/example/pdfbox_plugin/example/pubspec.yaml index 6c96298..af0ea2d 100644 --- a/pkgs/jnigen/example/pdfbox_plugin/example/pubspec.yaml +++ b/pkgs/jnigen/example/pdfbox_plugin/example/pubspec.yaml
@@ -18,7 +18,7 @@ version: 1.0.0+1 environment: - sdk: ">=2.17.6 <4.0.0" + sdk: ">=3.1.0 <4.0.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions
diff --git a/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocument.dart b/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocument.dart index 3e55252..ed3c555 100644 --- a/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocument.dart +++ b/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocument.dart
@@ -70,9 +70,9 @@ } static final _ctor1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__ctor1") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__ctor1") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void <init>(org.apache.pdfbox.io.MemoryUsageSetting memUsageSetting) @@ -88,9 +88,9 @@ } static final _ctor2 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__ctor2") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__ctor2") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void <init>(org.apache.pdfbox.cos.COSDocument doc) @@ -399,9 +399,9 @@ } static final _getDocument = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__getDocument") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__getDocument") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public org.apache.pdfbox.cos.COSDocument getDocument() @@ -414,9 +414,9 @@ } static final _getDocumentInformation = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__getDocumentInformation") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__getDocumentInformation") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public org.apache.pdfbox.pdmodel.PDDocumentInformation getDocumentInformation() @@ -457,9 +457,9 @@ } static final _getDocumentCatalog = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__getDocumentCatalog") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__getDocumentCatalog") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public org.apache.pdfbox.pdmodel.PDDocumentCatalog getDocumentCatalog() @@ -473,9 +473,9 @@ } static final _isEncrypted = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__isEncrypted") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__isEncrypted") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean isEncrypted() @@ -487,9 +487,9 @@ } static final _getEncryption = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__getEncryption") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__getEncryption") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public org.apache.pdfbox.pdmodel.encryption.PDEncryption getEncryption() @@ -525,8 +525,8 @@ } static final _getLastSignatureDictionary = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDDocument__getLastSignatureDictionary") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -543,9 +543,9 @@ } static final _getSignatureFields = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__getSignatureFields") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__getSignatureFields") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.util.List<org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField> getSignatureFields() @@ -560,8 +560,8 @@ } static final _getSignatureDictionaries = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDDocument__getSignatureDictionaries") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -598,9 +598,9 @@ } static final _load = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__load") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__load") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public org.apache.pdfbox.pdmodel.PDDocument load(java.io.File file) @@ -773,9 +773,9 @@ } static final _load6 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__load6") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__load6") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public org.apache.pdfbox.pdmodel.PDDocument load(java.io.InputStream input) @@ -955,9 +955,9 @@ } static final _load12 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__load12") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__load12") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public org.apache.pdfbox.pdmodel.PDDocument load(byte[] input) @@ -1294,9 +1294,9 @@ } static final _getPages = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__getPages") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__getPages") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public org.apache.pdfbox.pdmodel.PDPageTree getPages() @@ -1309,9 +1309,9 @@ } static final _getNumberOfPages = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__getNumberOfPages") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__getNumberOfPages") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int getNumberOfPages() @@ -1323,9 +1323,9 @@ } static final _close = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__close") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__close") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void close() @@ -1363,8 +1363,8 @@ } static final _getCurrentAccessPermission = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDDocument__getCurrentAccessPermission") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1382,8 +1382,8 @@ } static final _isAllSecurityToBeRemoved = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDDocument__isAllSecurityToBeRemoved") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1413,9 +1413,9 @@ } static final _getDocumentId = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__getDocumentId") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__getDocumentId") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Long getDocumentId() @@ -1446,9 +1446,9 @@ } static final _getVersion = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__getVersion") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__getVersion") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public float getVersion() @@ -1476,9 +1476,9 @@ } static final _getResourceCache = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocument__getResourceCache") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocument__getResourceCache") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public org.apache.pdfbox.pdmodel.ResourceCache getResourceCache()
diff --git a/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocumentInformation.dart b/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocumentInformation.dart index 87862ba..5d9a8ff 100644 --- a/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocumentInformation.dart +++ b/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocumentInformation.dart
@@ -70,9 +70,9 @@ } static final _ctor1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocumentInformation__ctor1") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocumentInformation__ctor1") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void <init>(org.apache.pdfbox.cos.COSDictionary dic) @@ -87,8 +87,8 @@ } static final _getCOSObject = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDDocumentInformation__getCOSObject") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -129,9 +129,9 @@ } static final _getTitle = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocumentInformation__getTitle") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocumentInformation__getTitle") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getTitle() @@ -162,9 +162,9 @@ } static final _getAuthor = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocumentInformation__getAuthor") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocumentInformation__getAuthor") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getAuthor() @@ -195,9 +195,9 @@ } static final _getSubject = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocumentInformation__getSubject") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocumentInformation__getSubject") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getSubject() @@ -228,9 +228,9 @@ } static final _getKeywords = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocumentInformation__getKeywords") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocumentInformation__getKeywords") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getKeywords() @@ -261,9 +261,9 @@ } static final _getCreator = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocumentInformation__getCreator") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocumentInformation__getCreator") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getCreator() @@ -294,9 +294,9 @@ } static final _getProducer = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocumentInformation__getProducer") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocumentInformation__getProducer") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getProducer() @@ -327,8 +327,8 @@ } static final _getCreationDate = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDDocumentInformation__getCreationDate") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -361,8 +361,8 @@ } static final _getModificationDate = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDDocumentInformation__getModificationDate") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -396,9 +396,9 @@ } static final _getTrapped = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDDocumentInformation__getTrapped") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDDocumentInformation__getTrapped") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getTrapped() @@ -412,8 +412,8 @@ } static final _getMetadataKeys = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDDocumentInformation__getMetadataKeys") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>();
diff --git a/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/text/PDFTextStripper.dart b/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/text/PDFTextStripper.dart index 306258c..e2bc490 100644 --- a/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/text/PDFTextStripper.dart +++ b/pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/text/PDFTextStripper.dart
@@ -327,9 +327,9 @@ } static final _startArticle = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__startArticle") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__startArticle") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: protected void startArticle() @@ -361,9 +361,9 @@ } static final _endArticle = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__endArticle") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__endArticle") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: protected void endArticle() @@ -413,9 +413,9 @@ } static final _writePage = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__writePage") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__writePage") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: protected void writePage() @@ -429,8 +429,8 @@ } static final _writeLineSeparator = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__writeLineSeparator") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -443,8 +443,8 @@ } static final _writeWordSeparator = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__writeWordSeparator") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -540,9 +540,9 @@ } static final _getStartPage = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getStartPage") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getStartPage") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int getStartPage() @@ -572,9 +572,9 @@ } static final _getEndPage = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getEndPage") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getEndPage") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int getEndPage() @@ -623,9 +623,9 @@ } static final _getLineSeparator = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getLineSeparator") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getLineSeparator") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getLineSeparator() @@ -638,9 +638,9 @@ } static final _getWordSeparator = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getWordSeparator") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getWordSeparator") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getWordSeparator() @@ -674,8 +674,8 @@ } static final _getSuppressDuplicateOverlappingText = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__getSuppressDuplicateOverlappingText") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -687,9 +687,9 @@ } static final _getCurrentPageNo = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getCurrentPageNo") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getCurrentPageNo") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: protected int getCurrentPageNo() @@ -701,9 +701,9 @@ } static final _getOutput = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getOutput") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getOutput") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: protected java.io.Writer getOutput() @@ -716,8 +716,8 @@ } static final _getCharactersByArticle = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__getCharactersByArticle") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -753,8 +753,8 @@ } static final _getSeparateByBeads = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__getSeparateByBeads") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -784,9 +784,9 @@ } static final _getEndBookmark = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getEndBookmark") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getEndBookmark") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem getEndBookmark() @@ -817,9 +817,9 @@ } static final _getStartBookmark = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getStartBookmark") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getStartBookmark") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem getStartBookmark() @@ -850,8 +850,8 @@ } static final _getAddMoreFormatting = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__getAddMoreFormatting") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -881,9 +881,9 @@ } static final _getSortByPosition = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getSortByPosition") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getSortByPosition") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean getSortByPosition() @@ -917,8 +917,8 @@ } static final _getSpacingTolerance = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__getSpacingTolerance") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -950,8 +950,8 @@ } static final _getAverageCharTolerance = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__getAverageCharTolerance") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -984,8 +984,8 @@ } static final _getIndentThreshold = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__getIndentThreshold") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1017,9 +1017,9 @@ } static final _getDropThreshold = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getDropThreshold") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getDropThreshold") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public float getDropThreshold() @@ -1050,9 +1050,9 @@ } static final _getParagraphStart = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getParagraphStart") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getParagraphStart") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getParagraphStart() @@ -1084,9 +1084,9 @@ } static final _getParagraphEnd = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getParagraphEnd") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getParagraphEnd") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getParagraphEnd() @@ -1117,9 +1117,9 @@ } static final _getPageStart = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getPageStart") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getPageStart") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getPageStart() @@ -1150,9 +1150,9 @@ } static final _getPageEnd = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getPageEnd") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getPageEnd") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getPageEnd() @@ -1183,9 +1183,9 @@ } static final _getArticleStart = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getArticleStart") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getArticleStart") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getArticleStart() @@ -1216,9 +1216,9 @@ } static final _getArticleEnd = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__getArticleEnd") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__getArticleEnd") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getArticleEnd() @@ -1249,8 +1249,8 @@ } static final _writeParagraphSeparator = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__writeParagraphSeparator") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1263,8 +1263,8 @@ } static final _writeParagraphStart = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__writeParagraphStart") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1277,9 +1277,9 @@ } static final _writeParagraphEnd = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__writeParagraphEnd") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__writeParagraphEnd") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: protected void writeParagraphEnd() @@ -1291,9 +1291,9 @@ } static final _writePageStart = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__writePageStart") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__writePageStart") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: protected void writePageStart() @@ -1305,9 +1305,9 @@ } static final _writePageEnd = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("PDFTextStripper__writePageEnd") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "PDFTextStripper__writePageEnd") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: protected void writePageEnd() @@ -1338,8 +1338,8 @@ } static final _getListItemPatterns = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "PDFTextStripper__getListItemPatterns") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>();
diff --git a/pkgs/jnigen/example/pdfbox_plugin/pubspec.yaml b/pkgs/jnigen/example/pdfbox_plugin/pubspec.yaml index f77b031..fc9c739 100644 --- a/pkgs/jnigen/example/pdfbox_plugin/pubspec.yaml +++ b/pkgs/jnigen/example/pdfbox_plugin/pubspec.yaml
@@ -6,7 +6,7 @@ homepage: https://github.com/dart-lang/jnigen environment: - sdk: ">=2.17.6 <4.0.0" + sdk: ">=3.1.0 <4.0.0" #flutter: ">=2.11.0" dependencies:
diff --git a/pkgs/jnigen/example/pdfbox_plugin/src/third_party/dartjni.h b/pkgs/jnigen/example/pdfbox_plugin/src/third_party/dartjni.h index cca31f4..0a7f669 100644 --- a/pkgs/jnigen/example/pdfbox_plugin/src/third_party/dartjni.h +++ b/pkgs/jnigen/example/pdfbox_plugin/src/third_party/dartjni.h
@@ -124,16 +124,6 @@ #endif -static inline uint64_t thread_id() { -#ifdef _WIN32 - return GetCurrentThreadId(); -#elif defined __APPLE__ - return pthread_mach_thread_np(pthread_self()); -#else - return pthread_self(); -#endif -} - typedef struct CallbackResult { MutexLock lock; ConditionVariable cond;
diff --git a/pkgs/jnigen/pubspec.yaml b/pkgs/jnigen/pubspec.yaml index 07be3c8..0bc6764 100644 --- a/pkgs/jnigen/pubspec.yaml +++ b/pkgs/jnigen/pubspec.yaml
@@ -8,7 +8,7 @@ repository: https://github.com/dart-lang/jnigen/tree/main/jnigen environment: - sdk: '>=2.17.0 <4.0.0' + sdk: '>=3.1.0 <4.0.0' dependencies: json_annotation: ^4.8.0
diff --git a/pkgs/jnigen/test/jackson_core_test/third_party/c_based/c_bindings/dartjni.h b/pkgs/jnigen/test/jackson_core_test/third_party/c_based/c_bindings/dartjni.h index cca31f4..0a7f669 100644 --- a/pkgs/jnigen/test/jackson_core_test/third_party/c_based/c_bindings/dartjni.h +++ b/pkgs/jnigen/test/jackson_core_test/third_party/c_based/c_bindings/dartjni.h
@@ -124,16 +124,6 @@ #endif -static inline uint64_t thread_id() { -#ifdef _WIN32 - return GetCurrentThreadId(); -#elif defined __APPLE__ - return pthread_mach_thread_np(pthread_self()); -#else - return pthread_self(); -#endif -} - typedef struct CallbackResult { MutexLock lock; ConditionVariable cond;
diff --git a/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart b/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart index 33f5139..1e60c8a 100644 --- a/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart +++ b/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart
@@ -141,9 +141,9 @@ } static final _ctor1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__ctor1") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__ctor1") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void <init>(com.fasterxml.jackson.core.ObjectCodec oc) @@ -177,9 +177,9 @@ } static final _ctor3 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__ctor3") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__ctor3") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void <init>(com.fasterxml.jackson.core.JsonFactoryBuilder b) @@ -216,9 +216,9 @@ } static final _rebuild = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__rebuild") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__rebuild") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.TSFBuilder<?,?> rebuild() @@ -253,9 +253,9 @@ } static final _copy = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__copy") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__copy") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.JsonFactory copy() @@ -278,9 +278,9 @@ } static final _readResolve = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__readResolve") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__readResolve") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: protected java.lang.Object readResolve() @@ -297,8 +297,8 @@ } static final _requiresPropertyOrdering = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonFactory__requiresPropertyOrdering") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -323,8 +323,8 @@ } static final _canHandleBinaryNatively = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonFactory__canHandleBinaryNatively") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -346,9 +346,9 @@ } static final _canUseCharArrays = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__canUseCharArrays") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__canUseCharArrays") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean canUseCharArrays() @@ -369,9 +369,9 @@ } static final _canParseAsync = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__canParseAsync") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__canParseAsync") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean canParseAsync() @@ -388,8 +388,8 @@ } static final _getFormatReadFeatureType = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonFactory__getFormatReadFeatureType") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -401,8 +401,8 @@ } static final _getFormatWriteFeatureType = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonFactory__getFormatWriteFeatureType") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -439,9 +439,9 @@ } static final _getFormatName = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__getFormatName") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__getFormatName") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getFormatName() @@ -475,9 +475,9 @@ } static final _requiresCustomCodec = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__requiresCustomCodec") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__requiresCustomCodec") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean requiresCustomCodec() @@ -513,9 +513,9 @@ } static final _version = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__version") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__version") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.Version version() @@ -615,9 +615,9 @@ } static final _getParserFeatures = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__getParserFeatures") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__getParserFeatures") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public final int getParserFeatures() @@ -626,9 +626,9 @@ } static final _getGeneratorFeatures = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__getGeneratorFeatures") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__getGeneratorFeatures") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public final int getGeneratorFeatures() @@ -637,8 +637,8 @@ } static final _getFormatParserFeatures = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonFactory__getFormatParserFeatures") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -648,8 +648,8 @@ } static final _getFormatGeneratorFeatures = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonFactory__getFormatGeneratorFeatures") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -766,9 +766,9 @@ } static final _getInputDecorator = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__getInputDecorator") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__getInputDecorator") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.io.InputDecorator getInputDecorator() @@ -912,9 +912,9 @@ } static final _getCharacterEscapes = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__getCharacterEscapes") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__getCharacterEscapes") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.io.CharacterEscapes getCharacterEscapes() @@ -951,9 +951,9 @@ } static final _getOutputDecorator = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__getOutputDecorator") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__getOutputDecorator") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.io.OutputDecorator getOutputDecorator() @@ -1014,9 +1014,9 @@ } static final _getRootValueSeparator = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__getRootValueSeparator") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__getRootValueSeparator") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getRootValueSeparator() @@ -1054,9 +1054,9 @@ } static final _getCodec = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory__getCodec") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory__getCodec") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.ObjectCodec getCodec() @@ -1336,8 +1336,8 @@ } static final _createNonBlockingByteArrayParser = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonFactory__createNonBlockingByteArrayParser") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1904,9 +1904,9 @@ } static final _valueOf = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory_Feature__valueOf") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory_Feature__valueOf") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public com.fasterxml.jackson.core.JsonFactory.Feature valueOf(java.lang.String name) @@ -1933,8 +1933,8 @@ } static final _enabledByDefault = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonFactory_Feature__enabledByDefault") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1957,9 +1957,9 @@ } static final _getMask = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonFactory_Feature__getMask") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonFactory_Feature__getMask") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int getMask()
diff --git a/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart b/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart index 032db31..8790d3c 100644 --- a/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart +++ b/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart
@@ -95,9 +95,9 @@ } static final _getCodec = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getCodec") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getCodec") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract com.fasterxml.jackson.core.ObjectCodec getCodec() @@ -132,9 +132,9 @@ } static final _getInputSource = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getInputSource") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getInputSource") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Object getInputSource() @@ -249,9 +249,9 @@ } static final _getSchema = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getSchema") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getSchema") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.FormatSchema getSchema() @@ -286,9 +286,9 @@ } static final _requiresCustomCodec = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__requiresCustomCodec") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__requiresCustomCodec") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean requiresCustomCodec() @@ -306,9 +306,9 @@ } static final _canParseAsync = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__canParseAsync") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__canParseAsync") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean canParseAsync() @@ -329,8 +329,8 @@ } static final _getNonBlockingInputFeeder = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonParser__getNonBlockingInputFeeder") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -348,9 +348,9 @@ } static final _getReadCapabilities = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getReadCapabilities") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getReadCapabilities") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.util.JacksonFeatureSet<com.fasterxml.jackson.core.StreamReadCapability> getReadCapabilities() @@ -366,9 +366,9 @@ } static final _version = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__version") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__version") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract com.fasterxml.jackson.core.Version version() @@ -383,9 +383,9 @@ } static final _close = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__close") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__close") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract void close() @@ -409,9 +409,9 @@ } static final _isClosed = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__isClosed") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__isClosed") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract boolean isClosed() @@ -428,9 +428,9 @@ } static final _getParsingContext = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getParsingContext") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getParsingContext") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract com.fasterxml.jackson.core.JsonStreamContext getParsingContext() @@ -451,9 +451,9 @@ } static final _currentLocation = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__currentLocation") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__currentLocation") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.JsonLocation currentLocation() @@ -476,9 +476,9 @@ } static final _currentTokenLocation = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__currentTokenLocation") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__currentTokenLocation") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.JsonLocation currentTokenLocation() @@ -502,9 +502,9 @@ } static final _getCurrentLocation = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getCurrentLocation") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getCurrentLocation") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract com.fasterxml.jackson.core.JsonLocation getCurrentLocation() @@ -519,9 +519,9 @@ } static final _getTokenLocation = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getTokenLocation") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getTokenLocation") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract com.fasterxml.jackson.core.JsonLocation getTokenLocation() @@ -535,9 +535,9 @@ } static final _currentValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__currentValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__currentValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Object currentValue() @@ -581,9 +581,9 @@ } static final _getCurrentValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getCurrentValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getCurrentValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Object getCurrentValue() @@ -778,9 +778,9 @@ } static final _getFeatureMask = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getFeatureMask") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getFeatureMask") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int getFeatureMask() @@ -843,9 +843,9 @@ } static final _getFormatFeatures = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getFormatFeatures") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getFormatFeatures") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int getFormatFeatures() @@ -886,9 +886,9 @@ } static final _nextToken = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__nextToken") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__nextToken") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract com.fasterxml.jackson.core.JsonToken nextToken() @@ -908,9 +908,9 @@ } static final _nextValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__nextValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__nextValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract com.fasterxml.jackson.core.JsonToken nextValue() @@ -969,9 +969,9 @@ } static final _nextFieldName1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__nextFieldName1") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__nextFieldName1") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String nextFieldName() @@ -990,9 +990,9 @@ } static final _nextTextValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__nextTextValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__nextTextValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String nextTextValue() @@ -1078,9 +1078,9 @@ } static final _nextBooleanValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__nextBooleanValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__nextBooleanValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Boolean nextBooleanValue() @@ -1108,9 +1108,9 @@ } static final _skipChildren = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__skipChildren") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__skipChildren") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract com.fasterxml.jackson.core.JsonParser skipChildren() @@ -1136,9 +1136,9 @@ } static final _finishToken = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__finishToken") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__finishToken") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void finishToken() @@ -1161,9 +1161,9 @@ } static final _currentToken = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__currentToken") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__currentToken") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.fasterxml.jackson.core.JsonToken currentToken() @@ -1184,9 +1184,9 @@ } static final _currentTokenId = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__currentTokenId") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__currentTokenId") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int currentTokenId() @@ -1205,9 +1205,9 @@ } static final _getCurrentToken = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getCurrentToken") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getCurrentToken") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract com.fasterxml.jackson.core.JsonToken getCurrentToken() @@ -1223,9 +1223,9 @@ } static final _getCurrentTokenId = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getCurrentTokenId") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getCurrentTokenId") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract int getCurrentTokenId() @@ -1238,9 +1238,9 @@ } static final _hasCurrentToken = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__hasCurrentToken") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__hasCurrentToken") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract boolean hasCurrentToken() @@ -1312,8 +1312,8 @@ } static final _isExpectedStartArrayToken = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonParser__isExpectedStartArrayToken") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1340,8 +1340,8 @@ } static final _isExpectedStartObjectToken = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonParser__isExpectedStartObjectToken") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1358,8 +1358,8 @@ } static final _isExpectedNumberIntToken = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonParser__isExpectedNumberIntToken") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1379,9 +1379,9 @@ } static final _isNaN = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__isNaN") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__isNaN") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean isNaN() @@ -1403,9 +1403,9 @@ } static final _clearCurrentToken = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__clearCurrentToken") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__clearCurrentToken") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract void clearCurrentToken() @@ -1425,9 +1425,9 @@ } static final _getLastClearedToken = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getLastClearedToken") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getLastClearedToken") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract com.fasterxml.jackson.core.JsonToken getLastClearedToken() @@ -1469,9 +1469,9 @@ } static final _getCurrentName = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getCurrentName") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getCurrentName") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract java.lang.String getCurrentName() @@ -1486,9 +1486,9 @@ } static final _currentName = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__currentName") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__currentName") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String currentName() @@ -1508,9 +1508,9 @@ } static final _getText = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getText") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getText") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract java.lang.String getText() @@ -1560,9 +1560,9 @@ } static final _getTextCharacters = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getTextCharacters") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getTextCharacters") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract char[] getTextCharacters() @@ -1601,9 +1601,9 @@ } static final _getTextLength = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getTextLength") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getTextLength") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract int getTextLength() @@ -1620,9 +1620,9 @@ } static final _getTextOffset = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getTextOffset") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getTextOffset") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract int getTextOffset() @@ -1639,9 +1639,9 @@ } static final _hasTextCharacters = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__hasTextCharacters") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__hasTextCharacters") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract boolean hasTextCharacters() @@ -1665,9 +1665,9 @@ } static final _getNumberValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getNumberValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getNumberValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract java.lang.Number getNumberValue() @@ -1688,9 +1688,9 @@ } static final _getNumberValueExact = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getNumberValueExact") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getNumberValueExact") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Number getNumberValueExact() @@ -1716,9 +1716,9 @@ } static final _getNumberType = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getNumberType") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getNumberType") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract com.fasterxml.jackson.core.JsonParser.NumberType getNumberType() @@ -1737,9 +1737,9 @@ } static final _getByteValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getByteValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getByteValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public byte getByteValue() @@ -1770,9 +1770,9 @@ } static final _getShortValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getShortValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getShortValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public short getShortValue() @@ -1797,9 +1797,9 @@ } static final _getIntValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getIntValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getIntValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract int getIntValue() @@ -1824,9 +1824,9 @@ } static final _getLongValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getLongValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getLongValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract long getLongValue() @@ -1851,9 +1851,9 @@ } static final _getBigIntegerValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getBigIntegerValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getBigIntegerValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract java.math.BigInteger getBigIntegerValue() @@ -1876,9 +1876,9 @@ } static final _getFloatValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getFloatValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getFloatValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract float getFloatValue() @@ -1903,9 +1903,9 @@ } static final _getDoubleValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getDoubleValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getDoubleValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract double getDoubleValue() @@ -1930,9 +1930,9 @@ } static final _getDecimalValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getDecimalValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getDecimalValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public abstract java.math.BigDecimal getDecimalValue() @@ -1951,9 +1951,9 @@ } static final _getBooleanValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getBooleanValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getBooleanValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean getBooleanValue() @@ -1974,9 +1974,9 @@ } static final _getEmbeddedObject = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getEmbeddedObject") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getEmbeddedObject") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Object getEmbeddedObject() @@ -2040,9 +2040,9 @@ } static final _getBinaryValue1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getBinaryValue1") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getBinaryValue1") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public byte[] getBinaryValue() @@ -2114,9 +2114,9 @@ } static final _getValueAsInt = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getValueAsInt") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getValueAsInt") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int getValueAsInt() @@ -2166,9 +2166,9 @@ } static final _getValueAsLong = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getValueAsLong") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getValueAsLong") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public long getValueAsLong() @@ -2218,9 +2218,9 @@ } static final _getValueAsDouble = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getValueAsDouble") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getValueAsDouble") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public double getValueAsDouble() @@ -2270,9 +2270,9 @@ } static final _getValueAsBoolean = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getValueAsBoolean") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getValueAsBoolean") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean getValueAsBoolean() @@ -2322,9 +2322,9 @@ } static final _getValueAsString = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getValueAsString") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getValueAsString") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getValueAsString() @@ -2376,9 +2376,9 @@ } static final _canReadObjectId = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__canReadObjectId") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__canReadObjectId") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean canReadObjectId() @@ -2399,9 +2399,9 @@ } static final _canReadTypeId = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__canReadTypeId") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__canReadTypeId") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean canReadTypeId() @@ -2422,9 +2422,9 @@ } static final _getObjectId = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getObjectId") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getObjectId") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Object getObjectId() @@ -2448,9 +2448,9 @@ } static final _getTypeId = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__getTypeId") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__getTypeId") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Object getTypeId() @@ -2611,9 +2611,9 @@ } static final _readValueAsTree = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser__readValueAsTree") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser__readValueAsTree") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public T readValueAsTree() @@ -2685,9 +2685,9 @@ } static final _valueOf = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser_Feature__valueOf") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser_Feature__valueOf") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public com.fasterxml.jackson.core.JsonParser.Feature valueOf(java.lang.String name) @@ -2714,8 +2714,8 @@ } static final _enabledByDefault = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "JsonParser_Feature__enabledByDefault") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -2738,9 +2738,9 @@ } static final _getMask = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser_Feature__getMask") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser_Feature__getMask") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int getMask() @@ -2802,9 +2802,9 @@ } static final _valueOf = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonParser_NumberType__valueOf") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonParser_NumberType__valueOf") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public com.fasterxml.jackson.core.JsonParser.NumberType valueOf(java.lang.String name)
diff --git a/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart b/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart index 14ce836..d5c82a5 100644 --- a/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart +++ b/pkgs/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart
@@ -65,9 +65,9 @@ } static final _valueOf = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonToken__valueOf") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonToken__valueOf") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public com.fasterxml.jackson.core.JsonToken valueOf(java.lang.String name) @@ -79,8 +79,9 @@ } static final _id = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>("JsonToken__id") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonToken__id") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public final int id() @@ -89,9 +90,9 @@ } static final _asString = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonToken__asString") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonToken__asString") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public final java.lang.String asString() @@ -101,9 +102,9 @@ } static final _asCharArray = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonToken__asCharArray") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonToken__asCharArray") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public final char[] asCharArray() @@ -114,9 +115,9 @@ } static final _asByteArray = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonToken__asByteArray") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonToken__asByteArray") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public final byte[] asByteArray() @@ -127,9 +128,9 @@ } static final _isNumeric = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonToken__isNumeric") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonToken__isNumeric") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public final boolean isNumeric() @@ -141,9 +142,9 @@ } static final _isStructStart = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonToken__isStructStart") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonToken__isStructStart") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public final boolean isStructStart() @@ -160,9 +161,9 @@ } static final _isStructEnd = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonToken__isStructEnd") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonToken__isStructEnd") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public final boolean isStructEnd() @@ -179,9 +180,9 @@ } static final _isScalarValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonToken__isScalarValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonToken__isScalarValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public final boolean isScalarValue() @@ -197,9 +198,9 @@ } static final _isBoolean = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonToken__isBoolean") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonToken__isBoolean") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public final boolean isBoolean()
diff --git a/pkgs/jnigen/test/kotlin_test/c_based/c_bindings/dartjni.h b/pkgs/jnigen/test/kotlin_test/c_based/c_bindings/dartjni.h index cca31f4..0a7f669 100644 --- a/pkgs/jnigen/test/kotlin_test/c_based/c_bindings/dartjni.h +++ b/pkgs/jnigen/test/kotlin_test/c_based/c_bindings/dartjni.h
@@ -124,16 +124,6 @@ #endif -static inline uint64_t thread_id() { -#ifdef _WIN32 - return GetCurrentThreadId(); -#elif defined __APPLE__ - return pthread_mach_thread_np(pthread_self()); -#else - return pthread_self(); -#endif -} - typedef struct CallbackResult { MutexLock lock; ConditionVariable cond;
diff --git a/pkgs/jnigen/test/simple_package_test/c_based/c_bindings/dartjni.h b/pkgs/jnigen/test/simple_package_test/c_based/c_bindings/dartjni.h index cca31f4..0a7f669 100644 --- a/pkgs/jnigen/test/simple_package_test/c_based/c_bindings/dartjni.h +++ b/pkgs/jnigen/test/simple_package_test/c_based/c_bindings/dartjni.h
@@ -124,16 +124,6 @@ #endif -static inline uint64_t thread_id() { -#ifdef _WIN32 - return GetCurrentThreadId(); -#elif defined __APPLE__ - return pthread_mach_thread_np(pthread_self()); -#else - return pthread_self(); -#endif -} - typedef struct CallbackResult { MutexLock lock; ConditionVariable cond;
diff --git a/pkgs/jnigen/test/simple_package_test/c_based/dart_bindings/simple_package.dart b/pkgs/jnigen/test/simple_package_test/c_based/dart_bindings/simple_package.dart index 27f3962..f32e13e 100644 --- a/pkgs/jnigen/test/simple_package_test/c_based/dart_bindings/simple_package.dart +++ b/pkgs/jnigen/test/simple_package_test/c_based/dart_bindings/simple_package.dart
@@ -120,9 +120,9 @@ } static final _setName = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Example__setName") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example__setName") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public void setName(java.lang.String newName) @@ -133,9 +133,9 @@ } static final _setNestedInstance = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Example__setNestedInstance") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example__setNestedInstance") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public void setNestedInstance(com.github.dart_lang.jnigen.simple_package.Example.Nested newNested) @@ -183,9 +183,9 @@ } static final _getNumber = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Example__getNumber") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example__getNumber") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int getNumber() @@ -207,9 +207,9 @@ } static final _getIsUp = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Example__getIsUp") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example__getIsUp") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean getIsUp() @@ -231,9 +231,9 @@ } static final _getCodename = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Example__getCodename") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example__getCodename") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.String getCodename() @@ -258,9 +258,9 @@ } static final _getRandom = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Example__getRandom") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example__getRandom") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.util.Random getRandom() @@ -285,9 +285,9 @@ } static final _getRandomLong = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Example__getRandomLong") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example__getRandomLong") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public long getRandomLong() @@ -443,9 +443,9 @@ } static final _whichExample = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Example__whichExample") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example__whichExample") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int whichExample() @@ -477,8 +477,9 @@ } static final _addAll = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>("Example__addAll") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example__addAll") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public int addAll(int[] arr) @@ -489,9 +490,9 @@ } static final _getSelf = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Example__getSelf") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example__getSelf") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.github.dart_lang.jnigen.simple_package.Example getSelf() @@ -561,8 +562,8 @@ } static final _usesAnonymousInnerClass = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "Example_Nested__usesAnonymousInnerClass") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -572,9 +573,9 @@ } static final _getValue = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Example_Nested__getValue") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example_Nested__getValue") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public boolean getValue() @@ -787,9 +788,9 @@ } static final _objectMethod = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Exceptions__objectMethod") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Exceptions__objectMethod") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Object objectMethod() @@ -799,9 +800,9 @@ } static final _intMethod = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Exceptions__intMethod") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Exceptions__intMethod") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int intMethod() @@ -810,9 +811,9 @@ } static final _objectArrayMethod = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Exceptions__objectArrayMethod") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Exceptions__objectArrayMethod") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public java.lang.Object[] objectArrayMethod() @@ -823,9 +824,9 @@ } static final _intArrayMethod = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Exceptions__intArrayMethod") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Exceptions__intArrayMethod") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int[] intArrayMethod() @@ -836,8 +837,8 @@ } static final _throwNullPointerException = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "Exceptions__throwNullPointerException") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -847,8 +848,8 @@ } static final _throwFileNotFoundException = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "Exceptions__throwFileNotFoundException") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -860,8 +861,8 @@ } static final _throwClassCastException = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "Exceptions__throwClassCastException") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -873,8 +874,8 @@ } static final _throwArrayIndexException = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "Exceptions__throwArrayIndexException") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -884,8 +885,8 @@ } static final _throwArithmeticException = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "Exceptions__throwArithmeticException") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -994,9 +995,9 @@ .asFunction<jni.JniResult Function()>(); static final _set_name = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("set_Fields__name") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "set_Fields__name") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public java.lang.String name @@ -1224,9 +1225,9 @@ .asFunction<jni.JniResult Function()>(); static final _set_BEST_GOD = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("set_Fields_Nested__BEST_GOD") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "set_Fields_Nested__BEST_GOD") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public java.lang.String BEST_GOD @@ -1360,9 +1361,9 @@ } static final _whichExample = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("Example1__whichExample") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "Example1__whichExample") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int whichExample() @@ -1442,9 +1443,9 @@ set value($T value) => _set_value(reference, value.reference).check(); static final _ctor = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("GrandParent__ctor") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "GrandParent__ctor") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void <init>(T value) @@ -1460,9 +1461,9 @@ } static final _stringParent = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("GrandParent__stringParent") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "GrandParent__stringParent") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.github.dart_lang.jnigen.generics.GrandParent<T>.Parent<java.lang.String> stringParent() @@ -1506,9 +1507,9 @@ } static final _varStaticParent = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("GrandParent__varStaticParent") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "GrandParent__varStaticParent") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public com.github.dart_lang.jnigen.generics.GrandParent.StaticParent<S> varStaticParent(S value) @@ -1525,8 +1526,8 @@ } static final _staticParentWithSameType = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "GrandParent__staticParentWithSameType") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -1942,9 +1943,9 @@ set value($S value) => _set_value(reference, value.reference).check(); static final _ctor = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("GrandParent_StaticParent__ctor") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "GrandParent_StaticParent__ctor") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public void <init>(S value) @@ -2218,9 +2219,9 @@ } static final _entryStack = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("MyMap__entryStack") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "MyMap__entryStack") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public com.github.dart_lang.jnigen.generics.MyStack<com.github.dart_lang.jnigen.generics.MyMap<K,V>.MyEntry> entryStack() @@ -2445,9 +2446,9 @@ } static final _fromArray = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("MyStack__fromArray") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "MyStack__fromArray") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public com.github.dart_lang.jnigen.generics.MyStack<T> fromArray(T[] arr) @@ -2463,8 +2464,8 @@ } static final _fromArrayOfArrayOfGrandParents = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( "MyStack__fromArrayOfArrayOfGrandParents") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); @@ -2497,8 +2498,9 @@ } static final _of1 = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>("MyStack__of1") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "MyStack__of1") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public com.github.dart_lang.jnigen.generics.MyStack<T> of(T obj) @@ -2551,8 +2553,9 @@ } static final _pop = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>("MyStack__pop") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "MyStack__pop") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public T pop() @@ -2562,8 +2565,9 @@ } static final _size = jniLookup< - ffi.NativeFunction< - jni.JniResult Function(ffi.Pointer<ffi.Void>)>>("MyStack__size") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "MyStack__size") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: public int size() @@ -3260,9 +3264,9 @@ } static final _valueOf = jniLookup< - ffi.NativeFunction< - jni.JniResult Function( - ffi.Pointer<ffi.Void>)>>("JsonSerializable_Case__valueOf") + ffi + .NativeFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>>( + "JsonSerializable_Case__valueOf") .asFunction<jni.JniResult Function(ffi.Pointer<ffi.Void>)>(); /// from: static public com.github.dart_lang.jnigen.annotations.JsonSerializable.Case valueOf(java.lang.String name)