Scala Native Scala 3 (#267)

* Scala Native Scala 3 * Specify Scala Native version explicitly again * Update versions * Update versions Co-authored-by: Kai <450507+neko-kai@users.noreply.github.com>
zio · Apr 28, 2022 · f4b6a45 · f4b6a45
1 parent e8778c6
commit f4b6a45
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/build.sbt b/build.sbt
@@ -75,7 +75,7 @@ lazy val `izumi-reflect-thirdparty-boopickle-shaded` = crossProject(JVMPlatform,
       }
     },
     Compile / doc / sources := { (isSnapshot.value, scalaVersion.value) match {
-      case (_, "3.1.1") => Seq(
+      case (_, "3.1.2") => Seq(
 
       )
       case (_, _) => (Compile / doc / sources).value
@@ -153,7 +153,7 @@ lazy val `izumi-reflect-thirdparty-boopickle-shaded` = crossProject(JVMPlatform,
     } },
     scalacOptions -= "-Wconf:any:error",
     mimaPreviousArtifacts := { (isSnapshot.value, scalaVersion.value) match {
-      case (_, "3.1.1") => Set.empty
+      case (_, "3.1.2") => Set.empty
       case (_, _) => Set(organization.value %% name.value % "1.0.0")
     } },
     scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match {
@@ -177,7 +177,7 @@ lazy val `izumi-reflect-thirdparty-boopickle-shaded` = crossProject(JVMPlatform,
   )
   .jvmSettings(
     crossScalaVersions := Seq(
-      "3.1.1",
+      "3.1.2",
       "2.13.8",
       "2.12.15",
       "2.11.12"
@@ -186,7 +186,7 @@ lazy val `izumi-reflect-thirdparty-boopickle-shaded` = crossProject(JVMPlatform,
   )
   .jsSettings(
     crossScalaVersions := Seq(
-      "3.1.1",
+      "3.1.2",
       "2.13.8",
       "2.12.15",
       "2.11.12"
@@ -197,6 +197,7 @@ lazy val `izumi-reflect-thirdparty-boopickle-shaded` = crossProject(JVMPlatform,
   )
   .nativeSettings(
     crossScalaVersions := Seq(
+      "3.1.2",
       "2.13.8",
       "2.12.15",
       "2.11.12"
@@ -285,7 +286,7 @@ lazy val `izumi-reflect` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
       }
     },
     Compile / doc / sources := { (isSnapshot.value, scalaVersion.value) match {
-      case (_, "3.1.1") => Seq(
+      case (_, "3.1.2") => Seq(
 
       )
       case (_, _) => (Compile / doc / sources).value
@@ -363,7 +364,7 @@ lazy val `izumi-reflect` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
     } },
     scalacOptions -= "-Wconf:any:error",
     mimaPreviousArtifacts := { (isSnapshot.value, scalaVersion.value) match {
-      case (_, "3.1.1") => Set.empty
+      case (_, "3.1.2") => Set.empty
       case (_, _) => Set(organization.value %% name.value % "1.0.0")
     } },
     scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match {
@@ -386,7 +387,7 @@ lazy val `izumi-reflect` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   )
   .jvmSettings(
     crossScalaVersions := Seq(
-      "3.1.1",
+      "3.1.2",
       "2.13.8",
       "2.12.15",
       "2.11.12"
@@ -395,7 +396,7 @@ lazy val `izumi-reflect` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   )
   .jsSettings(
     crossScalaVersions := Seq(
-      "3.1.1",
+      "3.1.2",
       "2.13.8",
       "2.12.15",
       "2.11.12"
@@ -406,6 +407,7 @@ lazy val `izumi-reflect` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   )
   .nativeSettings(
     crossScalaVersions := Seq(
+      "3.1.2",
       "2.13.8",
       "2.12.15",
       "2.11.12"
@@ -467,7 +469,7 @@ lazy val `izumi-reflect-root-jvm` = (project in file(".agg/.agg-jvm"))
   .settings(
     publish / skip := true,
     crossScalaVersions := Seq(
-      "3.1.1",
+      "3.1.2",
       "2.13.8",
       "2.12.15",
       "2.11.12"
@@ -482,7 +484,7 @@ lazy val `izumi-reflect-root-js` = (project in file(".agg/.agg-js"))
   .settings(
     publish / skip := true,
     crossScalaVersions := Seq(
-      "3.1.1",
+      "3.1.2",
       "2.13.8",
       "2.12.15",
       "2.11.12"
@@ -497,7 +499,7 @@ lazy val `izumi-reflect-root-native` = (project in file(".agg/.agg-native"))
   .settings(
     publish / skip := true,
     crossScalaVersions := Seq(
-      "3.1.1",
+      "3.1.2",
       "2.13.8",
       "2.12.15",
       "2.11.12"
@@ -534,7 +536,7 @@ lazy val `izumi-reflect-root` = (project in file("."))
       "-XDignore.symbol.file"
     ),
     crossScalaVersions := Nil,
-    scalaVersion := "3.1.1",
+    scalaVersion := "3.1.2",
     ThisBuild / organization := "dev.zio",
     sonatypeProfileName := "dev.zio",
     sonatypeSessionName := s"[sbt-sonatype] ${name.value} ${version.value} ${java.util.UUID.randomUUID}",

diff --git a/project/Deps.sc b/project/Deps.sc
@@ -26,7 +26,7 @@ object Izumi {
   final val scala211 = ScalaVersion("2.11.12")
   final val scala212 = ScalaVersion("2.12.15")
   final val scala213 = ScalaVersion("2.13.8")
-  final val scala300 = ScalaVersion("3.1.1")
+  final val scala300 = ScalaVersion("3.1.2")
 
   // launch with `./sbtgen.sc 2` to use 2.13 in Intellij
   var targetScala = Seq(scala300, scala213, scala212, scala211)
@@ -56,7 +56,8 @@ object Izumi {
 
   val settings = GlobalSettings(
     groupId = "dev.zio",
-    sbtVersion = None
+    sbtVersion = None,
+    scalaNativeVersion = Version.VExpr("PV.scala_native_version")
   )
 
   object Deps {
@@ -92,7 +93,7 @@ object Izumi {
     )
     private val nativePlatform = PlatformEnv(
       platform = Platform.Native,
-      language = targetScala.filterNot(_.isDotty),
+      language = targetScala,
       settings = Seq(
         "coverageEnabled" := false
       )

diff --git a/project/Versions.scala b/project/Versions.scala
@@ -18,6 +18,6 @@
 
 object V {
   val kind_projector = "0.13.2"
-  val collection_compat = "2.6.0"
-  val scalatest = "3.2.11"
+  val collection_compat = "2.7.0"
+  val scalatest = "3.2.12"
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -11,7 +11,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
 addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0")
 
-addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.3")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % PV.scala_native_version)
 
 ////////////////////////////////////////////////////////////////////////////////
 

diff --git a/project/project/PluginVersions.scala b/project/project/PluginVersions.scala
@@ -21,4 +21,5 @@ object PV {
   val sbt_pgp = "2.1.1"
 
   val sbt_mima_version = "1.0.1"
+  val scala_native_version = "0.4.4"
 }