From 70efc91c7485bf7f858405aaab1cb6b44e1e6936 Mon Sep 17 00:00:00 2001 From: David Strawn Date: Sun, 6 Sep 2020 11:31:05 -0600 Subject: [PATCH 1/4] Update For Scala 3.0.0-M2 --- .circleci/config.yml | 24 ++++++++++++++++-------- .travis.yml | 8 +++++--- build.sbt | 5 ++--- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ca974cb4..6d958d652 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -89,9 +89,9 @@ workflows: java_version: jdk8 scala_version: 2.13.3 - scala_job: - name: dotty-0.27.0-RC1 + name: 3.0.0-M2 java_version: jdk8 - scala_version: 0.27.0-RC1 + scala_version: 3.0.0-M2 - scala_job: name: jdk11_2.12 java_version: jdk11 @@ -101,9 +101,9 @@ workflows: java_version: jdk11 scala_version: 2.13.3 - scala_job: - name: jdk11_dotty + name: jdk11_3.0 java_version: jdk11 - scala_version: 0.27.0-RC1 + scala_version: 3.0.0-M2 - scala_job: name: jdk13_2.12 java_version: jdk13 @@ -113,9 +113,9 @@ workflows: java_version: jdk13 scala_version: 2.13.3 - scala_job: - name: jdk13_dotty + name: jdk13_3.0 java_version: jdk13 - scala_version: 0.27.0-RC1 + scala_version: 3.0.0-M2 - scala_job: name: jdk14_2.12 java_version: jdk14 @@ -125,9 +125,17 @@ workflows: java_version: jdk14 scala_version: 2.13.3 - scala_job: - name: jdk14_dotty + name: jdk14_3.0 java_version: jdk14 - scala_version: 0.27.0-RC1 + scala_version: 3.0.0-M2 + - scalajs_job: + name: sjs0.6_2.12 + scala_version: 2.12.10 + scalajs_version: 0.6.33 + - scalajs_job: + name: sjs0.6_2.13 + scala_version: 2.13.1 + scalajs_version: 0.6.33 - scalajs_job: name: sjs1.0_2.12 scala_version: 2.12.12 diff --git a/.travis.yml b/.travis.yml index 55cd551c0..426699d81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml language: scala scala: - - 0.27.0-RC1 + - 3.0.0-M2 - 2.12.12 - 2.13.3 @@ -17,8 +17,10 @@ env: matrix: exclude: - - scala: 0.27.0-RC1 - env: SCALAJS_VERSION=1.3.1 ADOPTOPENJDK=8 + - scala: 3.0.0-M1 + env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8 + - scala: 3.0.0-M1 + env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8 install: - git fetch --tags # get all tags for sbt-dynver diff --git a/build.sbt b/build.sbt index d7a612007..0aaa8c5f5 100644 --- a/build.sbt +++ b/build.sbt @@ -6,8 +6,7 @@ lazy val configSettings: Seq[Setting[_]] = Seq( val sv = scalaVersion.value Seq( CrossVersion.partialVersion(sv) match { - case Some((2, 13)) => file(dir.getPath ++ "-2.13+") - case Some((0, _)) => file(dir.getPath ++ "-2.13+") + case Some((major, minor)) if major > 2 || (major == 2 && minor >= 13) => file(dir.getPath ++ "-2.13+") case _ => file(dir.getPath ++ "-2.13-") }, CrossVersion.partialVersion(sv) match { @@ -165,7 +164,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) ) .jsSettings( // The config for Travis has an exclude, but sbt-travisci doesn't catch it. - crossScalaVersions -= "0.27.0-RC1", + crossScalaVersions -= "3.0.0-M2", // Scala.js cannot run forked tests fork in Test := false ) From 72e77d0aa86780ecf039ff352e7c8a17055469ba Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 25 Nov 2020 17:02:20 -0800 Subject: [PATCH 2/4] Scala 2.13.4 (was 2.13.3) --- .circleci/config.yml | 12 ++++++------ .travis.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d958d652..e1360822a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -85,9 +85,9 @@ workflows: java_version: jdk8 scala_version: 2.12.12 - scala_job: - name: 2.13.3 + name: 2.13.4 java_version: jdk8 - scala_version: 2.13.3 + scala_version: 2.13.4 - scala_job: name: 3.0.0-M2 java_version: jdk8 @@ -99,7 +99,7 @@ workflows: - scala_job: name: jdk11_2.13 java_version: jdk11 - scala_version: 2.13.3 + scala_version: 2.13.4 - scala_job: name: jdk11_3.0 java_version: jdk11 @@ -111,7 +111,7 @@ workflows: - scala_job: name: jdk13_2.13 java_version: jdk13 - scala_version: 2.13.3 + scala_version: 2.13.4 - scala_job: name: jdk13_3.0 java_version: jdk13 @@ -123,7 +123,7 @@ workflows: - scala_job: name: jdk14_2.13 java_version: jdk14 - scala_version: 2.13.3 + scala_version: 2.13.4 - scala_job: name: jdk14_3.0 java_version: jdk14 @@ -142,5 +142,5 @@ workflows: scalajs_version: 1.3.1 - scalajs_job: name: sjs1.0_2.13 - scala_version: 2.13.3 + scala_version: 2.13.4 scalajs_version: 1.3.1 diff --git a/.travis.yml b/.travis.yml index 426699d81..df021bbe1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ language: scala scala: - 3.0.0-M2 - 2.12.12 - - 2.13.3 + - 2.13.4 env: - SCALAJS_VERSION= ADOPTOPENJDK=8 From 285327c4429ad2c75eb645faa9926dee6afeac4e Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 25 Nov 2020 17:02:38 -0800 Subject: [PATCH 3/4] build cleanup: drop old Scala.js cruft --- .circleci/config.yml | 8 -------- .travis.yml | 7 ------- build.sbt | 1 - 3 files changed, 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e1360822a..0da6cfa82 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,14 +128,6 @@ workflows: name: jdk14_3.0 java_version: jdk14 scala_version: 3.0.0-M2 - - scalajs_job: - name: sjs0.6_2.12 - scala_version: 2.12.10 - scalajs_version: 0.6.33 - - scalajs_job: - name: sjs0.6_2.13 - scala_version: 2.13.1 - scalajs_version: 0.6.33 - scalajs_job: name: sjs1.0_2.12 scala_version: 2.12.12 diff --git a/.travis.yml b/.travis.yml index df021bbe1..995ce8216 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,13 +15,6 @@ env: - SCALAJS_VERSION= ADOPTOPENJDK=11 - SCALAJS_VERSION= ADOPTOPENJDK=13 -matrix: - exclude: - - scala: 3.0.0-M1 - env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8 - - scala: 3.0.0-M1 - env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8 - install: - git fetch --tags # get all tags for sbt-dynver diff --git a/build.sbt b/build.sbt index 0aaa8c5f5..8e393a707 100644 --- a/build.sbt +++ b/build.sbt @@ -45,7 +45,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) scalaModuleMimaPreviousVersion := { if (isDotty.value) None // No such release yet - // else if (System.getenv("SCALAJS_VERSION") == "1.0.1") None else Some("1.3.0") }, mimaBinaryIssueFilters ++= { From 57336604183f498c8e0797317027c404a1405586 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 25 Nov 2020 17:19:23 -0800 Subject: [PATCH 4/4] CI: drop JDK 13 and 14, add 15 --- .circleci/config.yml | 31 ++++++++----------------------- .travis.yml | 2 +- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0da6cfa82..c3a014c75 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,12 +7,9 @@ executors: scala_jdk11_executor: docker: - image: circleci/openjdk:11-jdk - scala_jdk13_executor: + scala_jdk15_executor: docker: - - image: circleci/openjdk:13.0.1-jdk-buster - scala_jdk14_executor: - docker: - - image: circleci/openjdk:14-ea-26-jdk-buster + - image: circleci/openjdk:15-buster commands: sbt_cmd: @@ -105,28 +102,16 @@ workflows: java_version: jdk11 scala_version: 3.0.0-M2 - scala_job: - name: jdk13_2.12 - java_version: jdk13 - scala_version: 2.12.12 - - scala_job: - name: jdk13_2.13 - java_version: jdk13 - scala_version: 2.13.4 - - scala_job: - name: jdk13_3.0 - java_version: jdk13 - scala_version: 3.0.0-M2 - - scala_job: - name: jdk14_2.12 - java_version: jdk14 + name: jdk15_2.12 + java_version: jdk15 scala_version: 2.12.12 - scala_job: - name: jdk14_2.13 - java_version: jdk14 + name: jdk15_2.13 + java_version: jdk15 scala_version: 2.13.4 - scala_job: - name: jdk14_3.0 - java_version: jdk14 + name: jdk15_3.0 + java_version: jdk15 scala_version: 3.0.0-M2 - scalajs_job: name: sjs1.0_2.12 diff --git a/.travis.yml b/.travis.yml index 995ce8216..4f9db8432 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: - SCALAJS_VERSION= ADOPTOPENJDK=8 - SCALAJS_VERSION=1.3.1 ADOPTOPENJDK=8 - SCALAJS_VERSION= ADOPTOPENJDK=11 - - SCALAJS_VERSION= ADOPTOPENJDK=13 + - SCALAJS_VERSION= ADOPTOPENJDK=15 install: - git fetch --tags # get all tags for sbt-dynver