Release 0.4.6 and 0.4.7 (#22)

* Release 0.4.6

* Update CI runners

* Update used versions of Scala in  the CI

* Set jvm target flag

* Set version to 0.4.7

Author: WojciechMazur

.github/workflows/CI.yml

@@ -6,8 +6,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        OS: [ubuntu-18.04, windows-2019]
-        scala: [2.12.15, 2.13.8, 3.1.1]
+        OS: [ubuntu-22.04, windows-2022]
+        scala: [2.12.15, 2.13.8, 3.2.0]
     steps:
       - uses: actions/checkout@v2
       - uses: olafurpg/setup-scala@v13

.github/workflows/check-cla.yml

@@ -3,7 +3,7 @@ name: Check CLA
 on: [pull_request]
 jobs:
   check-cla:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - run: ./scripts/check-cla.sh

.github/workflows/check-lint.yml

@@ -3,7 +3,7 @@ name: Check Lint
 on: [pull_request]
 jobs:
   check-lint:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - run: ./scripts/check-lint.sh

build.sbt

@@ -1,10 +1,8 @@
 val crossScalaVersions212 = (13 to 16).map("2.12." + _)
 val crossScalaVersions213 = (4 to 8).map("2.13." + _)
-val crossScalaVersions3 = (0 to 3).map("3.1." + _)
-val latestsScalaVersions =
-  Seq(crossScalaVersions212, crossScalaVersions213, crossScalaVersions3).map(
-    _.last
-  )
+val crossScalaVersions3 = (0 to 3).map("3.1." + _) ++ (0 to 0).map("3.2." + _)
+val publishScalaVersions =
+  Seq(crossScalaVersions212, crossScalaVersions213).map(_.last) ++ Seq("3.1.3")
 
 def scalaReleasesForBinaryVersion(v: String): Seq[String] = v match {
   case "2.12" => crossScalaVersions212
@@ -53,10 +51,10 @@ val cliAssemblyJarName = settingKey[String]("Name of created assembly jar")
 inThisBuild(
   Def.settings(
     organization := "org.scala-native",
-    scalaNativeVersion := "0.4.5",
+    scalaNativeVersion := "0.4.7",
     version := scalaNativeVersion.value,
     scalaVersion := crossScalaVersions212.last,
-    crossScalaVersions := latestsScalaVersions,
+    crossScalaVersions := publishScalaVersions,
     homepage := Some(url("http://www.scala-native.org")),
     startYear := Some(2021),
     licenses := Seq(
@@ -85,10 +83,14 @@ lazy val cli = project
   .enablePlugins(BuildInfoPlugin)
   .settings(
     name := "scala-native-cli",
-    crossScalaVersions := latestsScalaVersions,
+    crossScalaVersions := publishScalaVersions,
     Compile / run / mainClass :=
       Some("scala.scalanative.cli.ScalaNativeLd"),
     scalacOptions += "-Ywarn-unused:imports",
+    scalacOptions ++= CrossVersion.partialVersion(scalaVersion.value).collect {
+      case (2, _) => "-target:jvm-1.8"
+      case (3, _) => "-Xtarget:8"
+    },
     libraryDependencies ++= Seq(
       "org.scala-native" %% "tools" % scalaNativeVersion.value,
       "com.github.scopt" %% "scopt" % "4.0.1",

dist.sh

@@ -0,0 +1,26 @@
+#/bin/bash
+
+Version=0.4.5
+Scala3Version=3.1.3
+ReleaseDir="${PWD}/release"
+TargetDir="${PWD}/cli/target"
+
+mkdir -p ${ReleaseDir}
+cd $ReleaseDir
+
+sbt clean;+cliPack
+
+for ScalaBinVer in 2.12 2.13 3; do
+  ScalaVersion=$ScalaBinVer
+  if [ "$ScalaBinVer" = "3" ]; then
+    ScalaVersion="${Scala3Version}"
+  fi
+  cd "${TargetDir}/scala-${ScalaVersion}/pack"
+
+  dirName="scala-native-cli_${ScalaBinVer}-${Version}"
+  tarName="$dirName.tgz"
+  zipName="$dirName.zip"
+  tar cfz $tarName $dirName
+  zip -r $zipName -r $dirName/
+  mv $tarName $zipName $ReleaseDir
+done