Skip to content

Commit

Permalink
Scala 2.12.14 / 2.13.6
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurz committed May 28, 2021
1 parent bff96c7 commit c0fb493
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,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.5"
val scalaVersion = "2.13.6"

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

val scala210 = "2.10.7"
val scala211 = "2.11.12"
val scala212 = "2.12.13"
val scala213 = "2.13.5"
val scala212 = "2.12.14"
val scala213 = "2.13.6"
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"macro-provider"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "macro-provider",
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"macro-provider"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "macro-provider",
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/macros/macro-arg-dep/build.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"macro-provider"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "macro-provider",
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
}
]
}
4 changes: 2 additions & 2 deletions zinc/src/sbt-test/macros/macro/build.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"macro-provider"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "macro-provider",
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
"std",
"lib"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "lib",
"dependsOn": [
"std"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "std",
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"core"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "core",
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"dep"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "dep",
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"dep"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "dep",
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"dep"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "dep",
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"dep"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "dep",
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependsOn": [
"dep"
],
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
},
{
"name": "dep",
"scalaVersion": "2.13.5"
"scalaVersion": "2.13.6"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"projects": [
{
"name": "mirtest",
"scalaVersion": "2.12.13"
"scalaVersion": "2.12.14"
}
]
}

0 comments on commit c0fb493

Please sign in to comment.