Upgrade to sbt 1.8.0

- due to the scala-xml situation, this is now the only supported sbt version for the plugin. Fixes #498 - bump to scala 2.12.17 and 2.13.10 - bump bloop to 1.5.4
ScalablyTyped · Nov 13, 2022 · 42eccb8 · 42eccb8
1 parent 2f966b8
commit 42eccb8
Show file tree

Hide file tree

Showing 147 changed files with 171 additions and 161 deletions.
diff --git a/build.sbt b/build.sbt
@@ -60,6 +60,10 @@ lazy val importer = project
       Deps.coursier,
       Deps.scalatest % Test,
     ),
+    // bloop hasn't upgraded to scala-xml 2 yet
+    libraryDependencySchemes ++= Seq(
+      "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
+    ),
     Test / fork := true,
     assembly / test := {},
     assembly / mainClass := Some("org.scalablytyped.converter.Main"),
@@ -80,7 +84,13 @@ lazy val importer = project
 lazy val cli = project
   .dependsOn(importer)
   .configure(baseSettings)
-  .settings(libraryDependencies += Deps.scopt)
+  .settings(
+    libraryDependencies += Deps.scopt,
+    // bloop hasn't upgraded to scala-xml 2 yet
+    libraryDependencySchemes ++= Seq(
+      "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
+    ),
+  )
 
 lazy val `sbt-converter` = project
   .dependsOn(`importer-portable`)
@@ -131,7 +141,7 @@ lazy val baseSettings: Project => Project =
         url("https://github.com/oyvindberg"),
       ),
     ),
-    scalaVersion := "2.12.16",
+    scalaVersion := "2.12.17",
     scalacOptions ~= (_.filterNot(Set("-Ywarn-unused:imports", "-Ywarn-unused:params", "-Xfatal-warnings"))),
     /* disable scaladoc */
     Compile / doc / sources := Nil,

diff --git a/docs/library-developer.md b/docs/library-developer.md
@@ -16,7 +16,7 @@ Have a look at [mobx-slinky](https://github.com/ScalablyTyped/mobx-slinky)
 
 ## Requirements
 
-**This plugin needs sbt 1.7.x**.
+**This plugin needs sbt 1.8.x**.
 
 Since we generate source code, it should work with any combination of 
 Scala 2.12 / 2.13 / 3.2.0 and Scala.js 1.11+ 

diff --git a/docs/plugin.md b/docs/plugin.md
@@ -28,7 +28,7 @@ If you really want more than one conversion make sure to [shade](conversion-opti
 
 ## Requirements
 
-**This plugin needs sbt 1.7.x**.
+**This plugin needs sbt 1.8.x**.
 
 Since we generate source code, it should work with any combination of 
 Scala 2.12 / 2.13 / 3.2.0+ and Scala.js 1.11+

diff --git a/...er/src/main/scala/org/scalablytyped/converter/internal/importer/build/BloopCompiler.scala b/...er/src/main/scala/org/scalablytyped/converter/internal/importer/build/BloopCompiler.scala
@@ -144,15 +144,16 @@ class BloopCompiler private (
             setup        = None,
           ),
         ),
-        java         = None,
-        sbt          = None,
-        test         = None,
-        platform     = None,
-        resolution   = None,
-        workspaceDir = None,
-        sourcesGlobs = None,
-        sourceRoots  = None,
-        tags         = None,
+        java             = None,
+        sbt              = None,
+        test             = None,
+        platform         = None,
+        resolution       = None,
+        workspaceDir     = None,
+        sourcesGlobs     = None,
+        sourceRoots      = None,
+        tags             = None,
+        sourceGenerators = None,
       ),
     )
     os.makeDir.all(bloopFolder)

