diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3e0acf96..94f9a7a0c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,10 +141,6 @@ jobs: ./sbt -v --client "serverTestProj/test" # ./sbt -v --client doc ./sbt -v --client "all $UTIL_TESTS" - ./sbt -v --client ++2.13.x - ./sbt -v --client "all $UTIL_TESTS" - ./sbt -v --client ++2.12.x - ./sbt -v --client "all $UTIL_TESTS" - name: Build and test (2) if: ${{ matrix.jobtype == 2 }} shell: bash @@ -171,8 +167,6 @@ jobs: shell: bash run: | ./sbt -v --client test - ./sbt -v --client "++2.13.x; all $UTIL_TESTS" - ./sbt -v --client "++2.12.x; all $UTIL_TESTS" # - name: Build and test (6) # if: ${{ matrix.jobtype == 6 }} # shell: bash diff --git a/build.sbt b/build.sbt index 4115ff0c8..e1c2ab681 100644 --- a/build.sbt +++ b/build.sbt @@ -104,12 +104,6 @@ def commonSettings: Seq[Setting[_]] = Def.settings( def utilCommonSettings: Seq[Setting[_]] = Def.settings( baseSettings, - crossScalaVersions := Seq(scala212, scala213, scala3), - libraryDependencies += Dependencies.scalaCollectionCompat, - libraryDependencies ++= { - if (scalaBinaryVersion.value == "3") Nil - else Seq(compilerPlugin(kindProjector)) - } ) def minimalSettings: Seq[Setting[_]] = @@ -336,11 +330,6 @@ lazy val utilCore = project .settings( utilCommonSettings, name := "Util Core", - libraryDependencies ++= { - if (scalaBinaryVersion.value.startsWith("2")) { - Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value) - } else Seq.empty - }, Utils.keywordsSettings, utilMimaSettings ) @@ -1337,7 +1326,6 @@ def customCommands: Seq[Setting[_]] = Seq( "clean" :: "+lowerUtils/compile" :: "+lowerUtils/publishSigned" :: - s"++$scala212" :: state }, commands += Command.command("release") { state => @@ -1481,7 +1469,6 @@ lazy val lmCoursierDependencies = Def.settings( ), excludeDependencies ++= Seq( ExclusionRule("org.scala-lang.modules", "scala-xml_2.13"), - ExclusionRule("org.scala-lang.modules", "scala-collection-compat_2.13") ), ) diff --git a/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala b/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala index a5a8ecf3e..e0d8536f8 100644 --- a/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala +++ b/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala @@ -9,7 +9,6 @@ package sbt.internal.util import Relation._ -import scala.collection.compat.* object Relation {