[jnigen] CI fix (https://github.com/dart-lang/jnigen/issues/277)
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index aa8b684..6a76382 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml
@@ -140,7 +140,7 @@ sudo apt-get install -y clang-format build-essential cmake - run: flutter pub get - name: Check formatting - run: flutter format --output=none --set-exit-if-changed . + run: dart format --output=none --set-exit-if-changed . - name: Run lints run: flutter analyze --fatal-infos - name: Check C code formatting using clang-format
diff --git a/pkgs/jni/example/pubspec.lock b/pkgs/jni/example/pubspec.lock index 5925148..2edbc75 100644 --- a/pkgs/jni/example/pubspec.lock +++ b/pkgs/jni/example/pubspec.lock
@@ -17,14 +17,6 @@ url: "https://pub.dev" source: hosted version: "5.10.0" - archive: - dependency: transitive - description: - name: archive - sha256: "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb" - url: "https://pub.dev" - source: hosted - version: "3.3.2" args: dependency: transitive description: @@ -37,10 +29,10 @@ dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -53,10 +45,10 @@ dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: @@ -69,10 +61,10 @@ dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" convert: dependency: transitive description: @@ -208,15 +200,15 @@ path: ".." relative: true source: path - version: "0.3.0" + version: "0.5.0-dev.0" js: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" lints: dependency: transitive description: @@ -237,10 +229,10 @@ dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -253,10 +245,10 @@ dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: transitive description: @@ -285,10 +277,10 @@ dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" platform: dependency: transitive description: @@ -434,26 +426,26 @@ dependency: "direct dev" description: name: test - sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d + sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4" url: "https://pub.dev" source: hosted - version: "1.22.0" + version: "1.24.1" test_api: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" test_core: dependency: transitive description: name: test_core - sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888" + sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93" url: "https://pub.dev" source: hosted - version: "0.4.20" + version: "0.5.1" typed_data: dependency: transitive description: @@ -474,10 +466,10 @@ dependency: transitive description: name: vm_service - sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7 + sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe url: "https://pub.dev" source: hosted - version: "9.4.0" + version: "11.3.0" watcher: dependency: transitive description: @@ -498,10 +490,10 @@ dependency: transitive description: name: webdriver - sha256: ef67178f0cc7e32c1494645b11639dd1335f1d18814aa8435113a92e9ef9d841 + sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" webkit_inspection_protocol: dependency: transitive description: @@ -519,5 +511,5 @@ source: hosted version: "3.1.1" sdks: - dart: ">=2.19.0 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=2.11.0"
diff --git a/pkgs/jnigen/android_test_runner/lib/main.dart b/pkgs/jnigen/android_test_runner/lib/main.dart index ee6f2d8..da07cdd 100644 --- a/pkgs/jnigen/android_test_runner/lib/main.dart +++ b/pkgs/jnigen/android_test_runner/lib/main.dart
@@ -37,10 +37,10 @@ appBar: AppBar( title: const Text("Integration test runner"), ), - body: Center( + body: const Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, - children: const [ + children: [ Text( 'This app should be run as flutter integration test', ),
diff --git a/pkgs/jnigen/example/in_app_java/android/build.gradle b/pkgs/jnigen/example/in_app_java/android/build.gradle index 88265a9..2fbab80 100644 --- a/pkgs/jnigen/example/in_app_java/android/build.gradle +++ b/pkgs/jnigen/example/in_app_java/android/build.gradle
@@ -27,6 +27,6 @@ project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir }
diff --git a/pkgs/jnigen/example/kotlin_plugin/example/android/build.gradle b/pkgs/jnigen/example/kotlin_plugin/example/android/build.gradle index 58a8c74..713d7f6 100644 --- a/pkgs/jnigen/example/kotlin_plugin/example/android/build.gradle +++ b/pkgs/jnigen/example/kotlin_plugin/example/android/build.gradle
@@ -26,6 +26,6 @@ project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir }
diff --git a/pkgs/jnigen/example/notification_plugin/example/android/build.gradle b/pkgs/jnigen/example/notification_plugin/example/android/build.gradle index 83ae220..3cdaac9 100644 --- a/pkgs/jnigen/example/notification_plugin/example/android/build.gradle +++ b/pkgs/jnigen/example/notification_plugin/example/android/build.gradle
@@ -26,6 +26,6 @@ project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir }
diff --git a/pkgs/jnigen/example/pdfbox_plugin/example/android/build.gradle b/pkgs/jnigen/example/pdfbox_plugin/example/android/build.gradle index 83ae220..3cdaac9 100644 --- a/pkgs/jnigen/example/pdfbox_plugin/example/android/build.gradle +++ b/pkgs/jnigen/example/pdfbox_plugin/example/android/build.gradle
@@ -26,6 +26,6 @@ project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir }
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 eb39129..1ae50f7 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
@@ -62,12 +62,12 @@ static final _get_LINE_SEPARATOR = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_PDFTextStripper__LINE_SEPARATOR") + jni.JObjectPtr, + )>>("get_PDFTextStripper__LINE_SEPARATOR") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); /// from: protected final java.lang.String LINE_SEPARATOR /// The returned object must be deleted after use, by calling the `delete` method. @@ -79,12 +79,12 @@ static final _get_charactersByArticle = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_PDFTextStripper__charactersByArticle") + jni.JObjectPtr, + )>>("get_PDFTextStripper__charactersByArticle") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_charactersByArticle = jniLookup< ffi.NativeFunction< @@ -133,12 +133,12 @@ static final _get_document = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_PDFTextStripper__document") + jni.JObjectPtr, + )>>("get_PDFTextStripper__document") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_document = jniLookup< ffi.NativeFunction< @@ -160,12 +160,12 @@ static final _get_output = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_PDFTextStripper__output") + jni.JObjectPtr, + )>>("get_PDFTextStripper__output") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_output = jniLookup< ffi.NativeFunction<
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 d8b09c7..70e0d71 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
@@ -933,12 +933,12 @@ static final _get_i = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_Fields__i") + jni.JObjectPtr, + )>>("get_Fields__i") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_i = jniLookup< ffi.NativeFunction< @@ -959,12 +959,12 @@ static final _get_trillion = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_Fields__trillion") + jni.JObjectPtr, + )>>("get_Fields__trillion") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_trillion = jniLookup< ffi.NativeFunction< @@ -981,12 +981,12 @@ static final _get_isAchillesDead = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_Fields__isAchillesDead") + jni.JObjectPtr, + )>>("get_Fields__isAchillesDead") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_isAchillesDead = jniLookup< ffi.NativeFunction< @@ -1004,12 +1004,12 @@ static final _get_bestFighterInGreece = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_Fields__bestFighterInGreece") + jni.JObjectPtr, + )>>("get_Fields__bestFighterInGreece") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_bestFighterInGreece = jniLookup< ffi.NativeFunction< @@ -1031,12 +1031,12 @@ static final _get_random = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_Fields__random") + jni.JObjectPtr, + )>>("get_Fields__random") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_random = jniLookup< ffi.NativeFunction< @@ -1121,12 +1121,12 @@ static final _get_hundred = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_Fields_Nested__hundred") + jni.JObjectPtr, + )>>("get_Fields_Nested__hundred") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_hundred = jniLookup< ffi.NativeFunction< @@ -1341,12 +1341,12 @@ static final _get_value = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_GrandParent__value") + jni.JObjectPtr, + )>>("get_GrandParent__value") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_value = jniLookup< ffi.NativeFunction< @@ -1521,12 +1521,12 @@ static final _get_parentValue = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_GrandParent_Parent__parentValue") + jni.JObjectPtr, + )>>("get_GrandParent_Parent__parentValue") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_parentValue = jniLookup< ffi.NativeFunction< @@ -1548,12 +1548,12 @@ static final _get_value = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_GrandParent_Parent__value") + jni.JObjectPtr, + )>>("get_GrandParent_Parent__value") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_value = jniLookup< ffi.NativeFunction< @@ -1668,12 +1668,12 @@ static final _get_grandParentValue = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_GrandParent_Parent_Child__grandParentValue") + jni.JObjectPtr, + )>>("get_GrandParent_Parent_Child__grandParentValue") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_grandParentValue = jniLookup< ffi.NativeFunction< @@ -1695,12 +1695,12 @@ static final _get_parentValue = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_GrandParent_Parent_Child__parentValue") + jni.JObjectPtr, + )>>("get_GrandParent_Parent_Child__parentValue") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_parentValue = jniLookup< ffi.NativeFunction< @@ -1722,12 +1722,12 @@ static final _get_value = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_GrandParent_Parent_Child__value") + jni.JObjectPtr, + )>>("get_GrandParent_Parent_Child__value") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_value = jniLookup< ffi.NativeFunction< @@ -1848,12 +1848,12 @@ static final _get_value = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_GrandParent_StaticParent__value") + jni.JObjectPtr, + )>>("get_GrandParent_StaticParent__value") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_value = jniLookup< ffi.NativeFunction< @@ -1954,12 +1954,12 @@ static final _get_parentValue = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_GrandParent_StaticParent_Child__parentValue") + jni.JObjectPtr, + )>>("get_GrandParent_StaticParent_Child__parentValue") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_parentValue = jniLookup< ffi.NativeFunction< @@ -1981,12 +1981,12 @@ static final _get_value = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_GrandParent_StaticParent_Child__value") + jni.JObjectPtr, + )>>("get_GrandParent_StaticParent_Child__value") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_value = jniLookup< ffi.NativeFunction< @@ -2221,12 +2221,12 @@ static final _get_key = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_MyMap_MyEntry__key") + jni.JObjectPtr, + )>>("get_MyMap_MyEntry__key") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_key = jniLookup< ffi.NativeFunction< @@ -2246,12 +2246,12 @@ static final _get_value = jniLookup< ffi.NativeFunction< jni.JniResult Function( - jni.JObjectPtr, - )>>("get_MyMap_MyEntry__value") + jni.JObjectPtr, + )>>("get_MyMap_MyEntry__value") .asFunction< jni.JniResult Function( - jni.JObjectPtr, - )>(); + jni.JObjectPtr, + )>(); static final _set_value = jniLookup< ffi.NativeFunction<