Skip to content

Commit

Permalink
Update scala-compiler, scala-library to 2.13.13
Browse files Browse the repository at this point in the history
  • Loading branch information
@scala-steward @SethTisue
scala-steward authored and SethTisue committed Mar 7, 2024
1 parent 4fd4675 commit 8d13d76
Show file tree
Hide file tree
Showing 19 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/CompilingSpecification.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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.12"
def scala213 = "2.13.13"

def scalaCompiler(instance: xsbti.compile.ScalaInstance, bridgeJar: Path): AnalyzingCompiler = {
val bridgeProvider = ZincUtil.constantBridgeProvider(instance, bridgeJar)
Expand Down
2 changes: 1 addition & 1 deletion internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala
View file
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.12"
val scalaVersion = "2.13.13"

/* ************************************************************* */
/* Utils to programmatically instantiate Compiler from sbt setup */
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object Dependencies {
val scala210 = "2.10.7"
val scala211 = "2.11.12"
val scala212 = "2.12.18"
val scala213 = "2.13.12"
val scala213 = "2.13.13"
val defaultScalaVersion = scala212
val allScalaVersions = Seq(defaultScalaVersion, scala210, scala211, scala213)
val scala212_213 = Seq(defaultScalaVersion, scala213)
Expand Down
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/macros/macro-arg-dep-nested/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"macro-provider"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "macro-provider",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/macros/macro-arg-dep-stackoverflow/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"macro-provider"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "macro-provider",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/macros/macro-arg-dep/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"macro-provider"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "macro-provider",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/macros/macro-type-change/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"macros"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "macros",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/macros/macro-use/build.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projects": [
{ "name": "lib", "scalaVersion": "2.13.12" },
{ "name": "app", "scalaVersion": "2.13.12", "dependsOn": [ "lib" ] }
{ "name": "lib", "scalaVersion": "2.13.13" },
{ "name": "app", "scalaVersion": "2.13.13", "dependsOn": [ "lib" ] }
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/macros/macro/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"macro-provider"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "macro-provider",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
6 changes: 3 additions & 3 deletions zinc/src/sbt-test/source-dependencies/java-class-invs/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
"std",
"lib"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "lib",
"dependsOn": [
"std"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "std",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/source-dependencies/subproject-api-update/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"core"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "core",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/source-dependencies/subproject-java/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"dep"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "dep",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"dep"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "dep",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/source-dependencies/subproject-pipelining-noclobber/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"dep"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "dep",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/source-dependencies/subproject-pipelining-optout/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"dep"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "dep",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/source-dependencies/subproject-pipelining/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"dep"
],
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
},
{
"name": "dep",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
2 changes: 1 addition & 1 deletion zinc/src/sbt-test/source-dependencies/trait-local-change/build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"projects": [
{
"name": "pro",
"scalaVersion": "2.13.12"
"scalaVersion": "2.13.13"
}
]
}
6 changes: 3 additions & 3 deletions .../src/sbt-test/source-dependencies/trait-private-val-mix-transitive-inheritance/build.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"projects": [
{"name": "main", "dependsOn": ["a", "c"], "scalaVersion": "2.13.12"},
{"name": "c", "dependsOn": ["a"], "scalaVersion": "2.13.12"},
{"name": "a", "scalaVersion": "2.13.12"}
{"name": "main", "dependsOn": ["a", "c"], "scalaVersion": "2.13.13"},
{"name": "c", "dependsOn": ["a"], "scalaVersion": "2.13.13"},
{"name": "a", "scalaVersion": "2.13.13"}
]
}
8 changes: 4 additions & 4 deletions zinc/src/sbt-test/source-dependencies/trait-private-val-transitive-inheritance/build.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"projects": [
{"name": "main", "dependsOn": ["a", "b","c"], "scalaVersion": "2.13.12"},
{"name": "c", "dependsOn": ["a","b"], "scalaVersion": "2.13.12"},
{"name": "b", "dependsOn": ["a"], "scalaVersion": "2.13.12"},
{"name": "a", "scalaVersion": "2.13.12"}
{"name": "main", "dependsOn": ["a", "b","c"], "scalaVersion": "2.13.13"},
{"name": "c", "dependsOn": ["a","b"], "scalaVersion": "2.13.13"},
{"name": "b", "dependsOn": ["a"], "scalaVersion": "2.13.13"},
{"name": "a", "scalaVersion": "2.13.13"}
]
}

0 comments on commit 8d13d76

Please sign in to comment.