From 75dcd1229b5326a072d77f201576db26bbdc0cc5 Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Tue, 7 Apr 2026 21:15:43 +0900 Subject: [PATCH] Enable project-matrix/native test (#9038) --- .../src/sbt-test/project-matrix/native/build.sbt | 13 ++++--------- sbt-app/src/sbt-test/project-matrix/native/pending | 4 ---- .../project-matrix/native/project/plugins.sbt | 2 +- sbt-app/src/sbt-test/project-matrix/native/test | 4 ++++ 4 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 sbt-app/src/sbt-test/project-matrix/native/pending create mode 100644 sbt-app/src/sbt-test/project-matrix/native/test diff --git a/sbt-app/src/sbt-test/project-matrix/native/build.sbt b/sbt-app/src/sbt-test/project-matrix/native/build.sbt index b9a3aab87..fb3712849 100644 --- a/sbt-app/src/sbt-test/project-matrix/native/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/native/build.sbt @@ -1,19 +1,14 @@ -// lazy val root = (project in file(".")) -// .aggregate(core.projectRefs ++ app.projectRefs: _*) -// .settings( -// ) - lazy val core = (projectMatrix in file("core")) .settings( name := "core", - mainClass in (Compile, run) := Some("a.CoreMain") + Compile / run / mainClass := Some("a.CoreMain") ) - .nativePlatform(scalaVersions = Seq("2.11.12")) + .nativePlatform(scalaVersions = Seq("2.13.18")) lazy val app = (projectMatrix in file("app")) .dependsOn(core) .settings( name := "app", - mainClass in (Compile, run) := Some("a.App") + Compile / run / mainClass := Some("a.App") ) - .nativePlatform(scalaVersions = Seq("2.11.12")) + .nativePlatform(scalaVersions = Seq("2.13.18")) diff --git a/sbt-app/src/sbt-test/project-matrix/native/pending b/sbt-app/src/sbt-test/project-matrix/native/pending deleted file mode 100644 index d4d53c054..000000000 --- a/sbt-app/src/sbt-test/project-matrix/native/pending +++ /dev/null @@ -1,4 +0,0 @@ -> nativeLink - -$ exists app/target/native-2.11/app-out -$ exists core/target/native-2.11/core-out diff --git a/sbt-app/src/sbt-test/project-matrix/native/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/native/project/plugins.sbt index 2f4e38aae..ecbbaada7 100644 --- a/sbt-app/src/sbt-test/project-matrix/native/project/plugins.sbt +++ b/sbt-app/src/sbt-test/project-matrix/native/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.11") diff --git a/sbt-app/src/sbt-test/project-matrix/native/test b/sbt-app/src/sbt-test/project-matrix/native/test new file mode 100644 index 000000000..d1709b667 --- /dev/null +++ b/sbt-app/src/sbt-test/project-matrix/native/test @@ -0,0 +1,4 @@ +> nativeLink + +$ exists target/out/native0.5/scala-2.13.18/app/app +$ exists target/out/native0.5/scala-2.13.18/core/core