From 80afaf2581430441f7848d994bece436420501e5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 9 Jul 2021 15:54:39 +0200 Subject: [PATCH 1/2] Update scala3-library, ... to 3.0.1 --- .circleci/config.yml | 8 ++++---- .travis.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cbb8974a..42288fe7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,11 +113,11 @@ workflows: - scala_job: name: 3.0.0 java_version: jdk8 - scala_version: 3.0.0 + scala_version: 3.0.1 - scala_job: name: 3.0.0-RC3 java_version: jdk8 - scala_version: 3.0.0-RC3 + scala_version: 3.0.1-RC3 - scala_job: name: jdk11_2.12 java_version: jdk11 @@ -129,7 +129,7 @@ workflows: - scala_job: name: jdk11_3.0 java_version: jdk11 - scala_version: 3.0.0 + scala_version: 3.0.1 - scala_job: name: jdk16_2.12 java_version: jdk16 @@ -141,7 +141,7 @@ workflows: - scala_job: name: jdk16_3.0 java_version: jdk16 - scala_version: 3.0.0 + scala_version: 3.0.1 - scalajs_job: name: sjs1.0_2.12 scala_version: 2.12.14 diff --git a/.travis.yml b/.travis.yml index f31e3471..dda5330f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,9 @@ env: jobs: exclude: - - scala: 3.0.0-RC3 + - scala: 3.0.1-RC3 env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8 - - scala: 3.0.0 + - scala: 3.0.1 env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8 install: From 98127e0afbf1df71e95030b54306c3c4107c6ee1 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 9 Jul 2021 07:50:11 -0700 Subject: [PATCH 2/2] drop Scala 3.0.0-RC3 from crossbuild --- .circleci/config.yml | 6 +----- .travis.yml | 5 +---- CHANGELOG.md | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 42288fe7..1759491b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -111,13 +111,9 @@ workflows: java_version: jdk8 scala_version: 2.13.6 - scala_job: - name: 3.0.0 + name: 3.0.1 java_version: jdk8 scala_version: 3.0.1 - - scala_job: - name: 3.0.0-RC3 - java_version: jdk8 - scala_version: 3.0.1-RC3 - scala_job: name: jdk11_2.12 java_version: jdk11 diff --git a/.travis.yml b/.travis.yml index dda5330f..cbddb8f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,7 @@ import: scala/scala-dev:travis/default.yml language: scala scala: - - 3.0.0 - - 3.0.0-RC3 + - 3.0.1 - 2.12.14 - 2.13.6 @@ -19,8 +18,6 @@ env: jobs: exclude: - - scala: 3.0.1-RC3 - env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8 - scala: 3.0.1 env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8 diff --git a/CHANGELOG.md b/CHANGELOG.md index d1243123..47db07d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Not binary compatible with Scala XML 1.3.0. -Published for Scala 2.12, 2.13, and 3.0 (and 3.0.0-RC3), Scala.js 1.5, +Published for Scala 2.12, 2.13, and 3.0, Scala.js 1.5, and Scala Native 0.4. Artifacts are no longer published for Scala 2.11 and Scala.js 0.6.