Skip to content

Commit f5072c8

Browse files
authored
Merge pull request #712 from SethTisue/using-2.13.17
update `Using` from Scala 2.13.17 and add `UsingTest`
2 parents 57adc7f + e040b46 commit f5072c8

File tree

6 files changed

+733
-714
lines changed

6 files changed

+733
-714
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,19 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
java: [8, 11, 17]
14-
scala: [2.11.x, 2.12.x, 2.13.x, 3.x]
13+
java: [8, 25]
14+
scala: [2.12.x, 2.13.x, 3.x]
15+
scala-js: [""]
1516
platform: [JVM, JS, Native]
1617
mode: [normal]
17-
exclude:
18-
- java: 11
19-
platform: JS
20-
- java: 11
21-
platform: Native
22-
- java: 17
23-
platform: JS
24-
- java: 17
25-
platform: Native
26-
- scala: 2.11.x
27-
platform: Native
2818
include:
19+
- java: 8
20+
scala: 2.11.x
21+
platform: JVM
22+
- java: 8
23+
scala: 2.11.x
24+
platform: JS
25+
scala-js: 1.12.0
2926
- java: 8
3027
scala: 2.12.x
3128
mode: testScalafix
@@ -42,18 +39,11 @@ jobs:
4239
scala: 2.12.x
4340
mode: headerCheck
4441
platform: JVM
45-
- java: 11
46-
scala: 2.12.x
47-
mode: normal
48-
platform: JVM
49-
- java: 17
50-
scala: 2.12.x
51-
mode: normal
52-
platform: JVM
5342
runs-on: ubuntu-latest
5443
env:
5544
CI_JDK: ${{matrix.java}}
5645
CI_SCALA_VERSION: ${{matrix.scala}}
46+
CI_SCALAJS_VERSION: ${{matrix.scala-js}}
5747
CI_MODE: ${{matrix.mode}}
5848
CI_PLATFORM: ${{matrix.platform}}
5949
steps:

build.sbt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ lazy val root = project
5050
lazy val junit = libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % Test
5151

5252
lazy val scala211 = "2.11.12"
53-
lazy val scala212 = "2.12.19"
54-
lazy val scala213 = "2.13.13"
53+
lazy val scala212 = "2.12.20"
54+
lazy val scala213 = "2.13.17"
5555
lazy val scala3 = "3.3.6"
5656

5757
lazy val compat = new MultiScalaCrossProject(
@@ -63,6 +63,16 @@ lazy val compat = new MultiScalaCrossProject(
6363
moduleName := "scala-collection-compat",
6464
scalaModuleAutomaticModuleName := Some("scala.collection.compat"),
6565
scalacOptions ++= Seq("-feature", "-language:higherKinds", "-language:implicitConversions"),
66+
// we need to force Scala 3 to use the latest Scala 2 stdlib, otherwise
67+
// we might get test failures if there are behavior changes in latest Scala 2 stdlib
68+
dependencyOverrides ++= {
69+
CrossVersion.partialVersion(scalaVersion.value) match {
70+
case Some((3, _)) =>
71+
Seq("org.scala-lang" % "scala-library" % scala213)
72+
case _ =>
73+
Seq()
74+
}
75+
},
6676
Compile / unmanagedSourceDirectories += {
6777
val sharedSourceDir = (ThisBuild / baseDirectory).value / "compat/src/main"
6878
CrossVersion.partialVersion(scalaVersion.value) match {
@@ -359,6 +369,7 @@ inThisBuild {
359369
else {
360370
List(
361371
"CI_SCALA_VERSION",
372+
"CI_SCALAJS_VERSION",
362373
"CI_PLATFORM",
363374
"CI_MODE",
364375
"CI_JDK",

0 commit comments

Comments
 (0)