Skip to content

Commit b81f8b0

Browse files
committed
[1.x] Bump sbt and Scala versions
1 parent ea501a2 commit b81f8b0

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/CompilingSpecification.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ trait CompilingSpecification extends AbstractBridgeProviderTestkit {
3434
.get("zinc.build.compilerbridge.scalaVersion")
3535
.getOrElse(sys.error("zinc.build.compilerbridge.scalaVersion property not found"))
3636
def maxErrors = 100
37-
def scala213 = "2.13.16"
37+
def scala213 = "2.13.18"
3838

3939
def scalaCompiler(instance: xsbti.compile.ScalaInstance, bridgeJar: Path): AnalyzingCompiler = {
4040
val bridgeProvider = ZincUtil.constantBridgeProvider(instance, bridgeJar)

internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private[xsbt] class ZincBenchmark(toCompile: BenchmarkProject, zincEnabled: Bool
107107
private[xsbt] object ZincBenchmark {
108108
// This is the Scala version used to compile the benchmark project
109109
// do not use `scala.util.Properties.versionNumberString`.
110-
val scalaVersion = "2.13.16"
110+
val scalaVersion = "2.13.18"
111111

112112
/* ************************************************************* */
113113
/* Utils to programmatically instantiate Compiler from sbt setup */

project/Dependencies.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ object Dependencies {
77

88
val scala210 = "2.10.7"
99
val scala211 = "2.11.12"
10-
val scala212 = "2.12.20"
11-
val scala213 = "2.13.16"
12-
val scala3ForBridge = "3.3.4"
13-
val scala213ForBridge = "2.13.16"
10+
val scala212 = "2.12.21"
11+
val scala213 = "2.13.18"
12+
val scala3ForBridge = "3.3.7"
13+
val scala213ForBridge = "2.13.18"
1414
val defaultScalaVersion = scala212
1515
val compilerBridgeVersions = Seq(scala212, scala210, scala211, scala213)
1616
val scala212_213 = Seq(defaultScalaVersion, scala213)
1717

1818
private val ioVersion = nightlyVersion.getOrElse("1.10.5")
19-
private val utilVersion = nightlyVersion.getOrElse("1.11.5")
19+
private val utilVersion = nightlyVersion.getOrElse("1.12.4")
2020

2121
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
2222

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.5
1+
sbt.version=1.12.14

0 commit comments

Comments
 (0)