Skip to content

Commit 6221f74

Browse files
authored
Merge pull request #465 from SethTisue/jdk17
add JDK 17 to CI (& drop 3.0.0-RC3 & upgrade to 2.12.14)
2 parents def7dca + 4b9150e commit 6221f74

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

.jvmopts

Whitespace-only changes.

.travis.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@ language: scala
66

77
scala:
88
- 2.11.12
9-
- 2.12.13
9+
- 2.12.14
1010
- 2.13.6
11-
- 3.0.0-RC3
1211
- 3.0.0
1312

1413
env:
1514
- SCALAJS_VERSION= ADOPTOPENJDK=8
1615
- SCALAJS_VERSION=1.5.1 ADOPTOPENJDK=8
1716
- SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
1817
- SCALAJS_VERSION= ADOPTOPENJDK=11
19-
- SCALAJS_VERSION=1.5.1 ADOPTOPENJDK=11
20-
- SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=11
18+
- SCALAJS_VERSION= ADOPTOPENJDK=17
2119

2220
matrix:
2321

@@ -39,18 +37,9 @@ matrix:
3937

4038
# Scala Native doesn't support Scala 3 yet
4139

42-
- scala: 3.0.0-RC3
43-
env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
44-
45-
- scala: 3.0.0-RC3
46-
env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=11
47-
4840
- scala: 3.0.0
4941
env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
5042

51-
- scala: 3.0.0
52-
env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=11
53-
5443
install:
5544
- git fetch --tags # get all tags for sbt-dynver
5645

project/MultiScalaProject.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import java.io.File
2323
*
2424
* // instanciate a sbt project
2525
* lazy val myProject211 = myProject("2.11.12", _.settings(...) /* scala version dependent configurations */)
26-
* lazy val myProject212 = myProject("2.12.13" , _.settings(...))
26+
* lazy val myProject212 = myProject("2.12.14" , _.settings(...))
2727
* // ...
2828
* }}}
2929
*/

0 commit comments

Comments
 (0)