From b4a24598fd634b14c4c98ff5a310f256825ebb2b Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Wed, 20 Jan 2021 14:35:15 +0100 Subject: [PATCH 1/5] Update Scala Native 0.4.0 --- .travis.yml | 7 +++---- build.sc | 23 +++++++++++++++++------ mill | 2 +- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4c275c..a26b223 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,12 @@ +os: linux language: scala -sudo: required -dist: trusty +dist: bionic addons: apt: update: true jdk: - - oraclejdk8 + - openjdk8 script: - - curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x - ./mill __.test.run diff --git a/build.sc b/build.sc index 8dc15f1..5e755e3 100644 --- a/build.sc +++ b/build.sc @@ -1,5 +1,19 @@ import mill._, scalalib._, scalajslib._, scalanativelib._, publish._ +val scala211 = "2.11.12" +val scala212 = "2.12.13" +val scala213 = "2.13.4" +val scala3 = "3.0.0-M2" + +val scalaJSVersions = for { + scalaV <- Seq(scala213, scala212) + scalaJSV <- Seq("0.6.33", "1.4.0") +} yield (scalaV, scalaJSV) + +val scalaNativeVersions = for { + scalaV <- Seq(scala213, scala212) + scalaNativeV <- Seq("0.4.0") +} yield (scalaV, scalaNativeV) trait SourcecodeModule extends PublishModule { def artifactName = "sourcecode" @@ -65,7 +79,7 @@ trait SourcecodeTestModule extends ScalaModule { object sourcecode extends Module { val dottyVersion = Option(sys.props("dottyVersion")) - object jvm extends Cross[JvmSourcecodeModule]((List("2.11.12", "2.12.8", "2.13.0", "3.0.0-M3") ++ dottyVersion): _*) + object jvm extends Cross[JvmSourcecodeModule]((List("2.11.12", "2.12.12", "2.13.4", "3.0.0-M3") ++ dottyVersion): _*) class JvmSourcecodeModule(val crossScalaVersion: String) extends SourcecodeMainModule with ScalaModule with SourcecodeModule { @@ -85,10 +99,7 @@ object sourcecode extends Module { } } - object js extends Cross[JsSourcecodeModule]( - ("2.11.12", "0.6.33"), ("2.12.10", "0.6.33"), ("2.13.1", "0.6.33"), - ("2.11.12", "1.0.0"), ("2.12.10", "1.0.0"), ("2.13.1", "1.0.0") - ) + object js extends Cross[JsSourcecodeModule](scalaJSVersions: _*) class JsSourcecodeModule(val crossScalaVersion: String, crossJSVersion: String) extends SourcecodeMainModule with ScalaJSModule with SourcecodeModule { def offset = os.up @@ -103,7 +114,7 @@ object sourcecode extends Module { } } - object native extends Cross[NativeSourcecodeModule](("2.11.12", "0.3.9"), ("2.11.12", "0.4.0-M2")) + object native extends Cross[NativeSourcecodeModule](scalaNativeVersions: _*) class NativeSourcecodeModule(val crossScalaVersion: String, crossScalaNativeVersion: String) extends SourcecodeMainModule with ScalaNativeModule with SourcecodeModule { def offset = os.up diff --git a/mill b/mill index 4afe22c..11a4b58 100755 --- a/mill +++ b/mill @@ -3,7 +3,7 @@ # This is a wrapper script, that automatically download mill from GitHub release pages # You can give the required mill version with MILL_VERSION env variable # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION -DEFAULT_MILL_VERSION=0.8.0-13-105f53 +DEFAULT_MILL_VERSION=0.9.4-18-82ea87 set -e From 7135c70f1b5af8e1b4925aa2293a9cf6a904488c Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Wed, 20 Jan 2021 14:38:24 +0100 Subject: [PATCH 2/5] Fix jvm versions to use variables --- build.sc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sc b/build.sc index 5e755e3..c4fa588 100644 --- a/build.sc +++ b/build.sc @@ -78,8 +78,8 @@ trait SourcecodeTestModule extends ScalaModule { } object sourcecode extends Module { - val dottyVersion = Option(sys.props("dottyVersion")) - object jvm extends Cross[JvmSourcecodeModule]((List("2.11.12", "2.12.12", "2.13.4", "3.0.0-M3") ++ dottyVersion): _*) + val dottyVersion = sys.props.get("dottyVersion") + object jvm extends Cross[JvmSourcecodeModule]((scala211 :: scala212 :: scala213 :: scala3 :: dottyVersion.toList): _*) class JvmSourcecodeModule(val crossScalaVersion: String) extends SourcecodeMainModule with ScalaModule with SourcecodeModule { From a3cdd4201ffe48a45e67f8f70615bd77ebc736e7 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Wed, 20 Jan 2021 14:43:19 +0100 Subject: [PATCH 3/5] Fix Scala 3 version --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index c4fa588..8b418aa 100644 --- a/build.sc +++ b/build.sc @@ -3,7 +3,7 @@ import mill._, scalalib._, scalajslib._, scalanativelib._, publish._ val scala211 = "2.11.12" val scala212 = "2.12.13" val scala213 = "2.13.4" -val scala3 = "3.0.0-M2" +val scala3 = "3.0.0-M3" val scalaJSVersions = for { scalaV <- Seq(scala213, scala212) From 4d08d1e084aec4f8b60f2aee0d54ee78452b120f Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Wed, 20 Jan 2021 15:26:16 +0100 Subject: [PATCH 4/5] DRY scala versions --- build.sc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build.sc b/build.sc index 8b418aa..b336314 100644 --- a/build.sc +++ b/build.sc @@ -5,13 +5,18 @@ val scala212 = "2.12.13" val scala213 = "2.13.4" val scala3 = "3.0.0-M3" +val dottyVersions = sys.props.get("dottyVersion").toList + +val scalaVersions = "2.11.12" :: "2.12.13" :: "2.13.4" :: "3.0.0-M3" :: dottyVersions +val scala2Versions = scalaVersions.filter(_.startsWith("2.")) + val scalaJSVersions = for { - scalaV <- Seq(scala213, scala212) + scalaV <- scala2Versions scalaJSV <- Seq("0.6.33", "1.4.0") } yield (scalaV, scalaJSV) val scalaNativeVersions = for { - scalaV <- Seq(scala213, scala212) + scalaV <- scala2Versions scalaNativeV <- Seq("0.4.0") } yield (scalaV, scalaNativeV) @@ -79,7 +84,7 @@ trait SourcecodeTestModule extends ScalaModule { object sourcecode extends Module { val dottyVersion = sys.props.get("dottyVersion") - object jvm extends Cross[JvmSourcecodeModule]((scala211 :: scala212 :: scala213 :: scala3 :: dottyVersion.toList): _*) + object jvm extends Cross[JvmSourcecodeModule](scalaVersions: _*) class JvmSourcecodeModule(val crossScalaVersion: String) extends SourcecodeMainModule with ScalaModule with SourcecodeModule { From 802b2ff12c619d24517943e8a9c1fd5b334b6e68 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Wed, 20 Jan 2021 15:54:03 +0100 Subject: [PATCH 5/5] Remove unused scala version variables --- build.sc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.sc b/build.sc index b336314..77880b5 100644 --- a/build.sc +++ b/build.sc @@ -1,10 +1,5 @@ import mill._, scalalib._, scalajslib._, scalanativelib._, publish._ -val scala211 = "2.11.12" -val scala212 = "2.12.13" -val scala213 = "2.13.4" -val scala3 = "3.0.0-M3" - val dottyVersions = sys.props.get("dottyVersion").toList val scalaVersions = "2.11.12" :: "2.12.13" :: "2.13.4" :: "3.0.0-M3" :: dottyVersions