Skip to content

Commit d7f8454

Browse files
eed3si9need3si9n
authored
Merge pull request #1341 from scala-steward/update/scala-compiler-2.13.13
Update scala-compiler, scala-library to 2.13.13
2 parents af67013 + 8907acf commit d7f8454

File tree

19 files changed

+38
-38
lines changed

19 files changed

+38
-38
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ trait CompilingSpecification extends AbstractBridgeProviderTestkit {
3535
.get("zinc.build.compilerbridge.scalaVersion")
3636
.getOrElse(sys.error("zinc.build.compilerbridge.scalaVersion property not found"))
3737
def maxErrors = 100
38-
def scala213 = "2.13.12"
38+
def scala213 = "2.13.13"
3939

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

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

+1-1
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.12"
110+
val scalaVersion = "2.13.13"
111111

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

‎project/Dependencies.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object Dependencies {
88
val scala210 = "2.10.7"
99
val scala211 = "2.11.12"
1010
val scala212 = "2.12.19"
11-
val scala213 = "2.13.12"
11+
val scala213 = "2.13.13"
1212
val defaultScalaVersion = scala212
1313
val allScalaVersions = Seq(defaultScalaVersion, scala210, scala211, scala213)
1414
val scala212_213 = Seq(defaultScalaVersion, scala213)

‎zinc/src/sbt-test/macros/macro-arg-dep-nested/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependsOn": [
66
"macro-provider"
77
],
8-
"scalaVersion": "2.13.12"
8+
"scalaVersion": "2.13.13"
99
},
1010
{
1111
"name": "macro-provider",
12-
"scalaVersion": "2.13.12"
12+
"scalaVersion": "2.13.13"
1313
}
1414
]
1515
}

‎zinc/src/sbt-test/macros/macro-arg-dep-stackoverflow/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependsOn": [
66
"macro-provider"
77
],
8-
"scalaVersion": "2.13.12"
8+
"scalaVersion": "2.13.13"
99
},
1010
{
1111
"name": "macro-provider",
12-
"scalaVersion": "2.13.12"
12+
"scalaVersion": "2.13.13"
1313
}
1414
]
1515
}

‎zinc/src/sbt-test/macros/macro-arg-dep/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependsOn": [
66
"macro-provider"
77
],
8-
"scalaVersion": "2.13.12"
8+
"scalaVersion": "2.13.13"
99
},
1010
{
1111
"name": "macro-provider",
12-
"scalaVersion": "2.13.12"
12+
"scalaVersion": "2.13.13"
1313
}
1414
]
1515
}

‎zinc/src/sbt-test/macros/macro-type-change/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependsOn": [
66
"macros"
77
],
8-
"scalaVersion": "2.13.12"
8+
"scalaVersion": "2.13.13"
99
},
1010
{
1111
"name": "macros",
12-
"scalaVersion": "2.13.12"
12+
"scalaVersion": "2.13.13"
1313
}
1414
]
1515
}

‎zinc/src/sbt-test/macros/macro-use/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [
3-
{ "name": "lib", "scalaVersion": "2.13.12" },
4-
{ "name": "app", "scalaVersion": "2.13.12", "dependsOn": [ "lib" ] }
3+
{ "name": "lib", "scalaVersion": "2.13.13" },
4+
{ "name": "app", "scalaVersion": "2.13.13", "dependsOn": [ "lib" ] }
55
]
66
}

‎zinc/src/sbt-test/macros/macro/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependsOn": [
66
"macro-provider"
77
],
8-
"scalaVersion": "2.13.12"
8+
"scalaVersion": "2.13.13"
99
},
1010
{
1111
"name": "macro-provider",
12-
"scalaVersion": "2.13.12"
12+
"scalaVersion": "2.13.13"
1313
}
1414
]
1515
}

‎zinc/src/sbt-test/source-dependencies/java-class-invs/build.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
"std",
77
"lib"
88
],
9-
"scalaVersion": "2.13.12"
9+
"scalaVersion": "2.13.13"
1010
},
1111
{
1212
"name": "lib",
1313
"dependsOn": [
1414
"std"
1515
],
16-
"scalaVersion": "2.13.12"
16+
"scalaVersion": "2.13.13"
1717
},
1818
{
1919
"name": "std",
20-
"scalaVersion": "2.13.12"
20+
"scalaVersion": "2.13.13"
2121
}
2222
]
2323
}

