Give some love to the project #70
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| name: Scala Steward | ||
|
|
||
| # This workflow will launch everyday at 00:00 | ||
| on: | ||
| schedule: | ||
| - cron: '0 0 * * *' | ||
| workflow_dispatch: {} | ||
|
|
||
| jobs: | ||
| scala-steward: | ||
| timeout-minutes: 30 | ||
| runs-on: ubuntu-latest | ||
| name: Scala Steward | ||
| steps: | ||
| - name: Scala Steward | ||
| uses: scala-steward-org/scala-steward-action@v2.59.0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| def scala212 = "2.12.18" | ||
|
|
||
| Global / onChangedBuildSource := ReloadOnSourceChanges | ||
|
|
||
| inThisBuild( | ||
| List( | ||
| organization := "org.scalameta", | ||
|
|
@@ -15,16 +18,14 @@ inThisBuild( | |
| ) | ||
| ), | ||
| scalaVersion := scala212, | ||
|
ckipp01 marked this conversation as resolved.
|
||
| scalacOptions ++= List("-Ywarn-unused-import"), | ||
| scalafixCaching := true, | ||
| semanticdbEnabled := true | ||
| ) | ||
| ) | ||
|
|
||
| crossScalaVersions := Nil | ||
| publish / skip := true | ||
|
|
||
| commands += | ||
| Command.command("fixAll") { s => | ||
|
|
@@ -42,7 +43,6 @@ lazy val plugin = project | |
| .settings( | ||
| moduleName := "sbt-native-image", | ||
| sbtPlugin := true, | ||
| crossScalaVersions := List(scala212), | ||
|
|
||
| buildInfoPackage := "sbtnativeimage", | ||
| buildInfoKeys := Seq[BuildInfoKey](version), | ||
|
|
@@ -55,8 +55,8 @@ lazy val plugin = project | |
| lazy val example = project | ||
| .in(file("example")) | ||
| .settings( | ||
| publish / skip := true, | ||
| Compile / mainClass := Some("example.Hello"), | ||
| test := { | ||
| val binary = nativeImage.value | ||
| val output = scala.sys.process.Process(List(binary.toString)).!!.trim | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -140,12 +140,14 @@ object NativeImagePlugin extends AutoPlugin { | |
|
|
||
| override lazy val projectSettings: Seq[Def.Setting[_]] = List( | ||
| libraryDependencies += "org.scalameta" % "svm-subs" % "101.0.0", | ||
| NativeImage / target := | ||
| (Compile / target).value / "native-image", | ||
| NativeImageTest / target := | ||
| (Test / target).value / "native-image-test", | ||
| NativeImageInternal / target := | ||
| (Compile / target).value / "native-image-internal", | ||
| NativeImageTestInternal / target := | ||
| (Test / target).value / "native-image-test-internal", | ||
| nativeImageReady := { | ||
| val s = streams.value | ||
|
|
||
|
|
@@ -163,15 +165,18 @@ object NativeImagePlugin extends AutoPlugin { | |
| nativeImageJvm := "graalvm-java11", | ||
| nativeImageJvmIndex := "cs", | ||
| nativeImageVersion := "20.2.0", | ||
| NativeImage / name := name.value, | ||
| NativeImageTest / name := | ||
| (Test / name).value, | ||
| NativeImage / mainClass := | ||
| (Compile / mainClass).value, | ||
| NativeImageTest / mainClass := | ||
| (Test / mainClass).value, | ||
| nativeImageOptions := List.empty, | ||
| nativeImageTestOptions := nativeImageOptions.value, | ||
| nativeImageTestRunOptions := List.empty, | ||
| nativeImageCoursier := { | ||
| val dir = (NativeImageInternal / target).value | ||
| val out = copyResource("coursier", dir) | ||
| if (Properties.isWin) { | ||
| copyResource("coursier.bat", dir) | ||
|
|
@@ -282,9 +287,9 @@ object NativeImagePlugin extends AutoPlugin { | |
| s"-agentlib:native-image-agent=$agentConfig=${nativeImageAgentOutputDir.value}" | ||
| val tpr = thisProjectRef.value | ||
| val settings = Seq( | ||
| tpr / Compile / run / fork := true, | ||
| tpr / Compile / run / javaHome := Some(graalHome), | ||
| tpr / Compile / run / javaOptions += agentOption | ||
| ) | ||
| val state0 = state.value | ||
| val extracted = Project.extract(state0) | ||
|
|
@@ -297,7 +302,7 @@ object NativeImagePlugin extends AutoPlugin { | |
| arguments.mkString(" ") | ||
| Project | ||
| .extract(newState) | ||
| .runInputTask(tpr / Compile / run, input, newState) | ||
| }, | ||
| nativeImageTestRunAgent := { | ||
| val _ = nativeImageTestCommand.value | ||
|
|
@@ -311,12 +316,12 @@ object NativeImagePlugin extends AutoPlugin { | |
| val agentOption = | ||
| s"-agentlib:native-image-agent=$agentConfig=${nativeImageTestAgentOutputDir.value}" | ||
|
|
||
| val options = (Test / run / javaOptions).value ++ Seq(agentOption) | ||
|
|
||
| val __ = (Test / compile).value | ||
| val main = (NativeImageTest / mainClass).value | ||
| val cp = (Test / fullClasspath).value.map(_.data) | ||
| val manifest = (NativeImageTestInternal / target).value / "manifest.jar" | ||
| manifest.getParentFile().mkdirs() | ||
| createManifestJar(manifest, cp) | ||
| val nativeClasspath = manifest.absolutePath | ||
|
|
@@ -331,7 +336,7 @@ object NativeImagePlugin extends AutoPlugin { | |
| throw new MessageOnlyException( | ||
| "no mainClass is specified for tests. " + | ||
| "To fix this problem, update build.sbt to include the settings " + | ||
| "`Test / mainClass := Some(\"com.MainTestClass\")`" | ||
| ) | ||
| ) | ||
| command ++= nativeImageTestRunOptions.value | ||
|
|
@@ -344,12 +349,12 @@ object NativeImagePlugin extends AutoPlugin { | |
| } | ||
| }, | ||
| nativeImageOutput := | ||
| (NativeImage / target).value / (NativeImage / name).value, | ||
| nativeImageTestOutput := | ||
| (NativeImageTest / target).value / (NativeImageTest / name).value, | ||
| nativeImageCopy := { | ||
| val binary = nativeImage.value | ||
| val out = fileParser((ThisBuild / baseDirectory).value).parsed | ||
| Files.copy( | ||
| binary.toPath(), | ||
| out.toPath(), | ||
|
|
@@ -384,17 +389,17 @@ object NativeImagePlugin extends AutoPlugin { | |
| } | ||
| }, | ||
| nativeImage := { | ||
| val _ = (Compile / compile).value | ||
| val main = (NativeImage / mainClass).value | ||
| val binaryName = nativeImageOutput.value | ||
| val cp = (Compile / fullClasspath).value.map(_.data) | ||
| // NOTE(olafur): we pass in a manifest jar instead of the full classpath | ||
| // for two reasons: | ||
| // * large classpaths quickly hit on the "argument list too large" | ||
| // error, especially on Windows. | ||
| // * we print the full command to the console and the manifest jar makes | ||
| // it more readable and easier to copy-paste. | ||
| val manifest = (NativeImageInternal / target).value / "manifest.jar" | ||
| manifest.getParentFile().mkdirs() | ||
| createManifestJar(manifest, cp) | ||
| val nativeClasspath = manifest.absolutePath | ||
|
|
@@ -410,14 +415,14 @@ object NativeImagePlugin extends AutoPlugin { | |
| throw new MessageOnlyException( | ||
| "no mainClass is specified. " + | ||
| "To fix this problem, update build.sbt to include the settings " + | ||
| "`Compile / mainClass := Some(\"com.MainClass\")`" | ||
| ) | ||
| ) | ||
| command += binaryName.absolutePath | ||
|
|
||
| // Start native-image linker. | ||
| streams.value.log.info(command.mkString(" ")) | ||
| val cwd = (NativeImage / target).value | ||
| cwd.mkdirs() | ||
| val exit = Process(command, cwd = Some(cwd)).! | ||
| if (exit != 0) { | ||
|
|
@@ -431,17 +436,17 @@ object NativeImagePlugin extends AutoPlugin { | |
| binaryName | ||
| }, | ||
| nativeImageTest := { | ||
| val _ = (Test / compile).value | ||
| val main = (NativeImageTest / mainClass).value | ||
| val binaryName = nativeImageTestOutput.value | ||
| val cp = (Test / fullClasspath).value.map(_.data) | ||
| // NOTE(olafur): we pass in a manifest jar instead of the full classpath | ||
| // for two reasons: | ||
| // * large classpaths quickly hit on the "argument list too large" | ||
| // error, especially on Windows. | ||
| // * we print the full command to the console and the manifest jar makes | ||
| // it more readable and easier to copy-paste. | ||
| val manifest = (NativeImageTestInternal / target).value / "manifest.jar" | ||
| manifest.getParentFile().mkdirs() | ||
| createManifestJar(manifest, cp) | ||
| val nativeClasspath = manifest.absolutePath | ||
|
|
@@ -457,14 +462,14 @@ object NativeImagePlugin extends AutoPlugin { | |
| throw new MessageOnlyException( | ||
| "no mainClass is specified for tests. " + | ||
| "To fix this problem, update build.sbt to include the settings " + | ||
| "`Test / mainClass := Some(\"com.MainTestClass\")`" | ||
| ) | ||
| ) | ||
| command += binaryName.absolutePath | ||
|
|
||
| // Start native-image linker. | ||
| streams.value.log.info(command.mkString(" ")) | ||
| val cwd = (NativeImageTest / target).value | ||
| cwd.mkdirs() | ||
| val exit = Process(command, cwd = Some(cwd)).! | ||
| if (exit != 0) { | ||
|
|
@@ -519,8 +524,7 @@ object NativeImagePlugin extends AutoPlugin { | |
| //this happens if the dependency jar resides on a different drive then the manifest, i.e. C:\Coursier\Cache and D:\myapp\target | ||
| //copy dependency next to manifest as fallback | ||
| case _: IllegalArgumentException => | ||
| import java.nio.file.{Files, StandardCopyOption} | ||
| Files.copy( | ||
| dependencyPath, | ||
| manifestPath.resolve(path.getName), | ||
|
|
@@ -546,15 +550,15 @@ object NativeImagePlugin extends AutoPlugin { | |
|
|
||
| private def alertUser(streams: std.TaskStreams[_], message: String): Unit = { | ||
| streams.log.info(message) | ||
| if (!isCI) { | ||
| try { | ||
| if (Properties.isMac) { | ||
| Process(List("say", message)).! | ||
| } | ||
| // NOTE(olafur): feel free to add support for Linux/Windows. | ||
| } catch { | ||
| case NonFatal(_) => | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| lazy val example = project | ||
| .settings( | ||
| 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", | ||
| ), | ||
| Test / mainClass := Some("org.scalatest.tools.Runner"), | ||
| nativeImageTestRunOptions ++= Seq("-o", "-R", (Test / classDirectory).value.absolutePath), | ||
| nativeImageCommand := List( | ||
| sys.env.getOrElse( | ||
| "NATIVE_IMAGE_COMMAND", | ||
|
|
@@ -16,6 +16,6 @@ lazy val example = project | |
| "variable to point to the absolute path of this binary." | ||
| ) | ||
| ), | ||
| libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.16" % Test | ||
| ) | ||
| .enablePlugins(NativeImagePlugin) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| lazy val example = project | ||
| .settings( | ||
| scalaVersion := "2.12.18", | ||
| Compile / mainClass := Some("example.Hello3"), | ||
| nativeImageOptions ++= Seq( | ||
| "--no-fallback", | ||
| s"-H:ReflectionConfigurationFiles=${ target.value / "native-image-configs" / "reflect-config.json" }" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| lazy val example = project | ||
| .settings( | ||
| 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" | ||
| ), | ||
| Test / mainClass := Some("org.scalatest.tools.Runner"), | ||
| nativeImageTestRunOptions ++= Seq("-o", "-R", (Test / classDirectory).value.absolutePath), | ||
| libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.16" % Test | ||
| ) | ||
| .enablePlugins(NativeImagePlugin) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| lazy val example = project | ||
| .settings( | ||
| scalaVersion := "2.12.18", | ||
| Compile / mainClass := Some("example.Hello2"), | ||
| nativeImageCommand := List( | ||
| sys.env.getOrElse( | ||
| "NATIVE_IMAGE_COMMAND", | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's remove this for now. We actually have our own scalameta steward here which we can add this repo to once we get this merged in.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If possible, I'd prefer to keep it as, usually, external Scala Steward instances are making PRs from a fork, which makes it harder (if not impossible) to commit on the branches made by Scala Steward (if we need to fix something on one of the update branches)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be fine to switch this. We do the same for all the rest of the scalameta projects. Since the PRs are not on the main branch of the fork, a maintainer of the repo is able to add another commit to it.