diff --git a/project/Deps.scala b/project/Deps.scala
@@ -7,11 +7,11 @@ object Deps {
   val sourcecode        = "com.lihaoyi" %% "sourcecode" % "0.3.0"
   val scalatest         = "org.scalatest" %% "scalatest" % "3.2.14"
   val fansi             = "com.lihaoyi" %% "fansi" % "0.4.0"
-  val bloop             = "ch.epfl.scala" %% "bloop-frontend" % "1.5.0"
-  val scalaXml          = "org.scala-lang.modules" %% "scala-xml" % "1.3.0"
+  val bloop             = "ch.epfl.scala" %% "bloop-frontend" % "1.5.4"
+  val scalaXml          = "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
   val scopt             = "com.github.scopt" %% "scopt" % "4.1.0"
   val awssdkS3          = "software.amazon.awssdk" % "s3" % "2.15.28"
-  val coursier          = "io.get-coursier" %% "coursier" % "2.0.16"
+  val coursier          = "io.get-coursier" %% "coursier" % "2.1.0-RC1"
 
   val circe: Seq[ModuleID] =
     Seq(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.1
+sbt.version=1.8.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -5,4 +5,3 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
 addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.4")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.14") // remove on next release of sbt-ci-release
diff --git a/release.sc b/release.sc
@@ -26,7 +26,7 @@ case class DemoRepo(repo: String, name: String)(implicit path: os.Path) {
         None
       case line => Some(line)
     }
-    os.write.over(path / "project" / "build.properties", "sbt.version=1.7.0")
+    os.write.over(path / "project" / "build.properties", "sbt.version=1.8.0")
     os.write.over(pluginsFile, newLines.mkString("\n"))
     %.sbt("compile", "dist")
     %.git("add", "-A")

diff --git a/...converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedPluginBase.scala b/...converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedPluginBase.scala
@@ -111,10 +111,10 @@ object ScalablyTypedPluginBase extends AutoPlugin {
       Global / Keys.onLoad := (state => {
         val old = (Global / Keys.onLoad).value
         Keys.sbtVersion.value match {
-          case valid if valid.startsWith("1.7") => old(state)
+          case valid if valid.startsWith("1.8") => old(state)
           case invalid =>
             sys.error(
-              s"This version of the ScalablyTyped plugin only supports 1.7.x. You're currently using $invalid",
+              s"This version of the ScalablyTyped plugin only supports 1.8.x. You're currently using $invalid",
             )
         }
       }),

diff --git a/sbt-converter/src/sbt-test/react/external/project/build.properties b/sbt-converter/src/sbt-test/react/external/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.1
+sbt.version=1.8.0
diff --git a/sbt-converter/src/sbt-test/react/japgolly/project/build.properties b/sbt-converter/src/sbt-test/react/japgolly/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.1
+sbt.version=1.8.0
diff --git a/sbt-converter/src/sbt-test/react/sourcegen/project/build.properties b/sbt-converter/src/sbt-test/react/sourcegen/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.1
+sbt.version=1.8.0
diff --git a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/Versions.scala b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/Versions.scala
@@ -4,7 +4,7 @@ package scalajs
 import io.circe013.{Decoder, Encoder}
 
 object Versions {
-  val sbtVersion = "1.7.2"
+  val sbtVersion = "1.8.0"
 
   // this accepts any nightly or milestone with the same binversion as a major release. good enough for now
   private val Version = "(\\d+).(\\d+).(\\d+).*".r
@@ -44,8 +44,8 @@ object Versions {
     implicit val decodes: Decoder[Scala] = Decoder[String].map(Scala.apply)
   }
 
-  val Scala212 = Scala("2.12.15")
-  val Scala213 = Scala("2.13.8")
+  val Scala212 = Scala("2.12.17")
+  val Scala213 = Scala("2.13.10")
   val Scala3   = Scala("3.2.0")
 
   case class ScalaJs(scalaJsVersion: String) {

diff --git a/tests/antd/check-3/a/antd/project/build.properties b/tests/antd/check-3/a/antd/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/antd/check-3/r/rc-field-form/project/build.properties b/tests/antd/check-3/r/rc-field-form/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/augment-module/check-3/l/lodash/project/build.properties b/tests/augment-module/check-3/l/lodash/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/augment-module/check-3/l/lodash_dot_add/project/build.properties b/tests/augment-module/check-3/l/lodash_dot_add/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/augment-module/check-3/s/std/project/build.properties b/tests/augment-module/check-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/aws-sdk/check-3/a/aws-sdk/project/build.properties b/tests/aws-sdk/check-3/a/aws-sdk/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/babylon/check-3/b/babylon/project/build.properties b/tests/babylon/check-3/b/babylon/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/babylon/check-3/n/node/project/build.properties b/tests/babylon/check-3/n/node/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/bigint/check-3/b/bigint/project/build.properties b/tests/bigint/check-3/b/bigint/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/bigint/check-3/s/std/project/build.properties b/tests/bigint/check-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/chart.js/check-3/c/chart_dot_js/project/build.properties b/tests/chart.js/check-3/c/chart_dot_js/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/chart.js/check-3/s/std/project/build.properties b/tests/chart.js/check-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/cldrjs/check-3/c/cldrjs/project/build.properties b/tests/cldrjs/check-3/c/cldrjs/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/cldrjs/check-3/s/std/project/build.properties b/tests/cldrjs/check-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/commander/check-3/c/commander/project/build.properties b/tests/commander/check-3/c/commander/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/commander/check-3/n/node/project/build.properties b/tests/commander/check-3/n/node/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/commander/check-3/s/std/project/build.properties b/tests/commander/check-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/const-enum/check-3/c/const-enum/project/build.properties b/tests/const-enum/check-3/c/const-enum/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/create-error/check-3/c/create-error/project/build.properties b/tests/create-error/check-3/c/create-error/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/create-error/check-3/s/std/project/build.properties b/tests/create-error/check-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/defaulted-tparams/check-3/d/defaulted-tparams/project/build.properties b/tests/defaulted-tparams/check-3/d/defaulted-tparams/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/defaulted-tparams/check-3/s/std/project/build.properties b/tests/defaulted-tparams/check-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/documentation/check-3/d/documentation/project/build.properties b/tests/documentation/check-3/d/documentation/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/echarts/check-3/e/echarts/project/build.properties b/tests/echarts/check-3/e/echarts/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/elasticsearch-js/check-3/e/elasticsearch-js/project/build.properties b/tests/elasticsearch-js/check-3/e/elasticsearch-js/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/elasticsearch-js/check-3/s/std/project/build.properties b/tests/elasticsearch-js/check-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/electron/check-3/e/electron/project/build.properties b/tests/electron/check-3/e/electron/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/electron/check-3/n/node/project/build.properties b/tests/electron/check-3/n/node/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/electron/check-3/s/std/project/build.properties b/tests/electron/check-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/expand-type-parameters/check-3/e/expand-type-parameters/project/build.properties b/tests/expand-type-parameters/check-3/e/expand-type-parameters/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/export-as-namespace/check-3/a/angular-agility/project/build.properties b/tests/export-as-namespace/check-3/a/angular-agility/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/export-as-namespace/check-3/a/angular/project/build.properties b/tests/export-as-namespace/check-3/a/angular/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/export-as-namespace/check-3/s/std/project/build.properties b/tests/export-as-namespace/check-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/firebase-admin/check-3/f/firebase-admin/project/build.properties b/tests/firebase-admin/check-3/f/firebase-admin/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/firebase-admin/check-3/g/google-cloud__firestore/project/build.properties b/tests/firebase-admin/check-3/g/google-cloud__firestore/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/firebase/check-3/f/firebase/project/build.properties b/tests/firebase/check-3/f/firebase/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/fp-ts/check-3/f/fp-ts/project/build.properties b/tests/fp-ts/check-3/f/fp-ts/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/fullcalendar/check-3/f/fullcalendar/project/build.properties b/tests/fullcalendar/check-3/f/fullcalendar/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/insight/check-3/i/insight/project/build.properties b/tests/insight/check-3/i/insight/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/interface-package/check-3/i/interface-package/project/build.properties b/tests/interface-package/check-3/i/interface-package/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/keyof/check-3/k/keyof/project/build.properties b/tests/keyof/check-3/k/keyof/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/material-ui/check-japgolly-3/m/material-ui/project/build.properties b/tests/material-ui/check-japgolly-3/m/material-ui/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/material-ui/check-japgolly-3/r/react/project/build.properties b/tests/material-ui/check-japgolly-3/r/react/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/material-ui/check-japgolly-3/s/std/project/build.properties b/tests/material-ui/check-japgolly-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/material-ui/check-slinky-3/m/material-ui/project/build.properties b/tests/material-ui/check-slinky-3/m/material-ui/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/material-ui/check-slinky-3/r/react/project/build.properties b/tests/material-ui/check-slinky-3/r/react/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/material-ui/check-slinky-3/s/std/project/build.properties b/tests/material-ui/check-slinky-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/monaco-editor/check-3/m/monaco-editor/project/build.properties b/tests/monaco-editor/check-3/m/monaco-editor/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0
diff --git a/tests/monaco-editor/check-3/s/std/project/build.properties b/tests/monaco-editor/check-3/s/std/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0