address comments

jni/example/pubspec.lock

@@ -519,5 +519,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.1.0-185.0.dev <4.0.0"
+  dart: ">=3.1.0 <4.0.0"
   flutter: ">=2.11.0"

jni/example/pubspec.yaml

@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 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

jni/lib/src/jni.dart

@@ -64,8 +64,10 @@ abstract class Jni {
     _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);
   }

jni/lib/src/jobject.dart

@@ -128,7 +128,7 @@ T _callOrGet<T>(int? callType, JniResult Function(int) function) {
           : (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;

jni/lib/src/jvalues.dart

@@ -22,8 +22,8 @@ void _fillJValue(Pointer<JValue> pos, dynamic arg) {
     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:

jni/lib/src/third_party/jni_bindings_generated.dart

@@ -257,13 +257,13 @@ abstract class JniCallType {
 ///
 /// 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 JObjectPtr = ffi.Pointer<ffi.Void>;
 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,15 +315,15 @@ class JniClassLookupResult extends ffi.Struct {
 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;
 }
 
 /// 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 @@ typedef JStringPtr = JObjectPtr;
 /// 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(
@@ -421,19 +421,19 @@ class JniAccessorsStruct extends ffi.Struct {
 
 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;
@@ -474,7 +474,7 @@ typedef JavaVM1 = ffi.Pointer<JNIInvokeInterface>;
 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;
@@ -1933,7 +1933,7 @@ typedef JLongArrayPtr = JArrayPtr;
 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 @@ abstract class JObjectRefType {
   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 @@ class JavaVMInitArgs extends ffi.Struct {
 
 /// 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 MutexLock = pthread_mutex_t;
 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,15 +1999,15 @@ typedef ConditionVariable = pthread_cond_t;
 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;
 
   @ffi.Array.multi([40])
   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;

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 @@ dependencies:
 
 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

jnigen/android_test_runner/pubspec.yaml

@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 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

jnigen/example/in_app_java/pubspec.yaml

@@ -8,7 +8,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.6 <4.0.0"
+  sdk: ">=3.1.0 <4.0.0"
 
 dependencies:
   flutter:

jnigen/example/kotlin_plugin/example/pubspec.yaml

@@ -6,7 +6,7 @@ publish_to: "none"
 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:

jnigen/example/kotlin_plugin/pubspec.yaml

@@ -8,7 +8,7 @@ version: 0.0.1
 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:

jnigen/example/notification_plugin/example/pubspec.yaml

@@ -20,7 +20,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.17.6 <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
 
 dependencies:
   flutter:

jnigen/example/notification_plugin/pubspec.yaml

@@ -5,7 +5,7 @@ publish_to: none
 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:

jnigen/example/pdfbox_plugin/dart_example/pubspec.yaml

@@ -5,7 +5,7 @@ publish_to: none
 # 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

jnigen/example/pdfbox_plugin/example/pubspec.yaml

@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 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

jnigen/example/pdfbox_plugin/pubspec.yaml

@@ -6,7 +6,7 @@ publish_to: none
 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:

jnigen/pubspec.yaml

@@ -8,7 +8,7 @@ description: Experimental generator for FFI+JNI bindings.
 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