Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ trait CompilingSpecification extends AbstractBridgeProviderTestkit {
.get("zinc.build.compilerbridge.scalaVersion")
.getOrElse(sys.error("zinc.build.compilerbridge.scalaVersion property not found"))
def maxErrors = 100
def scala213 = "2.13.16"
def scala213 = "2.13.18"

def scalaCompiler(instance: xsbti.compile.ScalaInstance, bridgeJar: Path): AnalyzingCompiler = {
val bridgeProvider = ZincUtil.constantBridgeProvider(instance, bridgeJar)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private[xsbt] class ZincBenchmark(toCompile: BenchmarkProject, zincEnabled: Bool
private[xsbt] object ZincBenchmark {
// This is the Scala version used to compile the benchmark project
// do not use `scala.util.Properties.versionNumberString`.
val scalaVersion = "2.13.16"
val scalaVersion = "2.13.18"

/* ************************************************************* */
/* Utils to programmatically instantiate Compiler from sbt setup */
Expand Down
10 changes: 5 additions & 5 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ object Dependencies {

val scala210 = "2.10.7"
val scala211 = "2.11.12"
val scala212 = "2.12.20"
val scala213 = "2.13.16"
val scala3ForBridge = "3.3.4"
val scala213ForBridge = "2.13.16"
val scala212 = "2.12.21"
val scala213 = "2.13.18"
val scala3ForBridge = "3.3.7"
val scala213ForBridge = "2.13.18"
val defaultScalaVersion = scala212
val compilerBridgeVersions = Seq(scala212, scala210, scala211, scala213)
val scala212_213 = Seq(defaultScalaVersion, scala213)

private val ioVersion = nightlyVersion.getOrElse("1.10.5")
private val utilVersion = nightlyVersion.getOrElse("1.11.5")
private val utilVersion = nightlyVersion.getOrElse("1.12.4")

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

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.11.5
sbt.version=1.12.14
Loading