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

Merge pull request #7274 from eed3si9n/wip/scala_2.13.10 

Update Scala to 2.13.10
This commit is contained in:
eugene yokota 2023-06-01 23:53:00 -04:00 committed by GitHub
parent 38afd6f2f7 10a79bc6b0
commit 98bf8f1301
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ jobs:
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.18
SCALA_213: 2.13.8
SCALA_213: 2.13.10
SCALA_3: 3.1.0
UTIL_TESTS: "utilCache/test utilControl/test utilInterface/test utilLogging/test utilPosition/test utilRelation/test utilScripted/test utilTracking/test"
SBT_LOCAL: false

2
project/Dependencies.scala
View File

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

2
sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.8"
ThisBuild / scalaVersion := "2.13.10"
ThisBuild / scalacOptions += "-Ytasty-reader"
lazy val scala3code = project

2
sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt
View File

@ -1,7 +1,7 @@
ThisBuild / scalaVersion := "3.1.3"
ThisBuild / scalacOptions += "-Ytasty-reader"
lazy val scala213 = "2.13.8"
lazy val scala213 = "2.13.10"
lazy val root = (project in file("."))
.aggregate(fooApp, fooCore, barApp, barCore)

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

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.8"
ThisBuild / scalaVersion := "2.13.10"
Global / serverLog / logLevel := Level.Debug

2
server-test/src/test/scala/testpkg/BuildServerTest.scala
View File

@ -283,7 +283,7 @@ object BuildServerTest extends AbstractServerTest {
assert(processing("buildTarget/scalacOptions"))
assert(svr.waitForString(10.seconds) { s =>
(s contains s""""id":"$id"""") &&
(s contains "scala-library-2.13.8.jar")
(s contains "scala-library-2.13.10.jar")
})
}