From d5b3a6371c78d8240e6390177599f0fd069c212f Mon Sep 17 00:00:00 2001 From: jules Ivanic Date: Sun, 16 Jul 2023 18:22:26 +0400 Subject: [PATCH] Update example projects --- .../src/sbt-test/sbt-native-image/agent-test/build.sbt | 8 ++++---- plugin/src/sbt-test/sbt-native-image/agent/build.sbt | 4 ++-- .../src/sbt-test/sbt-native-image/basic-test/build.sbt | 8 ++++---- plugin/src/sbt-test/sbt-native-image/basic/build.sbt | 4 ++-- .../sbt-native-image/cross-build-test/build.sbt | 10 +++++----- .../sbt-test/sbt-native-image/cross-build/build.sbt | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plugin/src/sbt-test/sbt-native-image/agent-test/build.sbt b/plugin/src/sbt-test/sbt-native-image/agent-test/build.sbt index 5dfbfaa..e856080 100644 --- a/plugin/src/sbt-test/sbt-native-image/agent-test/build.sbt +++ b/plugin/src/sbt-test/sbt-native-image/agent-test/build.sbt @@ -1,13 +1,13 @@ lazy val example = project .settings( - scalaVersion := "2.12.12", - mainClass.in(Compile) := Some("example.Hello6"), + scalaVersion := "2.12.18", + Compile / mainClass := Some("example.Hello6"), nativeImageTestOptions ++= Seq( s"-H:ReflectionConfigurationFiles=${target.value / "native-image-configs" / "reflect-config.json"}", "--initialize-at-build-time=scala.collection.immutable.VM", ), - mainClass.in(Test) := Some("org.scalatest.tools.Runner"), - nativeImageTestRunOptions ++= Seq("-o", "-R", classDirectory.in(Test).value.absolutePath), + Test / mainClass := Some("org.scalatest.tools.Runner"), + nativeImageTestRunOptions ++= Seq("-o", "-R", (Test / classDirectory).value.absolutePath), nativeImageCommand := List( sys.env.getOrElse( "NATIVE_IMAGE_COMMAND", diff --git a/plugin/src/sbt-test/sbt-native-image/agent/build.sbt b/plugin/src/sbt-test/sbt-native-image/agent/build.sbt index 92426de..8906550 100644 --- a/plugin/src/sbt-test/sbt-native-image/agent/build.sbt +++ b/plugin/src/sbt-test/sbt-native-image/agent/build.sbt @@ -1,7 +1,7 @@ lazy val example = project .settings( - scalaVersion := "2.12.12", - mainClass.in(Compile) := Some("example.Hello3"), + scalaVersion := "2.12.18", + Compile / mainClass := Some("example.Hello3"), nativeImageOptions ++= Seq( "--no-fallback", s"-H:ReflectionConfigurationFiles=${ target.value / "native-image-configs" / "reflect-config.json" }" diff --git a/plugin/src/sbt-test/sbt-native-image/basic-test/build.sbt b/plugin/src/sbt-test/sbt-native-image/basic-test/build.sbt index a310d29..42c0e01 100644 --- a/plugin/src/sbt-test/sbt-native-image/basic-test/build.sbt +++ b/plugin/src/sbt-test/sbt-native-image/basic-test/build.sbt @@ -1,7 +1,7 @@ lazy val example = project .settings( - scalaVersion := "2.12.12", - mainClass.in(Compile) := Some("example.Hello4"), + scalaVersion := "2.12.18", + Compile / mainClass := Some("example.Hello4"), nativeImageCommand := List( sys.env.getOrElse( "NATIVE_IMAGE_COMMAND", @@ -13,8 +13,8 @@ lazy val example = project nativeImageTestOptions ++= Seq( "--initialize-at-build-time=scala.collection.immutable.VM" ), - mainClass.in(Test) := Some("org.scalatest.tools.Runner"), - nativeImageTestRunOptions ++= Seq("-o", "-R", classDirectory.in(Test).value.absolutePath), + Test / mainClass := Some("org.scalatest.tools.Runner"), + nativeImageTestRunOptions ++= Seq("-o", "-R", (Test / classDirectory).value.absolutePath), libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.14" % "test" ) .enablePlugins(NativeImagePlugin) diff --git a/plugin/src/sbt-test/sbt-native-image/basic/build.sbt b/plugin/src/sbt-test/sbt-native-image/basic/build.sbt index e816d89..12d0b43 100644 --- a/plugin/src/sbt-test/sbt-native-image/basic/build.sbt +++ b/plugin/src/sbt-test/sbt-native-image/basic/build.sbt @@ -1,7 +1,7 @@ lazy val example = project .settings( - scalaVersion := "2.12.12", - mainClass.in(Compile) := Some("example.Hello2"), + scalaVersion := "2.12.18", + Compile / mainClass := Some("example.Hello2"), nativeImageCommand := List( sys.env.getOrElse( "NATIVE_IMAGE_COMMAND", diff --git a/plugin/src/sbt-test/sbt-native-image/cross-build-test/build.sbt b/plugin/src/sbt-test/sbt-native-image/cross-build-test/build.sbt index ceb6292..169a58c 100644 --- a/plugin/src/sbt-test/sbt-native-image/cross-build-test/build.sbt +++ b/plugin/src/sbt-test/sbt-native-image/cross-build-test/build.sbt @@ -3,16 +3,16 @@ lazy val example = project crossScalaVersions := List( "2.11.10", "2.12.10", - "2.12.12", + "2.12.18", "2.13.1", - "2.13.3" + "2.13.11" ), - mainClass.in(Compile) := Some("example.Hello5"), + Compile / mainClass := Some("example.Hello5"), nativeImageTestOptions ++= Seq( "--initialize-at-build-time=scala.collection.immutable.VM" ), - mainClass.in(Test) := Some("org.scalatest.tools.Runner"), - nativeImageTestRunOptions ++= Seq("-o", "-R", classDirectory.in(Test).value.absolutePath), + Test / mainClass := Some("org.scalatest.tools.Runner"), + nativeImageTestRunOptions ++= Seq("-o", "-R", (Test / classDirectory).value.absolutePath), nativeImageCommand := List( sys.env.getOrElse( "NATIVE_IMAGE_COMMAND", diff --git a/plugin/src/sbt-test/sbt-native-image/cross-build/build.sbt b/plugin/src/sbt-test/sbt-native-image/cross-build/build.sbt index ceecc41..02c1957 100644 --- a/plugin/src/sbt-test/sbt-native-image/cross-build/build.sbt +++ b/plugin/src/sbt-test/sbt-native-image/cross-build/build.sbt @@ -3,11 +3,11 @@ nativeImageOptions += "--no-fallback" crossScalaVersions := List( "2.11.10", "2.12.10", - "2.12.12", + "2.12.18", "2.13.1", - "2.13.3" + "2.13.11" ) -mainClass.in(Compile) := Some("Prog") +Compile / mainClass := Some("Prog") TaskKey[Unit]("check") := { val binary = nativeImage.value val output = scala.sys.process.Process(List(binary.toString)).!!.trim