Merge branch '12.x' into update/sbt-scalajs-1.18.2

Atry · web-flow · commit 61a952dcc3d6 · 2025-03-30T17:54:32.000-07:00
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -32,6 +32,7 @@ jobs:
         with:
           java-version: "11"
           distribution: temurin
+      - uses: sbt/setup-sbt@v1
       - name: Cache SBT
         uses: actions/cache@v3
         with:
diff --git a/Binding/shared/build.sbt b/Binding/shared/build.sbt
@@ -10,7 +10,7 @@ libraryDependencies ++= {
   }
 }
 
-libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.16" % Test
+libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.19" % Test
 
 libraryDependencies ++= {
   if (scalaBinaryVersion.value == "2.13") {
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,3 +3,7 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
 
 addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.1.1")
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
+
+addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "9.3.1")
diff --git a/project/sbt-best-practice.sbt b/project/sbt-best-practice.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin(
-  "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.0"
+  "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.1"
 )

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ libraryDependencies ++= {`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`		`-libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.16" % Test`
	`13`	`+libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.19" % Test`
`14`	`14`
`15`	`15`	`libraryDependencies ++= {`
`16`	`16`	`if (scalaBinaryVersion.value == "2.13") {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`addSbtPlugin(`
`2`		`- "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.0"`
	`2`	`+ "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.1"`
`3`	`3`	`)`