Backport changes from main branch

Author: WojciechMazur

.github/workflows/CI.yml

@@ -7,10 +7,13 @@ jobs:
       fail-fast: false
       matrix:
         OS: [ubuntu-22.04, windows-2022]
-        scala: [2.12.17, 2.13.10, 3.2.1]
+        scala: [2.12.18, 2.13.12, 3.3.1]
     steps:
-      - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/checkout@v3
+      - uses: coursier/cache-action@v6
+      - uses: coursier/setup-action@v1
+        with:
+          jvm: adopt:8
       - name: Set env Linux
         if: ${{ startsWith(matrix.OS, 'ubuntu') }}
         run: |

.github/workflows/check-cla.yml

@@ -5,5 +5,5 @@ jobs:
   check-cla:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: ./scripts/check-cla.sh

.github/workflows/check-lint.yml

@@ -5,5 +5,5 @@ jobs:
   check-lint:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: ./scripts/check-lint.sh

.github/workflows/publish.yml

@@ -0,0 +1,46 @@
+name: Publish
+on:
+  push:
+    tags:
+    - 'v0.4.*'
+  workflow_dispatch:
+
+jobs:
+  publish:
+    name: Publish
+    runs-on: ubuntu-22.04
+    if: github.repository == 'scala-native/scala-native-cli'
+    steps:
+      - uses: actions/checkout@v3
+      - uses: coursier/cache-action@v6
+      - uses: coursier/setup-action@v1
+        with:
+          jvm: adopt:8
+
+      - name: Setup PGP Key
+        run: |
+          echo -n "$PGP_SECRET" | base64 --decode | gpg --batch --import
+        env:
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+
+      - name: Compile everything
+        run: sbt "+Test/compile"
+
+      - name: Publish release
+        env:
+          MAVEN_USER: "${{ secrets.SONATYPE_USER }}"
+          MAVEN_PASSWORD: "${{ secrets.SONATYPE_PASSWORD }}"
+          PGP_PASSPHRASE: "${{ secrets.PGP_PASSWORD }}"
+        run: sbt "clean;+cli/cliPack; +cli/publishSigned"
+
+      - name: Create release artifacts
+        run: |
+          version=$(sbt "print cli/version" | grep . | tail -n 2 | head -n 1)
+          echo "This build version: $version"
+          ./scripts/dist.sh $version
+
+      - name: Archive CLI artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: scala-native-cli
+          path: release/

build.sbt

@@ -3,10 +3,14 @@ val crossScalaVersions213 = (4 to 11).map("2.13." + _)
 val crossScalaVersions3 =
   (0 to 3).map("3.1." + _) ++
     (0 to 2).map("3.2." + _) ++
-    (0 to 0).map("3.3." + _)
+    (0 to 1).map("3.3." + _)
 
-val publishScalaVersions =
-  Seq(crossScalaVersions212, crossScalaVersions213).map(_.last) ++ Seq("3.1.3")
+val scala2_12 = crossScalaVersions212.last
+val scala2_13 = crossScalaVersions213.last
+val scala3 = crossScalaVersions3.last
+val scala3PublishVersion = "3.1.3"
+
+val publishScalaVersions = Seq(scala2_12, scala2_13, scala3PublishVersion)
 
 def scalaReleasesForBinaryVersion(v: String): Seq[String] = v match {
   case "2.12" => crossScalaVersions212
@@ -57,7 +61,7 @@ inThisBuild(
     organization := "org.scala-native",
     scalaNativeVersion := "0.4.15",
     version := scalaNativeVersion.value,
-    scalaVersion := crossScalaVersions212.last,
+    scalaVersion := scala3PublishVersion,
     crossScalaVersions := publishScalaVersions,
     homepage := Some(url("http://www.scala-native.org")),
     startYear := Some(2021),
@@ -74,7 +78,7 @@ inThisBuild(
           Some("scm:git:[email protected]:scala-native/scala-native-cli.git")
       )
     ),
-    resolvers += Resolver.sonatypeRepo("snapshots"),
+    resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
     resolvers += Resolver.mavenCentral,
     resolvers += Resolver.defaultLocal
   )
@@ -143,8 +147,9 @@ lazy val cliScriptedTests = project
 
 def nativeBinaryVersion(version: String): String = {
   val VersionPattern = raw"(\d+)\.(\d+)\.(\d+)(\-.*)?".r
-  val VersionPattern(major, minor, _, _) = version
-  s"$major.$minor"
+  val VersionPattern(major, minor, patch, milestone) = version
+  if (patch != null && milestone != null) version
+  else s"$major.$minor"
 }
 lazy val cliPackSettings = Def.settings(
   cliPackLibJars := {
@@ -259,11 +264,14 @@ lazy val publishSettings = Def.settings(
   },
   credentials ++= {
     for {
-      realm <- sys.env.get("MAVEN_REALM")
-      domain <- sys.env.get("MAVEN_DOMAIN")
       user <- sys.env.get("MAVEN_USER")
       password <- sys.env.get("MAVEN_PASSWORD")
-    } yield Credentials(realm, domain, user, password)
+    } yield Credentials(
+      realm = "Sonatype Nexus Repository Manager",
+      host = "oss.sonatype.org",
+      userName = user,
+      passwd = password
+    )
   }.toSeq,
   developers ++= List(
     Developer(

cli/src/sbt-test/integration/cli/build.sbt

@@ -1,4 +1,4 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 enablePlugins(ScalaNativePlugin)
 
 import sbt._

cli/src/sbt-test/integration/cli/project/build.sbt

@@ -1,4 +1,4 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
 val pluginVersion = System.getProperty("plugin.version")
 if (pluginVersion == null)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.6.1
+sbt.version=1.9.2

project/plugins.sbt

@@ -1,2 +1,3 @@
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.0.0")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.0")

scripts/dist.sh

@@ -1,13 +1,11 @@
 #/bin/bash
 
 set -x
-Version=0.4.14
+Version=$1
 Scala3Version=3.1.3
 ReleaseDir="${PWD}/release"
 TargetDir="${PWD}/cli/target"
 
-sbt "clean;+cli/cliPack"
-
 mkdir -p ${ReleaseDir}
 cd $ReleaseDir