Skip to content

Commit c01bc7a

Browse files
committed
add Scala 3.0.0-RC2 and JDK 16, drop M3 and 15
1 parent 916e48f commit c01bc7a

File tree

3 files changed

+12
-27
lines changed

3 files changed

+12
-27
lines changed

.circleci/config.yml

+6-21
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ executors:
77
scala_jdk11_executor:
88
docker:
99
- image: circleci/openjdk:11-jdk
10-
scala_jdk15_executor:
11-
docker:
12-
- image: circleci/openjdk:15-buster
1310
scala_jdk16_executor:
1411
docker:
1512
- image: circleci/openjdk:16-buster
@@ -119,13 +116,13 @@ workflows:
119116
java_version: jdk8
120117
scala_version: 2.13.5
121118
- scala_job:
122-
name: 3.0.0-RC1
119+
name: 3.0.0-RC2
123120
java_version: jdk8
124-
scala_version: 3.0.0-RC1
121+
scala_version: 3.0.0-RC2
125122
- scala_job:
126-
name: 3.0.0-M3
123+
name: 3.0.0-RC1
127124
java_version: jdk8
128-
scala_version: 3.0.0-M3
125+
scala_version: 3.0.0-RC1
129126
- scala_job:
130127
name: jdk11_2.12
131128
java_version: jdk11
@@ -137,19 +134,7 @@ workflows:
137134
- scala_job:
138135
name: jdk11_3.0
139136
java_version: jdk11
140-
scala_version: 3.0.0-RC1
141-
- scala_job:
142-
name: jdk15_2.12
143-
java_version: jdk15
144-
scala_version: 2.12.13
145-
- scala_job:
146-
name: jdk15_2.13
147-
java_version: jdk15
148-
scala_version: 2.13.5
149-
- scala_job:
150-
name: jdk15_3.0
151-
java_version: jdk15
152-
scala_version: 3.0.0-RC1
137+
scala_version: 3.0.0-RC2
153138
- scala_job:
154139
name: jdk16_2.12
155140
java_version: jdk16
@@ -161,7 +146,7 @@ workflows:
161146
- scala_job:
162147
name: jdk16_3.0
163148
java_version: jdk16
164-
scala_version: 3.0.0-RC1
149+
scala_version: 3.0.0-RC2
165150
- scalajs_job:
166151
name: sjs1.0_2.12
167152
scala_version: 2.12.13

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import: scala/scala-dev:travis/default.yml
55
language: scala
66

77
scala:
8+
- 3.0.0-RC2
89
- 3.0.0-RC1
9-
- 3.0.0-M3
1010
- 2.12.13
1111
- 2.13.5
1212

@@ -15,14 +15,14 @@ env:
1515
- SCALAJS_VERSION=1.5.0 ADOPTOPENJDK=8
1616
- SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
1717
- SCALAJS_VERSION= ADOPTOPENJDK=11
18-
- SCALAJS_VERSION= ADOPTOPENJDK=15
18+
- SCALAJS_VERSION= ADOPTOPENJDK=16
1919

2020
jobs:
2121
exclude:
22-
- scala: 3.0.0-M3
23-
env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
2422
- scala: 3.0.0-RC1
2523
env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
24+
- scala: 3.0.0-RC2
25+
env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
2626

2727
install:
2828
- git fetch --tags # get all tags for sbt-dynver

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
7474
exclude[DirectMissingMethodProblem]("scala.xml.Utility.escapeText"),
7575
// New MiMa checks for generic signature changes
7676
exclude[IncompatibleSignatureProblem]("*"),
77-
// afaict this is just a JDK 8 vs 15 difference, producing a false positive when
78-
// we compare classes built on JDK 15 (which we only do on CI, not at release time)
77+
// afaict this is just a JDK 8 vs 16 difference, producing a false positive when
78+
// we compare classes built on JDK 16 (which we only do on CI, not at release time)
7979
// to previous-version artifacts that were built on 8. see scala/scala-xml#501
8080
exclude[DirectMissingMethodProblem]("scala.xml.include.sax.XIncluder.declaration"),
8181
)

0 commit comments

Comments
 (0)