‎zinc/src/sbt-test/source-dependencies/subproject-api-update/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependsOn": [
66
"core"
77
],
8-
"scalaVersion": "2.13.12"
8+
"scalaVersion": "2.13.13"
99
},
1010
{
1111
"name": "core",
12-
"scalaVersion": "2.13.12"
12+
"scalaVersion": "2.13.13"
1313
}
1414
]
1515
}

‎zinc/src/sbt-test/source-dependencies/subproject-java/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependsOn": [
66
"dep"
77
],
8-
"scalaVersion": "2.13.12"
8+
"scalaVersion": "2.13.13"
99
},
1010
{
1111
"name": "dep",
12-
"scalaVersion": "2.13.12"
12+
"scalaVersion": "2.13.13"
1313
}
1414
]
1515
}

‎zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependsOn": [
66
"dep"
77
],
8-
"scalaVersion": "2.13.12"
8+
"scalaVersion": "2.13.13"
99
},
1010
{
1111
"name": "dep",
12-
"scalaVersion": "2.13.12"
12+
"scalaVersion": "2.13.13"
1313
}
1414
]
1515
}

‎zinc/src/sbt-test/source-dependencies/subproject-pipelining-noclobber/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependsOn": [
66
"dep"
77
],
8-
"scalaVersion": "2.13.12"
8+
"scalaVersion": "2.13.13"
99
},
1010
{
1111
"name": "dep",
12-
"scalaVersion": "2.13.12"
12+
"scalaVersion": "2.13.13"
1313
}
1414
]
1515
}

‎zinc/src/sbt-test/source-dependencies/subproject-pipelining-optout/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependsOn": [
66
"dep"
77
],
8-
"scalaVersion": "2.13.12"
8+
"scalaVersion": "2.13.13"
99
},
1010
{
1111
"name": "dep",
12-
"scalaVersion": "2.13.12"
12+
"scalaVersion": "2.13.13"
1313
}
1414
]
1515
}

‎zinc/src/sbt-test/source-dependencies/subproject-pipelining/build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"dependsOn": [
66
"dep"
77
],
8-
"scalaVersion": "2.13.12"
8+
"scalaVersion": "2.13.13"
99
},
1010
{
1111
"name": "dep",
12-
"scalaVersion": "2.13.12"
12+
"scalaVersion": "2.13.13"
1313
}
1414
]
1515
}

‎zinc/src/sbt-test/source-dependencies/trait-local-change/build.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"projects": [
33
{
44
"name": "pro",
5-
"scalaVersion": "2.13.12"
5+
"scalaVersion": "2.13.13"
66
}
77
]
88
}

‎zinc/src/sbt-test/source-dependencies/trait-private-val-mix-transitive-inheritance/build.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"projects": [
3-
{"name": "main", "dependsOn": ["a", "c"], "scalaVersion": "2.13.12"},
4-
{"name": "c", "dependsOn": ["a"], "scalaVersion": "2.13.12"},
5-
{"name": "a", "scalaVersion": "2.13.12"}
3+
{"name": "main", "dependsOn": ["a", "c"], "scalaVersion": "2.13.13"},
4+
{"name": "c", "dependsOn": ["a"], "scalaVersion": "2.13.13"},
5+
{"name": "a", "scalaVersion": "2.13.13"}
66
]
77
}

‎zinc/src/sbt-test/source-dependencies/trait-private-val-transitive-inheritance/build.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"projects": [
3-
{"name": "main", "dependsOn": ["a", "b","c"], "scalaVersion": "2.13.12"},
4-
{"name": "c", "dependsOn": ["a","b"], "scalaVersion": "2.13.12"},
5-
{"name": "b", "dependsOn": ["a"], "scalaVersion": "2.13.12"},
6-
{"name": "a", "scalaVersion": "2.13.12"}
3+
{"name": "main", "dependsOn": ["a", "b","c"], "scalaVersion": "2.13.13"},
4+
{"name": "c", "dependsOn": ["a","b"], "scalaVersion": "2.13.13"},
5+
{"name": "b", "dependsOn": ["a"], "scalaVersion": "2.13.13"},
6+
{"name": "a", "scalaVersion": "2.13.13"}
77
]
88
}

0 commit comments

Comments
 (0)