Merge pull request #420 from cunarist/update-deps

Update dependencies
cunarist · Sep 9, 2024 · d408fc6 · d408fc6
2 parents bd7d682 + 307b3df
commit d408fc6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/flutter_ffi_plugin/cargokit/.github/workflows/test_example_plugin_build.yml b/flutter_ffi_plugin/cargokit/.github/workflows/test_example_plugin_build.yml
@@ -77,6 +77,10 @@ jobs:
         shell: bash
         working-directory: ${{ env.EXAMPLE_DIR }}
         run: |
-          export JAVA_HOME=$JAVA_HOME_11_X64
+          if [[ $(sysctl hw.optional.arm64) == *"hw.optional.arm64: 1"* ]]; then
+            export JAVA_HOME=$JAVA_HOME_17_arm64
+          else
+            export JAVA_HOME=$JAVA_HOME_11_X64
+          fi
           flutter build apk --${{ matrix.build_mode }} -v
 
diff --git a/flutter_ffi_plugin/cargokit/gradle/plugin.gradle b/flutter_ffi_plugin/cargokit/gradle/plugin.gradle
@@ -116,8 +116,12 @@ class CargoKitPlugin implements Plugin<Project> {
         }
 
         def cargoBuildDir = "${project.buildDir}/build"
+
+        // Determine if the project is an application or library
+        def isApplication = plugin.project.plugins.hasPlugin('com.android.application')
+        def variants = isApplication ? plugin.project.android.applicationVariants : plugin.project.android.libraryVariants
 
-        plugin.project.android.applicationVariants.all { variant ->
+        variants.all { variant ->
 
             final buildType = variant.buildType.name
 

diff --git a/flutter_ffi_plugin/template/native/hub/Cargo.toml b/flutter_ffi_plugin/template/native/hub/Cargo.toml
@@ -18,4 +18,4 @@ tokio = { version = "1", features = ["rt", "macros"] }
 
 # Uncomment below to target the web.
 # tokio_with_wasm = { version = "0.6.0", features = ["rt", "macros"] }
-# wasm-bindgen = "0.2.92"
+# wasm-bindgen = "0.2.93"
diff --git a/rust_crate/Cargo.toml b/rust_crate/Cargo.toml
@@ -24,6 +24,6 @@ which = "6.0.0"
 allo-isolate = "0.1.25"
 
 [target.'cfg(target_family = "wasm")'.dependencies]
-js-sys = "0.3.69"
-wasm-bindgen = "0.2.92"
-wasm-bindgen-futures = "0.4.42"
+js-sys = "0.3.70"
+wasm-bindgen = "0.2.93"
+wasm-bindgen-futures = "0.4.43"