luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6522 from mkurz/scala_upgrades 

Scala 2.12.14 / 2.13.6
This commit is contained in:
eugene yokota 2021-05-28 16:20:21 -04:00 committed by GitHub
parent fdcff13804 ee460e0043
commit ea2f496f5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -40,8 +40,8 @@ jobs:
env:
JAVA_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
JVM_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
SCALA_212: 2.12.13
SCALA_213: 2.13.3
SCALA_212: 2.12.14
SCALA_213: 2.13.6
UTIL_TESTS: "utilCache/test utilControl/test utilInterface/test utilLogging/test utilPosition/test utilRelation/test utilScripted/test utilTracking/test"
SBT_LOCAL: false
TEST_SBT_VER: 1.5.0

2
build.sbt
View File

@ -45,7 +45,7 @@ ThisBuild / scmInfo := Some(
ThisBuild / resolvers += Resolver.mavenLocal
Global / semanticdbEnabled := !(Global / insideCI).value
Global / semanticdbVersion := "4.4.10"
Global / semanticdbVersion := "4.4.20"
val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys")
Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty)
Global / excludeLint += componentID

4
launcher-package/build.sbt
View File

@ -26,7 +26,7 @@ lazy val sbtVersionToRelease = sys.props.getOrElse("sbt.build.version", sys.env.
}))
lazy val scala210 = "2.10.7"
lazy val scala212 = "2.12.10"
lazy val scala212 = "2.12.14"
lazy val scala210Jline = "org.scala-lang" % "jline" % scala210
lazy val jansi = {
if (sbtVersionToRelease startsWith "1.") "org.fusesource.jansi" % "jansi" % "1.12"
@ -34,7 +34,7 @@ lazy val jansi = {
}
lazy val scala212Compiler = "org.scala-lang" % "scala-compiler" % scala212
lazy val scala212Jline = "jline" % "jline" % "2.14.6"
// use the scala-xml version used by the compiler not the latest: https://github.com/scala/scala/blob/v2.12.10/versions.properties#L22
// use the scala-xml version used by the compiler not the latest: https://github.com/scala/scala/blob/v2.12.14/versions.properties#L21
lazy val scala212Xml = "org.scala-lang.modules" % "scala-xml_2.12" % "1.0.6"
lazy val sbtActual = "org.scala-sbt" % "sbt" % sbtVersionToRelease

2
main/src/main/scala/sbt/PluginCross.scala
View File

@ -99,7 +99,7 @@ private[sbt] object PluginCross {
VersionNumber(sv) match {
case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2"
case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7"
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.13"
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.14"
case _ => sys.error(s"Unsupported sbt binary version: $sv")
}
}

2
main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala
View File

@ -26,7 +26,7 @@ object SemanticdbPlugin extends AutoPlugin {
semanticdbEnabled := SysProp.semanticdb,
semanticdbIncludeInJar := false,
semanticdbOptions := List(),
semanticdbVersion := "4.4.10"
semanticdbVersion := "4.4.20"
)
override lazy val projectSettings: Seq[Def.Setting[_]] = Seq(

6
project/Dependencies.scala
View File

@ -4,8 +4,8 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies {
// WARNING: Please Scala update versions in PluginCross.scala too
val scala212 = "2.12.13"
val scala213 = "2.13.5"
val scala212 = "2.12.14"
val scala213 = "2.13.6"
val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
val baseScalaVersion = scala212
def nightlyVersion: Option[String] =
@ -116,5 +116,5 @@ object Dependencies {
val hedgehog = "qa.hedgehog" %% "hedgehog-sbt" % "0.6.1"
val disruptor = "com.lmax" % "disruptor" % "3.4.2"
val kindProjector = ("org.typelevel" % "kind-projector" % "0.11.3").cross(CrossVersion.full)
val kindProjector = ("org.typelevel" % "kind-projector" % "0.13.0").cross(CrossVersion.full)
}

12
sbt-app/src/sbt-test/actions/cross-advanced/build.sbt
View File

@ -10,19 +10,19 @@ lazy val root = (project in file("."))
lazy val foo = project
.settings(
crossScalaVersions := Seq("2.12.13", "2.13.1"),
crossScalaVersions := Seq("2.12.14", "2.13.1"),
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0",
check := {
// This tests that +check will respect bar's crossScalaVersions and not switch
val x = (LocalProject("bar") / scalaVersion).value
assert(x == "2.12.13", s"$x == 2.12.12")
assert(x == "2.12.14", s"$x == 2.12.12")
(Compile / compile).value
},
(Test / testOnly) := {
// This tests that +testOnly will respect bar's crossScalaVersions and not switch
val x = (LocalProject("bar") / scalaVersion).value
assert(x == "2.12.13", s"$x == 2.12.12")
assert(x == "2.12.14", s"$x == 2.12.12")
val _ = (Test / testOnly).evaluated
},
compile2 := {
@ -35,7 +35,7 @@ lazy val foo = project
lazy val bar = project
.settings(
crossScalaVersions := Seq("2.12.13"),
crossScalaVersions := Seq("2.12.14"),
check := (Compile / compile).value,
compile2 := (Compile / compile).value,
)
@ -46,14 +46,14 @@ lazy val baz = project
check := {
// This tests that +baz/check will respect bar's crossScalaVersions and not switch
val x = (LocalProject("bar") / scalaVersion).value
assert(x == "2.12.13", s"$x == 2.12.13")
assert(x == "2.12.14", s"$x == 2.12.14")
(Compile / compile).value
},
)
lazy val client = project
.settings(
crossScalaVersions := Seq("2.12.13", "2.13.1"),
crossScalaVersions := Seq("2.12.14", "2.13.1"),
check := (Compile / compile).value,
compile2 := (Compile / compile).value,
)

2
sbt-app/src/sbt-test/actions/cross-advanced/test
View File

@ -17,7 +17,7 @@
## test + with command or alias
> clean
## for command cross building you do need crossScalaVerions on root
> set root/crossScalaVersions := Seq("2.12.13", "2.13.1")
> set root/crossScalaVersions := Seq("2.12.14", "2.13.1")
> + build
$ exists foo/target/scala-2.12
$ exists foo/target/scala-2.13

2
sbt-app/src/sbt-test/project/sbt-plugin/build.sbt
View File

@ -1,6 +1,6 @@
lazy val root = project.in(file("."))
.enablePlugins(SbtPlugin)
.settings(
scalaVersion := "2.12.13",
scalaVersion := "2.12.14",
scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint")
)

2
sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt
View File

@ -1,6 +1,6 @@
lazy val root = project.in(file("."))
.settings(
scalaVersion := "2.12.13",
scalaVersion := "2.12.14",
sbtPlugin := true,
scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint")
)

6
sbt-app/src/sbt-test/project/semanticdb-version/build.sbt
View File

@ -1,6 +1,6 @@
ThisBuild / scalaVersion := "2.12.13"
ThisBuild / scalaVersion := "2.12.14"
ThisBuild / semanticdbEnabled := true
ThisBuild / semanticdbVersion := "4.4.10"
ThisBuild / semanticdbVersion := "4.4.20"
ThisBuild / semanticdbIncludeInJar := false
lazy val root = (project in file("."))
@ -8,7 +8,7 @@ lazy val root = (project in file("."))
lazy val check = taskKey[Unit]("Checks the configured semanticdbVersion")
check := {
val expected = Some("4.4.10")
val expected = Some("4.4.20")
val actual = allDependencies
.value
.find(_.name == "semanticdb-scalac")

2
sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt
View File

@ -3,7 +3,7 @@ import sbt.internal.inc.ScalaInstance
lazy val OtherScala = config("other-scala").hide
lazy val junitinterface = "com.novocode" % "junit-interface" % "0.11"
lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.17"
ThisBuild / scalaVersion := "2.12.13"
ThisBuild / scalaVersion := "2.12.14"
lazy val root = (project in file("."))
.configs(OtherScala)

2
server-test/src/server-test/response/build.sbt
View File

@ -1,6 +1,6 @@
import sbt.internal.server.{ ServerHandler, ServerIntent }
ThisBuild / scalaVersion := "2.12.13"
ThisBuild / scalaVersion := "2.12.14"
Global / serverLog / logLevel := Level.Debug
// custom handler