From 6c56a769fdf31b6aeeacc476b1487dd5b06afdbf Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 18 Nov 2025 00:34:47 -0500 Subject: [PATCH] Enable sbt-native-packager test --- sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt | 4 ++-- .../sbt-test/plugins/sbt-native-packager/project/plugins.sbt | 3 ++- .../plugins/sbt-native-packager/src/main/scala/Main.scala | 3 +-- .../sbt-test/plugins/sbt-native-packager/{disabled => test} | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename sbt-app/src/sbt-test/plugins/sbt-native-packager/{disabled => test} (100%) diff --git a/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt b/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt index 7783ed396..a0c3a463d 100644 --- a/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt +++ b/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "3.7.4" name := "hello" enablePlugins(JavaAppPackaging) @@ -6,7 +6,7 @@ enablePlugins(JavaAppPackaging) lazy val check = taskKey[Unit]("") check := { - val cmd = "target/universal/stage/bin/hello" + val cmd = "target/out/jvm/scala-3.7.4/hello/universal/stage/bin/hello" val cmd0 = if (sys.props("os.name").toLowerCase(java.util.Locale.ROOT).contains("windows")) cmd + ".bat" diff --git a/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt index c3e04c903..18b2ee30c 100644 --- a/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt +++ b/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt @@ -1,3 +1,4 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.20") +// addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.20") +libraryDependencies += Defaults.sbtPluginExtra("com.github.sbt" % "sbt-native-packager" % "1.11.4", "2", "3.7.3") diff --git a/sbt-app/src/sbt-test/plugins/sbt-native-packager/src/main/scala/Main.scala b/sbt-app/src/sbt-test/plugins/sbt-native-packager/src/main/scala/Main.scala index 61295349d..1080f4ba4 100644 --- a/sbt-app/src/sbt-test/plugins/sbt-native-packager/src/main/scala/Main.scala +++ b/sbt-app/src/sbt-test/plugins/sbt-native-packager/src/main/scala/Main.scala @@ -1,6 +1,5 @@ import java.io.File import java.nio.file.Files -object Main extends App { +@main def hello() = Files.write(new File("output").toPath, "OK".getBytes("UTF-8")) -} diff --git a/sbt-app/src/sbt-test/plugins/sbt-native-packager/disabled b/sbt-app/src/sbt-test/plugins/sbt-native-packager/test similarity index 100% rename from sbt-app/src/sbt-test/plugins/sbt-native-packager/disabled rename to sbt-app/src/sbt-test/plugins/sbt-native-packager/test