Merge pull request #7271 from eed3si9n/wip/scala_2.12.18

Update Scala to 2.12.18
This commit is contained in:
eugene yokota 2023-06-01 12:55:38 -04:00 committed by GitHub
commit 44d35b5502
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 18 additions and 18 deletions

View File

@ -52,7 +52,7 @@ 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.17
SCALA_212: 2.12.18
SCALA_213: 2.13.8
SCALA_3: 3.1.0
UTIL_TESTS: "utilCache/test utilControl/test utilInterface/test utilLogging/test utilPosition/test utilRelation/test utilScripted/test utilTracking/test"

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.17"
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.18"
case _ => sys.error(s"Unsupported sbt binary version: $sv")
}
}

View File

@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies {
// WARNING: Please Scala update versions in PluginCross.scala too
val scala212 = "2.12.17"
val scala212 = "2.12.18"
val scala213 = "2.13.8"
val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
val baseScalaVersion = scala212

View File

@ -1,6 +1,6 @@
lazy val check = taskKey[Unit]("")
lazy val compile2 = taskKey[Unit]("")
lazy val scala212 = "2.12.17"
lazy val scala212 = "2.12.18"
lazy val root = (project in file("."))
.aggregate(foo, bar, client)

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.17", "2.13.1")
> set root/crossScalaVersions := Seq("2.12.18", "2.13.1")
> + build
$ exists foo/target/scala-2.12
$ exists foo/target/scala-2.13

View File

@ -1,14 +1,14 @@
scalaVersion := "2.12.17"
scalaVersion := "2.12.18"
lazy val core = project
.settings(
crossScalaVersions := Seq("2.12.17", "3.0.2", "3.1.2")
crossScalaVersions := Seq("2.12.18", "3.0.2", "3.1.2")
)
lazy val subproj = project
.dependsOn(core)
.settings(
crossScalaVersions := Seq("2.12.17", "3.1.2"),
crossScalaVersions := Seq("2.12.18", "3.1.2"),
// a random library compiled against Scala 3.1
libraryDependencies += "org.http4s" %% "http4s-core" % "0.23.12"
)

View File

@ -1,4 +1,4 @@
lazy val scala212 = "2.12.17"
lazy val scala212 = "2.12.18"
lazy val scala213 = "2.13.1"
ThisBuild / scalaVersion := scala212

View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.17"
ThisBuild / scalaVersion := "2.12.18"
libraryDependencies ++= Seq(
"com.novocode" % "junit-interface" % "0.5" % Test,

View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.17"
ThisBuild / scalaVersion := "2.12.18"
libraryDependencies ++= Seq(
"org.slf4j" % "slf4j-api" % "1.7.2",

View File

@ -1,5 +1,5 @@
// ThisBuild / useCoursier := false
ThisBuild / scalaVersion := "2.12.17"
ThisBuild / scalaVersion := "2.12.18"
ThisBuild / organization := "org.example"
ThisBuild / version := "0.1"

View File

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

View File

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

View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.17"
ThisBuild / scalaVersion := "2.12.18"
import sbt.internal.CommandStrings.{ inspectBrief, inspectDetailed }
import sbt.internal.Inspect

View File

@ -1,4 +1,4 @@
> ++2.12.17!
> ++2.12.18!
$ copy-file changes/B.scala B.scala

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.17"
ThisBuild / scalaVersion := "2.12.18"
lazy val root = (project in file("."))
.configs(OtherScala)

View File

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