Merge branch 'main' into update/scalafmt-cli-3.7.14

.github/workflows/launchers.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-20.04, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -45,7 +45,7 @@ jobs:
           UPLOAD_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   generate-static-launcher:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -71,7 +71,7 @@ jobs:
           UPLOAD_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   generate-mostly-static-launcher:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:

.mill-version

@@ -1 +1 @@
-0.10.11
+0.10.12

README.md

@@ -2,7 +2,7 @@
 
 _Note that Scala Native support in scalafmt is in the works. As soon as it is stable and provides launchers for Linux / macOS / Windows, the repository here should be sunset._
 
-These launchers are generated on the scalafmt-native-image CI, and pushed [here](https://github.com/alexarchambault/scalafmt-native-image/releases/tag/launchers).
+These launchers are generated on the scalafmt-native-image CI, and released [here](https://github.com/VirtusLab/scalafmt-native-image/releases/).
 
 These launchers aim at being consumed by [Scala CLI](https://github.com/VirtusLab/scala-cli), but can also be useful on their own. Note that if the launcher scalafmt version and the scalafmt version in `.scalafmt.conf` don't match, the launcher will not proceed and fail loudly. Those versions have to match.
 

build.sc

@@ -1,6 +1,6 @@
-import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.3.0`
-import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.23`
-import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.21`
+import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.3.1`
+import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.25`
+import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.23`
 
 import de.tobiasroeser.mill.vcs.version._
 import io.github.alexarchambault.millnativeimage.NativeImage
@@ -11,7 +11,7 @@ import mill.scalalib._
 def scalafmtVersion = "3.7.14"
 
 trait ScalafmtNativeImage extends ScalaModule with NativeImage {
-  def scalaVersion = "2.13.10"
+  def scalaVersion = "2.13.11"
 
   def nativeImageClassPath = T{
     val origCp = runClasspath()
@@ -186,5 +186,5 @@ def upload(directory: String = "artifacts/") = T.command {
     if (version.endsWith("-SNAPSHOT")) ("launchers", true)
     else ("v" + version, false)
 
-  Upload.upload("scala-cli", "scalafmt-native-image", ghToken, tag, dryRun = false, overwrite = overwriteAssets)(launchers: _*)
+  Upload.upload("virtuslab", "scalafmt-native-image", ghToken, tag, dryRun = false, overwrite = overwriteAssets)(launchers: _*)
 }