Merge commit 'd56f1f269efeb7a7b2919dc7d8302ef6bddf47f0' into update-deps

cunarist · Sep 9, 2024 · 307b3df · 307b3df
2 parents 1dd2748 + d56f1f2
commit 307b3df
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 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