From 419bef3c9047155aa2b9a29dec84f2e06d1a03b6 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 29 Mar 2025 15:24:18 -0700 Subject: [PATCH 1/6] Update sbt-best-practice.sbt --- project/sbt-best-practice.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/sbt-best-practice.sbt b/project/sbt-best-practice.sbt index ff7f572..4618f6f 100644 --- 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.1" + "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.1+28-14d7259e" ) From a9621eca94010e25db62b9923926ee9bac23d759 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 29 Mar 2025 18:28:45 -0700 Subject: [PATCH 2/6] Update build.sbt --- ReactToBindingHtml/build.sbt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ReactToBindingHtml/build.sbt b/ReactToBindingHtml/build.sbt index 4904449..ecba60a 100644 --- a/ReactToBindingHtml/build.sbt +++ b/ReactToBindingHtml/build.sbt @@ -67,11 +67,3 @@ libraryDependencies ++= PartialFunction.condOpt( "org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full ) } - -webpack / version := { - if (VersionNumber(scalaJSVersion).matchesSemVer(SemanticSelector("<1"))) { - "3.12.0" - } else { - "5.98.0" - } -} From 7e972a43f35de9637e84c7561a8e1eeca9586f5b Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 29 Mar 2025 18:28:57 -0700 Subject: [PATCH 3/6] Update build.sbt --- HtmlMountPoint/build.sbt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/HtmlMountPoint/build.sbt b/HtmlMountPoint/build.sbt index cec7210..1d028b0 100644 --- a/HtmlMountPoint/build.sbt +++ b/HtmlMountPoint/build.sbt @@ -16,11 +16,3 @@ libraryDependencies += { "org.scala-js" %%% "scalajs-dom" % "1.2.0" } } - -webpack / version := { - if (VersionNumber(scalaJSVersion).matchesSemVer(SemanticSelector("<1"))) { - "3.12.0" - } else { - "5.98.0" - } -} From 4481d324d17835a6901541975684ef36c16213e2 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 29 Mar 2025 18:29:20 -0700 Subject: [PATCH 4/6] Update build.sbt --- BindingReactToReact/build.sbt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/BindingReactToReact/build.sbt b/BindingReactToReact/build.sbt index b09034a..8ff82e0 100644 --- a/BindingReactToReact/build.sbt +++ b/BindingReactToReact/build.sbt @@ -51,11 +51,3 @@ scalacOptions ++= PartialFunction.condOpt( ) { case true => "-P:scalajs:sjsDefinedByDefault" } - -webpack / version := { - if (VersionNumber(scalaJSVersion).matchesSemVer(SemanticSelector("<1"))) { - "3.12.0" - } else { - "5.98.0" - } -} From f6977058215450de35e8cd822248c31a5716aa00 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 29 Mar 2025 18:29:32 -0700 Subject: [PATCH 5/6] Update build.sbt --- BindingHtmlToReact/build.sbt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/BindingHtmlToReact/build.sbt b/BindingHtmlToReact/build.sbt index 7b4b59e..ecba60a 100644 --- a/BindingHtmlToReact/build.sbt +++ b/BindingHtmlToReact/build.sbt @@ -67,11 +67,3 @@ libraryDependencies ++= PartialFunction.condOpt( "org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full ) } - -webpack / version := { - if (VersionNumber(scalaJSVersion).matchesSemVer(SemanticSelector("<1"))) { - "3.12.0" - } else { - "5.98.0" - } -} \ No newline at end of file From e9a11eaee8b6c288cb3b88d4c284e9459972469d Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sun, 30 Mar 2025 01:30:58 +0000 Subject: [PATCH 6/6] Update scala-library to 2.12.20 in Atry-patch-1 --- .github/workflows/scala.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 0faf5fd..f5f7491 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: include: - - scala: 2.12.13 + - scala: 2.12.20 sbt-args: --addPluginSbtFile=project/plugins.sbt.scalajs06 - scala: 2.13.4 sbt-args: --addPluginSbtFile=project/plugins.sbt.scalajs06