Downgrade Scala Native default version to 0.4.17 for Mill export

Author: Gedochao

build.sc

@@ -433,6 +433,7 @@ trait Core extends ScalaCliCrossSbtModule
          |  def ammoniteVersion = "${Deps.ammonite.dep.version}"
          |  def millVersion = "${InternalDeps.Versions.mill}"
          |  def lefouMillwRef = "${InternalDeps.Versions.lefouMillwRef}"
+         |  def maxScalaNativeForMillExport = "${Deps.Versions.maxScalaNativeForMillExport}"
          |
          |  def scalafmtOrganization = "${Deps.scalafmtCli.dep.module.organization.value}"
          |  def scalafmtName = "${Deps.scalafmtCli.dep.module.name.value}"

modules/cli/src/main/scala/scala/cli/commands/export0/Export.scala

@@ -148,7 +148,15 @@ object Export extends ScalaCommand[ExportOptions] {
     val inputs = options.shared.inputs(args.all).orExit(logger)
     CurrentParams.workspaceOpt = Some(inputs.workspace)
     val baseOptions =
-      initialBuildOptions.copy(mainClass = options.mainClass.mainClass.filter(_.nonEmpty))
+      initialBuildOptions
+        .copy(
+          scalaNativeOptions = initialBuildOptions.scalaNativeOptions.copy(
+            maxDefaultNativeVersions =
+              if shouldExportToMill then List(Constants.maxScalaNativeForMillExport)
+              else Nil
+          ),
+          mainClass = options.mainClass.mainClass.filter(_.nonEmpty)
+        )
 
     val (sourcesMain, optionsMain0) =
       prepareBuild(

modules/cli/src/main/scala/scala/cli/exportCmd/MillProjectDescriptor.scala

@@ -70,10 +70,8 @@ final case class MillProjectDescriptor(
     )
   }
 
-  private def scalaNativeSettings(options: ScalaNativeOptions): MillProject = {
-    val scalaNativeVersion = Some(options.version.getOrElse(Constants.scalaNativeVersion))
-    MillProject(scalaNativeVersion = scalaNativeVersion)
-  }
+  private def scalaNativeSettings(options: ScalaNativeOptions): MillProject =
+    MillProject(scalaNativeVersion = Some(options.finalVersion))
 
   private def dependencySettings(
     mainOptions: BuildOptions,

modules/integration/src/test/scala/scala/cli/integration/ExportCommonTestDefinitions.scala

@@ -96,9 +96,6 @@ trait ExportCommonTestDefinitions { _: ScalaCliSuite & TestScalaVersionArgs =>
     test("Scala.js") {
       simpleTest(ExportTestProjects.jsTest(actualScalaVersion))
     }
-    test("Scala Native") {
-      simpleTest(ExportTestProjects.nativeTest(actualScalaVersion))
-    }
     test("Ensure test framework NPE is not thrown when depending on logback") {
       logbackBugCase()
     }

modules/integration/src/test/scala/scala/cli/integration/ExportMillTestDefinitions.scala

@@ -96,4 +96,9 @@ abstract class ExportMillTestDefinitions extends ScalaCliSuite
     test("JVM with compiler plugin") {
       jvmTestCompilerPlugin()
     }
+
+  test("Scala Native") {
+    // FIXME this should be adjusted to Scala Native 0.5.x syntax once Mill gets support for it
+    simpleTest(ExportTestProjects.nativeTest(actualScalaVersion, useNative04Syntax = true))
+  }
 }

modules/integration/src/test/scala/scala/cli/integration/ExportSbtTestDefinitions.scala

@@ -38,4 +38,8 @@ abstract class ExportSbtTestDefinitions extends ScalaCliSuite
 
   override val runMainArgs: Seq[String]  = Seq("run")
   override val runTestsArgs: Seq[String] = Seq("test")
+
+  test("Scala Native") {
+    simpleTest(ExportTestProjects.nativeTest(actualScalaVersion))
+  }
 }

modules/integration/src/test/scala/scala/cli/integration/ExportTestProjects.scala

@@ -96,7 +96,7 @@ object ExportTestProjects {
     TestInputs(os.rel / "Test.scala" -> testFile)
   }
 
-  def nativeTest(scalaVersion: String): TestInputs = {
+  def nativeTest(scalaVersion: String, useNative04Syntax: Boolean = false): TestInputs = {
     val nl = "\\n"
     val testFile =
       if (scalaVersion.startsWith("3."))
@@ -109,7 +109,7 @@ object ExportTestProjects {
            |object Test:
            |  def main(args: Array[String]): Unit =
            |    val message = "Hello from " + "exported Scala CLI project" + "$nl"
-           |    Zone {
+           |    Zone {${if (useNative04Syntax) " implicit z =>" else ""}
            |      val io = StdioHelpers(stdio)
            |      io.printf(c"%s", toCString(message))
            |    }
@@ -124,7 +124,7 @@ object ExportTestProjects {
            |object Test {
            |  def main(args: Array[String]): Unit = {
            |    val message = "Hello from " + "exported Scala CLI project" + "$nl"
-           |    Zone.acquire { implicit z =>
+           |    Zone${if (useNative04Syntax) "" else ".acquire"} { implicit z =>
            |      val io = StdioHelpers(stdio)
            |      io.printf(c"%s", toCString(message))
            |    }

project/deps.sc

@@ -102,6 +102,7 @@ object Deps {
     def maxScalaNativeForToolkit          = scalaNative04
     def maxScalaNativeForTypelevelToolkit = scalaNative04
     def maxScalaNativeForScalaPy          = scalaNative04
+    def maxScalaNativeForMillExport       = scalaNative04
     def scalaPackager                     = "0.1.29"
     def signingCli                        = "0.2.3"
     def signingCliJvmVersion              = 17