Merge pull request #8325 from xuwei-k/build-sbt-scala-version-2-12

This commit is contained in:
eugene yokota 2025-10-04 12:14:30 -04:00 committed by GitHub
commit cc92b0c5d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 12 deletions

View File

@ -235,10 +235,7 @@ val collectionProj = project
name := "Collections",
testedBaseSettings,
libraryDependencies ++= Seq(sjsonNewScalaJson.value),
libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, major)) if major <= 12 => Seq()
case _ => Seq(scalaPar)
}),
libraryDependencies ++= Seq(scalaPar),
mimaSettings,
conflictWarning := ConflictWarning.disable,
)
@ -699,10 +696,7 @@ lazy val mainProj = (project in file("main"))
launcherInterface,
caffeine,
),
libraryDependencies ++= (scalaVersion.value match {
case v if v.startsWith("2.12.") => List()
case _ => List(scalaPar)
}),
libraryDependencies ++= List(scalaPar),
contrabandSettings,
Test / testOptions += Tests
.Argument(TestFrameworks.ScalaCheck, "-minSuccessfulTests", "1000"),
@ -1126,10 +1120,6 @@ lazy val lmCore = (project in file("lm-core"))
)
)
.taskValue,
Compile / scalacOptions ++= (scalaVersion.value match {
case v if v.startsWith("2.12.") => List("-Ywarn-unused:-locals,-explicits,-privates")
case _ => List()
}),
contrabandSettings,
// WORKAROUND sbt/sbt#2205 include managed sources in packageSrc
Compile / packageSrc / mappings ++= {