Merge commit '4ff7798500796ed2947f1fcfb1b2f8cfeca3e4bd'

Author: knopp

super_native_extensions/cargokit/.github/workflows/test_example_plugin_build.yml

@@ -80,7 +80,7 @@ jobs:
           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
+            export JAVA_HOME=$JAVA_HOME_17_X64
           fi
           flutter build apk --${{ matrix.build_mode }} -v
 

super_native_extensions/cargokit/build_tool/lib/src/build_tool.dart

@@ -127,6 +127,10 @@ class PrecompileBinariesCommand extends Command {
         'temp-dir',
         help: 'Directory to store temporary build artifacts',
       )
+      ..addOption(
+        'glibc-version',
+        help: 'GLIBC version to use for linux builds',
+      )
       ..addFlag(
         "verbose",
         abbr: "v",
@@ -195,6 +199,7 @@ class PrecompileBinariesCommand extends Command {
       androidNdkVersion: argResults!['android-ndk-version'] as String?,
       androidMinSdkVersion: androidMinSdkVersion,
       tempDir: argResults!['temp-dir'] as String?,
+      glibcVersion: argResults!['glibc-version'] as String?,
     );
 
     await precompileBinaries.run();

super_native_extensions/cargokit/build_tool/lib/src/builder.dart

@@ -51,6 +51,8 @@ class BuildEnvironment {
   final int? androidMinSdkVersion;
   final String? javaHome;
 
+  final String? glibcVersion;
+
   BuildEnvironment({
     required this.configuration,
     required this.crateOptions,
@@ -62,6 +64,7 @@ class BuildEnvironment {
     this.androidNdkVersion,
     this.androidMinSdkVersion,
     this.javaHome,
+    this.glibcVersion,
   });
 
   static BuildConfiguration parseBuildConfiguration(String value) {
@@ -125,6 +128,9 @@ class RustBuilder {
     if (!rustup.installedTargets(toolchain)!.contains(target.rust)) {
       rustup.installTarget(target.rust, toolchain: toolchain);
     }
+    if (environment.glibcVersion != null) {
+      rustup.installZigBuild(toolchain);
+    }
   }
 
   CargoBuildOptions? get _buildOptions =>
@@ -142,15 +148,18 @@ class RustBuilder {
         'run',
         _toolchain,
         'cargo',
-        'build',
+        environment.glibcVersion != null ? 'zigbuild' : 'build',
         ...extraArgs,
         '--manifest-path',
         manifestPath,
         '-p',
         environment.crateInfo.packageName,
         if (!environment.configuration.isDebug) '--release',
         '--target',
-        target.rust,
+        target.rust +
+            (environment.glibcVersion != null
+                ? '.${environment.glibcVersion!}'
+                : ""),
         '--target-dir',
         environment.targetTempDir,
       ],

super_native_extensions/cargokit/build_tool/lib/src/precompile_binaries.dart

@@ -26,6 +26,7 @@ class PrecompileBinaries {
     this.androidNdkVersion,
     this.androidMinSdkVersion,
     this.tempDir,
+    this.glibcVersion,
   });
 
   final PrivateKey privateKey;
@@ -37,6 +38,7 @@ class PrecompileBinaries {
   final String? androidNdkVersion;
   final int? androidMinSdkVersion;
   final String? tempDir;
+  final String? glibcVersion;
 
   static String fileName(Target target, String name) {
     return '${target.rust}_$name';
@@ -93,6 +95,7 @@ class PrecompileBinaries {
       androidSdkPath: androidSdkLocation,
       androidNdkVersion: androidNdkVersion,
       androidMinSdkVersion: androidMinSdkVersion,
+      glibcVersion: glibcVersion,
     );
 
     final rustup = Rustup();

super_native_extensions/cargokit/build_tool/lib/src/rustup.dart

@@ -33,14 +33,27 @@ class Rustup {
     required String toolchain,
   }) {
     log.info("Installing Rust target: $target");
+    runCommand("rustup", ['target', 'add', '--toolchain', toolchain, target]);
+    _installedTargets(toolchain)?.add(target);
+  }
+
+  bool _didInstallZigBuild = false;
+
+  void installZigBuild(String toolchain) {
+    if (_didInstallZigBuild) {
+      return;
+    }
+
+    log.info("Installing Zig build");
     runCommand("rustup", [
-      'target',
-      'add',
-      '--toolchain',
+      'run',
       toolchain,
-      target,
+      'cargo',
+      'install',
+      '--locked',
+      'cargo-zigbuild',
     ]);
-    _installedTargets(toolchain)?.add(target);
+    _didInstallZigBuild = true;
   }
 
   final List<_Toolchain> _installedToolchains;

super_native_extensions/cargokit/build_tool/lib/src/target.dart

@@ -43,6 +43,10 @@ class Target {
       rust: 'x86_64-pc-windows-msvc',
       flutter: 'windows-x64',
     ),
+    Target(
+      rust: 'aarch64-pc-windows-msvc',
+      flutter: 'windows-arm64',
+    ),
     Target(
       rust: 'x86_64-unknown-linux-gnu',
       flutter: 'linux-x64',
@@ -51,6 +55,7 @@ class Target {
       rust: 'aarch64-unknown-linux-gnu',
       flutter: 'linux-arm64',
     ),
+    Target(rust: 'riscv64gc-unknown-linux-gnu', flutter: 'linux-riscv64'),
     Target(
       rust: 'x86_64-apple-darwin',
       darwinPlatform: 'macosx',
@@ -106,9 +111,11 @@ class Target {
     if (Platform.isLinux) {
       // Right now we don't support cross-compiling on Linux. So we just return
       // the host target.
-      final arch = runCommand('arch', []).stdout as String;
-      if (arch.trim() == 'aarch64') {
+      final arch = (runCommand('arch', []).stdout as String).trim();
+      if (arch == 'aarch64') {
         return [Target.forRustTriple('aarch64-unknown-linux-gnu')!];
+      } else if (arch == 'riscv64') {
+        return [Target.forRustTriple('riscv64gc-unknown-linux-gnu')!];
       } else {
         return [Target.forRustTriple('x86_64-unknown-linux-gnu')!];
       }

super_native_extensions/cargokit/cmake/resolve_symlinks.ps1

@@ -14,14 +14,21 @@ function Resolve-Symlinks {
         if ($realPath -and !$realPath.EndsWith($separator)) {
             $realPath += $separator
         }
-        $realPath += $part
+
+        $realPath += $part.Replace('\', '/')
+
+        # The slash is important when using Get-Item on Drive letters in pwsh.
+        if (-not($realPath.Contains($separator)) -and $realPath.EndsWith(':')) {
+            $realPath += '/'
+        }
+
         $item = Get-Item $realPath
-        if ($item.Target) {
-            $realPath = $item.Target.Replace('\', '/')
+        if ($item.LinkTarget) {
+            $realPath = $item.LinkTarget.Replace('\', '/')
         }
     }
     $realPath
 }
 
-$path=Resolve-Symlinks -Path $args[0]
+$path = Resolve-Symlinks -Path $args[0]
 Write-Host $path

super_native_extensions/cargokit/gradle/plugin.gradle

@@ -55,13 +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"
@@ -92,7 +92,7 @@ class CargoKitPlugin implements Plugin<Project> {
    private Plugin _findFlutterPlugin(Map projects) {
         for (project in projects) {
             for (plugin in project.value.getPlugins()) {
-                if (plugin.class.name == "FlutterPlugin") {
+                if (plugin.class.name == "com.flutter.gradle.FlutterPlugin") {
                     return plugin;
                 }
             }
@@ -116,7 +116,7 @@ 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
@@ -129,7 +129,7 @@ class CargoKitPlugin implements Plugin<Project> {
             def jniLibs = project.android.sourceSets.maybeCreate(buildType).jniLibs;
             jniLibs.srcDir(new File(cargoOutputDir))
 
-            def platforms = plugin.getTargetPlatforms().collect()
+            def platforms = com.flutter.gradle.FlutterPluginUtils.getTargetPlatforms(project).collect()
 
             // Same thing addFlutterDependencies does in flutter.gradle
             if (buildType == "debug") {