Skip to content

Commit e73b396

Browse files
Update sbt-scalajs to 1.15.0 (#325)
* Update sbt-scalajs to 1.15.0 * move dependencies versions out of build.sbt file, update to Scala.js 1.15.0 --------- Co-authored-by: Kai <[email protected]>
1 parent a52d2f3 commit e73b396

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

build.sbt

+10-16
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ ThisBuild / publishTo :=(if (!isSnapshot.value) {
2525
Some(Opts.resolver.sonatypeSnapshots)
2626
})
2727

28-
val scalaJsVersion = "1.13.2"
29-
val scalaNativeVersion = "0.4.17"
30-
val crossProjectVersion = "1.3.1"
31-
val bundlerVersion = "0.21.1"
32-
val sbtJsDependenciesVersion = "1.0.2"
33-
3428
val scalaOpts = scalacOptions ++= ((isSnapshot.value, scalaVersion.value) match {
3529
case (_, ScalaVersions.scala_212) => Seq(
3630
"-Xsource:2.13",
@@ -114,11 +108,11 @@ lazy val sbtgen = (project in file("sbtgen"))
114108
s"-Xmacro-settings:sbt-version=${sbtVersion.value}",
115109
s"-Xmacro-settings:scala-version=${scalaVersion.value}",
116110
s"-Xmacro-settings:scala-versions=${crossScalaVersions.value.mkString(":")}",
117-
s"-Xmacro-settings:scala-js-version=$scalaJsVersion",
118-
s"-Xmacro-settings:scala-native-version=$scalaNativeVersion",
119-
s"-Xmacro-settings:crossproject-version=$crossProjectVersion",
120-
s"-Xmacro-settings:bundler-version=$bundlerVersion",
121-
s"-Xmacro-settings:sbt-js-dependencies-version=$sbtJsDependenciesVersion",
111+
s"-Xmacro-settings:scala-js-version=${ScalaVersions.scalaJsVersion}",
112+
s"-Xmacro-settings:scala-native-version=${ScalaVersions.scalaNativeVersion}",
113+
s"-Xmacro-settings:crossproject-version=${Deps.crossProjectVersion}",
114+
s"-Xmacro-settings:bundler-version=${Deps.bundlerVersion}",
115+
s"-Xmacro-settings:sbt-js-dependencies-version=${Deps.sbtJsDependenciesVersion}",
122116
),
123117
scalaOpts,
124118
)
@@ -159,11 +153,11 @@ lazy val `sbt-izumi` = (project in file("sbt/sbt-izumi"))
159153
("com.github.sbt" % "sbt-duplicates-finder" % "1.1.0").extra(SbtVersionKey -> (pluginCrossBuild / sbtBinaryVersion).value, ScalaVersionKey -> (update / scalaBinaryVersion).value).withCrossVersion(Disabled()),
160154
),
161155
libraryDependencies ++= Seq(
162-
("org.scala-js" % "sbt-scalajs" % scalaJsVersion % Test).extra(SbtVersionKey -> (pluginCrossBuild / sbtBinaryVersion).value, ScalaVersionKey -> (update / scalaBinaryVersion).value).withCrossVersion(Disabled()),
163-
("org.scala-native" % "sbt-scala-native" % scalaNativeVersion % Test).extra(SbtVersionKey -> (pluginCrossBuild / sbtBinaryVersion).value, ScalaVersionKey -> (update / scalaBinaryVersion).value).withCrossVersion(Disabled()),
164-
("org.portable-scala" % "sbt-scalajs-crossproject" % crossProjectVersion % Test).extra(SbtVersionKey -> (pluginCrossBuild / sbtBinaryVersion).value, ScalaVersionKey -> (update / scalaBinaryVersion).value).withCrossVersion(Disabled()),
165-
("ch.epfl.scala" % "sbt-scalajs-bundler" % bundlerVersion % Test).extra(SbtVersionKey -> (pluginCrossBuild / sbtBinaryVersion).value, ScalaVersionKey -> (update / scalaBinaryVersion).value).withCrossVersion(Disabled()),
166-
("org.scala-js" % "sbt-jsdependencies" % sbtJsDependenciesVersion % Test).extra(SbtVersionKey -> (pluginCrossBuild / sbtBinaryVersion).value, ScalaVersionKey -> (update / scalaBinaryVersion).value).withCrossVersion(Disabled()),
156+
("org.scala-js" % "sbt-scalajs" % ScalaVersions.scalaJsVersion % Test).extra(SbtVersionKey -> (pluginCrossBuild / sbtBinaryVersion).value, ScalaVersionKey -> (update / scalaBinaryVersion).value).withCrossVersion(Disabled()),
157+
("org.scala-native" % "sbt-scala-native" % ScalaVersions.scalaNativeVersion % Test).extra(SbtVersionKey -> (pluginCrossBuild / sbtBinaryVersion).value, ScalaVersionKey -> (update / scalaBinaryVersion).value).withCrossVersion(Disabled()),
158+
("org.portable-scala" % "sbt-scalajs-crossproject" % Deps.crossProjectVersion % Test).extra(SbtVersionKey -> (pluginCrossBuild / sbtBinaryVersion).value, ScalaVersionKey -> (update / scalaBinaryVersion).value).withCrossVersion(Disabled()),
159+
("ch.epfl.scala" % "sbt-scalajs-bundler" % Deps.bundlerVersion % Test).extra(SbtVersionKey -> (pluginCrossBuild / sbtBinaryVersion).value, ScalaVersionKey -> (update / scalaBinaryVersion).value).withCrossVersion(Disabled()),
160+
("org.scala-js" % "sbt-jsdependencies" % Deps.sbtJsDependenciesVersion % Test).extra(SbtVersionKey -> (pluginCrossBuild / sbtBinaryVersion).value, ScalaVersionKey -> (update / scalaBinaryVersion).value).withCrossVersion(Disabled()),
167161
),
168162
scalaOpts,
169163
)

project/Deps.scala

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
object Deps {
2+
val crossProjectVersion = "1.3.1"
3+
val bundlerVersion = "0.21.1"
4+
val sbtJsDependenciesVersion = "1.0.2"
5+
}

project/ScalaVersions.scala

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
object ScalaVersions {
22
val scala_212 = "2.12.18"
33
val scala_213 = "2.13.12"
4+
5+
val scalaJsVersion = "1.15.0"
6+
val scalaNativeVersion = "0.4.17"
47
}

test/js/dotty/project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// IT IS AUTOGENERATED BY `sbtgen.sc` SCRIPT
33
// ALL CHANGES WILL BE LOST
44
// https://www.scala-js.org/
5-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
66

77
// https://github.com/portable-scala/sbt-crossproject
88
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")

test/js/project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// IT IS AUTOGENERATED BY `sbtgen.sc` SCRIPT
33
// ALL CHANGES WILL BE LOST
44
// https://www.scala-js.org/
5-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
66

77
// https://github.com/portable-scala/sbt-crossproject
88
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")

0 commit comments

Comments
 (0)