Merge commit '7d58f977aac11ade2399057db2e9fab152dfad45'

Author: knopp

super_native_extensions/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
 

super_native_extensions/cargokit/build_pod.sh

@@ -49,7 +49,7 @@ do
   fi
 done
 
-"$BASEDIR/run_build_tool.sh" build-pod "$@"
+sh "$BASEDIR/run_build_tool.sh" build-pod "$@"
 
 # Make a symlink from built framework to phony file, which will be used as input to
 # build script. This should force rebuild (podspec currently doesn't support alwaysOutOfDate

super_native_extensions/cargokit/cmake/cargokit.cmake

@@ -50,6 +50,7 @@ function(apply_cargokit target manifest_dir lib_name any_symbol_name)
     else()
         set(SCRIPT_EXTENSION ".sh")
         set(IMPORT_LIB_EXTENSION "")
+        execute_process(COMMAND chmod +x "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}")
     endif()
 
     # Using generators in custom command is only supported in CMake 3.20+
@@ -75,6 +76,7 @@ function(apply_cargokit target manifest_dir lib_name any_symbol_name)
         )
     endif()
 
+
     set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/_phony_" PROPERTIES SYMBOLIC TRUE)
 
     if (TARGET ${target})
@@ -94,4 +96,4 @@ function(apply_cargokit target manifest_dir lib_name any_symbol_name)
     # Allow adding the output library to plugin bundled libraries
     set("${target}_cargokit_lib" ${OUTPUT_LIB} PARENT_SCOPE)
 
-endfunction()
+endfunction()

super_native_extensions/cargokit/gradle/plugin.gradle

@@ -55,7 +55,13 @@ abstract class CargoKitBuildTask extends DefaultTask {
         def manifestDir = Paths.get(project.buildscript.sourceFile.parent, project.cargokit.manifestDir)
 
         def rootProjectDir = project.rootProject.projectDir
-
+        
+        if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
+            project.exec {
+                commandLine 'chmod', '+x', path
+            }
+        }
+        
         project.exec {
             executable path
             args "build-gradle"
@@ -110,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