mirror of https://github.com/sbt/sbt.git
Merge pull request #7941 from eed3si9n/wip/bump-scala
[2.x] ci: Update to Scala 3.6.2
This commit is contained in:
commit
58446a3cdc
|
|
@ -51,6 +51,8 @@ Global / semanticdbVersion := "4.9.9"
|
|||
Global / excludeLintKeys += Utils.componentID
|
||||
Global / excludeLintKeys += scriptedBufferLog
|
||||
Global / excludeLintKeys += checkPluginCross
|
||||
Global / excludeLintKeys += nativeImageVersion
|
||||
Global / excludeLintKeys += nativeImageJvm
|
||||
ThisBuild / evictionErrorLevel := Level.Info
|
||||
|
||||
def commonSettings: Seq[Setting[_]] = Def.settings(
|
||||
|
|
@ -686,6 +688,7 @@ lazy val protocolProj = (project in file("protocol"))
|
|||
testedBaseSettings,
|
||||
name := "Protocol",
|
||||
libraryDependencies ++= Seq(sjsonNewScalaJson.value, sjsonNewCore.value, ipcSocket),
|
||||
Compile / scalacOptions += "-source:3.7",
|
||||
Compile / managedSourceDirectories +=
|
||||
baseDirectory.value / "src" / "main" / "contraband-scala",
|
||||
Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "contraband-scala",
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ object Dependencies {
|
|||
// WARNING: Please Scala update versions in PluginCross.scala too
|
||||
val scala212 = "2.12.20"
|
||||
val scala213 = "2.13.15"
|
||||
val scala3 = "3.5.2"
|
||||
val scala3 = "3.6.2"
|
||||
val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
|
||||
val baseScalaVersion = scala3
|
||||
def nightlyVersion: Option[String] =
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
# there shouldn't be two api/ directories
|
||||
# see https://github.com/lampepfl/dotty/issues/11412
|
||||
$ exists target/out/jvm/scala-3.5.2/a/api/index.html
|
||||
$ exists target/out/jvm/scala-3.5.2/a/api/foo/A$.html
|
||||
$ exists target/out/jvm/scala-3.5.2/a/api/foo.html
|
||||
$ exists target/**/a/api/index.html
|
||||
$ exists target/**/a/api/foo/A$.html
|
||||
$ exists target/**/a/api/foo.html
|
||||
|
|
|
|||
Loading…
Reference in New Issue