Merge pull request #1954 from scalacenter/sbtCleanup

refactor: get rid of leftover integration utils

.github/workflows/ci.yml

@@ -37,8 +37,8 @@ jobs:
       - name: Tests
         run: |
           ./bin/sbt-ci.sh \
-              "sbtBloop10/publishLocal" \
-              "sbtBloop10/scripted"
+              "sbtBloop/publishLocal" \
+              "sbtBloop/scripted"
         shell: bash
   bridges:
     name: Test platform bridges

build.sbt

@@ -89,13 +89,7 @@ lazy val bloopShared = (project in file("shared"))
  * ************************************************************************************************
  */
 import build.Dependencies
-import build.Dependencies.{
-  Scala210Version,
-  Scala211Version,
-  Scala212Version,
-  Sbt013Version,
-  Sbt1Version
-}
+import build.Dependencies.{Scala210Version, Scala211Version, Scala212Version, SbtVersion}
 
 lazy val backend = project
   .enablePlugins(BuildInfoPlugin)
@@ -477,46 +471,13 @@ def isJdiJar(file: File): Boolean = {
   else file.getAbsolutePath.contains(SbtJdiTools.JavaTools.getAbsolutePath.toString)
 }
 
-lazy val integrationUtils211 = project
-  .in(integrations / "utils")
-  .settings(
-    scalafixSettings,
-    scalaVersion := Dependencies.Scala211Version,
-    libraryDependencies += Dependencies.bloopConfig,
-    target := (file(
-      "integrations"
-    ) / "utils" / "target" / "utils-2.11").getAbsoluteFile
-  )
-
-lazy val integrationUtils212 = project
-  .in(integrations / "utils")
-  .settings(
-    scalafixSettings,
-    scalaVersion := Dependencies.Scala212Version,
-    libraryDependencies += Dependencies.bloopConfig,
-    target := (file(
-      "integrations"
-    ) / "utils" / "target" / "utils-2.12").getAbsoluteFile
-  )
-
-lazy val integrationUtils213 = project
-  .in(integrations / "utils")
-  .settings(
-    scalafixSettings,
-    scalaVersion := Dependencies.Scala213Version,
-    libraryDependencies += Dependencies.bloopConfig,
-    target := (file(
-      "integrations"
-    ) / "utils" / "target" / "utils-2.13").getAbsoluteFile
-  )
-
-lazy val sbtBloop10: Project = project
+lazy val sbtBloop: Project = project
   .enablePlugins(ScriptedPlugin)
   .disablePlugins(ScalafixPlugin)
   .in(integrations / "sbt-bloop")
   .settings(
     BuildDefaults.scriptedSettings,
-    sbtPluginSettings("sbt-bloop", Sbt1Version),
+    sbtPluginSettings("sbt-bloop", SbtVersion),
     libraryDependencies += Dependencies.bloopConfig
   )
 
@@ -626,7 +587,7 @@ val allProjects = Seq(
   backend,
   frontend,
   benchmarks,
-  sbtBloop10,
+  sbtBloop,
   nativeBridge04,
   jsBridge06,
   jsBridge1,
@@ -635,17 +596,14 @@ val allProjects = Seq(
   launcherTest,
   sockets,
   bloopgun,
-  bloopgun213,
-  integrationUtils211,
-  integrationUtils212,
-  integrationUtils213
+  bloopgun213
 )
 
 val allProjectsToRelease = Seq[ProjectReference](
   bloopShared,
   backend,
   frontend,
-  sbtBloop10,
+  sbtBloop,
   nativeBridge04,
   jsBridge06,
   jsBridge1,
@@ -670,7 +628,6 @@ val bloop = project
   .settings(
     releaseEarly := { () },
     (publish / skip) := true,
-    crossSbtVersions := Seq(Sbt1Version, Sbt013Version),
     buildIntegrationsBase := (ThisBuild / Keys.baseDirectory).value / "build-integrations",
     publishLocalAllModules := {
       BuildDefaults
@@ -694,7 +651,7 @@ val bloop = project
       build.BuildImplementation
         .exportCommunityBuild(
           buildpress,
-          sbtBloop10
+          sbtBloop
         )
         .value
     }

project/BuildPlugin.scala

@@ -522,7 +522,7 @@ object BuildImplementation {
   val buildpressHomePath = System.getProperty("user.home") + "/.buildpress"
   def exportCommunityBuild(
       buildpress: Reference,
-      sbtBloop10: Reference
+      sbtBloop: Reference
   ) = Def.taskDyn {
     val isWindows: Boolean =
       System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows")
@@ -540,7 +540,7 @@ object BuildImplementation {
       val bloopVersion = Keys.version.value
       Def.task {
         // Publish the projects before we invoke buildpress
-        (sbtBloop10 / Keys.publishLocal).value
+        (sbtBloop / Keys.publishLocal).value
 
         val file = Keys.resourceDirectory
           .in(Compile)

project/Dependencies.scala

@@ -6,8 +6,7 @@ object Dependencies {
   val Scala212Version = "2.12.17"
   val Scala213Version = "2.13.8"
 
-  val Sbt013Version = "0.13.18"
-  val Sbt1Version = "1.3.3"
+  val SbtVersion = "1.3.3"
 
   val nailgunVersion = "ee3c4343"
   // Used to download the python client instead of resolving