Support sbt 1.5.x along with 1.4.x (Fixes #290) (#292)

docs/library-developer.md

@@ -16,8 +16,7 @@ Have a look at [mobx-slinky](https://github.com/ScalablyTyped/mobx-slinky)
 
 ## Requirements
 
-**This plugin needs sbt 1.4.x**. Not higher or lower. 
-This is unfortunate, but some more design work is needed to avoid this.
+**This plugin needs sbt 1.4.x or 1.5.x**.  
 
 Since we generate source code, it should work with any combination of 
 Scala 2.12 / 2.13 and Scala.js 1.x. 

docs/plugin.md

@@ -27,8 +27,7 @@ If you really want more than one conversion make sure to [shade](conversion-opti
 
 ## Requirements
 
-**This plugin needs sbt 1.4.x**. Not higher or lower. 
-This is unfortunate, but some more design work is needed to avoid this.
+**This plugin needs sbt 1.4.x or 1.5.x**.
 
 Since we generate source code, it should work with any combination of 
 Scala 2.12 / 2.13 and Scala.js 1.x.

release.sc

@@ -16,7 +16,7 @@ case class DemoRepo(repo: String, name: String)(implicit path: os.Path) {
     val pluginsFile = path / "project" / "plugins.sbt"
     val newLines = os.read.lines(pluginsFile).flatMap {
       case line if line.contains(s"""addSbtPlugin("org.scala-js" % "sbt-scalajs" %""") =>
-        Some(s"""addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")""")
+        Some(s"""addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")""")
       case line if line.contains(s"""addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" %""") =>
         Some(s"""addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")""")
       case line if line.contains(s"""addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" %""") =>
@@ -25,7 +25,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.4.9")
+    os.write.over(path / "project" / "build.properties", "sbt.version=1.5.0")
     os.write.over(pluginsFile, newLines.mkString("\n"))
     %.sbt("compile", "dist")
     %.git("add", "-A")

sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedPluginBase.scala

@@ -102,14 +102,14 @@ object ScalablyTypedPluginBase extends AutoPlugin {
   override lazy val globalSettings =
     Seq(
       Global / Keys.onLoad := (state => {
-        val old        = (Global / Keys.onLoad).value
-        val ret        = old(state)
-        val sbtVersion = Keys.sbtVersion.value
-        val Supported  = "1.4"
-        if (!sbtVersion.startsWith(Supported)) {
-          val msg =
-            s"This version of the ScalablyTyped plugin only supports sbt $Supported.x . You're currently using $sbtVersion"
-          sys.error(msg)
+        val old = (Global / Keys.onLoad).value
+        val ret = old(state)
+        Keys.sbtVersion.value match {
+          case valid if valid.startsWith("1.4") || valid.startsWith("1.5") => ret
+          case invalid =>
+            sys.error(
+              s"This version of the ScalablyTyped plugin only supports sbt 1.4.x or 1.5.x. You're currently using $invalid",
+            )
         }
         ret
       }),

sbt-converter/src/sbt-test/react/external/project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.2
+sbt.version=1.5.0

sbt-converter/src/sbt-test/react/external/project/plugins.sbt

@@ -1,10 +1,8 @@
-resolvers += Resolver.bintrayRepo("oyvindberg", "converter")
-
 {
   val pluginVersion = System.getProperty("plugin.version")
   if (pluginVersion == null)
     throw new RuntimeException("""|The system property 'plugin.version' is not defined.
                                   |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
   else addSbtPlugin("org.scalablytyped.converter" % """sbt-converter""" % pluginVersion)
 }
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")

sbt-converter/src/sbt-test/react/japgolly/project/plugins.sbt

@@ -1,10 +1,8 @@
-resolvers += Resolver.bintrayRepo("oyvindberg", "converter")
-
 val pluginVersion = System.getProperty("plugin.version")
 if (pluginVersion == null)
   throw new RuntimeException("""|The system property 'plugin.version' is not defined.
                                   |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
 else addSbtPlugin("org.scalablytyped.converter" % """sbt-converter""" % pluginVersion)
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")

sbt-converter/src/sbt-test/react/sourcegen/project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.2
+sbt.version=1.5.0

sbt-converter/src/sbt-test/react/sourcegen/project/plugins.sbt

@@ -1,10 +1,9 @@
-resolvers += Resolver.bintrayRepo("oyvindberg", "converter")
 
 val pluginVersion = System.getProperty("plugin.version")
 if (pluginVersion == null)
   throw new RuntimeException("""|The system property 'plugin.version' is not defined.
                                   |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
 else addSbtPlugin("org.scalablytyped.converter" % """sbt-converter""" % pluginVersion)
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")