Merge pull request #2978 from tgodzik/update-sbt2

chore: Update sbt 2 to final release

Author: tgodzik

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
         shell: bash
       - name: Sbt 2
         run: |
-          sbt "++3.7.3 sbtBloop/scripted \
+          sbt "++3.8.4 sbtBloop/scripted \
             sbt-bloop/wartremover \
             sbt-bloop/stale-projects \
             sbt-bloop/sbt-plugin-build \

build.sbt

@@ -314,7 +314,7 @@ lazy val sbtBloop: Project = project
     name := "sbt-bloop",
     pluginCrossBuild / sbtVersion := (scalaBinaryVersion.value match {
       case "2.12" => SbtVersion
-      case _ => "2.0.0-RC8"
+      case _ => "2.0.0"
     }),
     crossScalaVersions := List(Scala212Version, Scala3Version),
     scalaVersion := Dependencies.Scala212Version,

integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/SbtBloop.scala

@@ -70,12 +70,14 @@ object BloopKeys {
     settingKey[Option[Set[String]]](
       "The classifiers that will be exported with `updateClassifiers`"
     )
+  @transient
   val bloopProductDirectories: TaskKey[Seq[File]] =
     taskKey[Seq[File]]("Bloop product directories")
   val bloopClassDirectory: SettingKey[File] =
     settingKey[File]("Directory where to write the class files")
   val bloopTargetDir: SettingKey[File] =
     settingKey[File]("Target directory for the pertinent project and configuration")
+  @transient
   val bloopInternalClasspath: TaskKey[Seq[(File, File)]] =
     taskKey[Seq[(File, File)]]("Directory where to write the class files")
   val bloopInstall: TaskKey[Unit] =
@@ -101,6 +103,7 @@ object BloopKeys {
     settingKey[Seq[Configuration]](
       "The sequence of configurations that are used to detect inter-project dependencies by bloop."
     )
+  @transient
   val bloopExtraExportedJars: TaskKey[Seq[File]] =
     taskKey[Seq[File]](
       "Jar files from internal dependencies whose exportedProducts differ from productDirectories"

integrations/sbt-bloop/src/sbt-test/sbt-bloop/wartremover/project/plugins.sbt

@@ -1,3 +1,7 @@
 addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % sys.props.apply("plugin.version"))
 
-addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.4.3")
+val wartremoverVersion =
+  if (sys.props.get("scalaVersion").exists(_.startsWith("2.12"))) "3.4.3"
+  else "3.5.8"
+
+addSbtPlugin("org.wartremover" % "sbt-wartremover" % wartremoverVersion)

project/Dependencies.scala

@@ -8,7 +8,7 @@ object Dependencies {
   val Scala211Version = "2.11.12"
   val Scala212Version = "2.12.21"
   val Scala213Version = "2.13.18"
-  val Scala3Version = "3.7.4"
+  val Scala3Version = "3.8.4"
 
   val SbtVersion = "1.9.0"