Merge branch 'master' into update/scalajs-js-envs-1.5.0

Author: adamw

.github/workflows/ci.yml

@@ -5,6 +5,9 @@ on:
   push:
     branches: ['**']
     tags: [v*]
+permissions:
+  contents: write        # release-drafter, auto-merge requirement
+  pull-requests: write   # labeler, auto-merge requirement    
 jobs:
   ci:
     # run on external PRs, but not on internal PRs since those will be run by push to branch
@@ -13,7 +16,7 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    - uses: sbt/setup-sbt@v1
+    - uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1, specifically v1.1.14
     - name: Set up JDK 
       uses: actions/setup-java@v4
       with:

.github/workflows/scala-steward.yml

@@ -6,23 +6,14 @@ on:
     - cron: '0 0 * * *'
   workflow_dispatch:
 
+permissions:
+  contents: write        # Required to checkout and push changes
+  pull-requests: write   # Required to create PRs for dependency updates
+
 jobs:
   scala-steward:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: 11
-          cache: 'sbt'
-      - name: Launch Scala Steward
-        uses: scala-steward-org/scala-steward-action@v2
-        with:
-          author-name: scala-steward
-          author-email: scala-steward
-          github-token: ${{ secrets.REPO_GITHUB_TOKEN }}
-          repo-config: .scala-steward.conf
-          ignore-opts-files: false
+    uses: softwaremill/github-actions-workflows/.github/workflows/scala-steward.yml@main
+    secrets:
+      github-token: ${{ secrets.SOFTWAREMILL_CI_PR_TOKEN }}
+    with:
+      java-version: '21'

.scalafmt.conf

@@ -1,3 +1,3 @@
-version=3.8.6
+version=3.10.2
 maxColumn=140
 dialect=scala212

README.md

@@ -11,10 +11,10 @@ For each project where you'd like to use the build settings, add some or all of
 file:
 
 ````scala
-addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % "2.1.0")
-addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % "2.1.0")
-addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-extra" % "2.1.0")
-addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-browser-test-js" % "2.1.0")
+addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % "2.1.1")
+addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % "2.1.1")
+addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-extra" % "2.1.1")
+addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-browser-test-js" % "2.1.1")
 ````
 
 Now you can add the appropriate settings in your `build.sbt`, e.g.:

build.sbt

@@ -9,7 +9,7 @@ val commonSettings = Publish.ossPublishSettings ++ Seq(
   sbtVersion in Global := {
     scalaBinaryVersion.value match {
       case "2.10" => "0.13.17"
-      case "2.12" => "1.10.2"
+      case "2.12" => "1.11.7"
     }
   }
 )
@@ -85,13 +85,13 @@ lazy val browserTestJs = project
     scriptedLaunchOpts += ("-Dplugin.version=" + version.value)
   )
   .settings(    
-    addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0"),
+    addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1"),
     // playwright dependencies, copied from https://github.com/gmkumar2005/scala-js-env-playwright/blob/main/build.sbt
     libraryDependencies ++= Seq(
-      "com.microsoft.playwright" % "playwright" % "1.49.0",
+      "com.microsoft.playwright" % "playwright" % "1.56.0",
       "org.scala-js" %% "scalajs-js-envs" % "1.5.0",
-      "com.google.jimfs" % "jimfs" % "1.3.0",
+      "com.google.jimfs" % "jimfs" % "1.3.1",
       "com.outr" %% "scribe" % "3.15.2",
-      "org.typelevel" %% "cats-effect" % "3.5.7"
+      "org.typelevel" %% "cats-effect" % "3.6.3"
     )
   )

common/src/main/scala/com/softwaremill/SbtSoftwareMillCommon.scala

@@ -10,7 +10,7 @@ object SbtSoftwareMillCommon extends AutoPlugin {
   lazy val commonSmlBuildSettings = Seq(
     libraryDependencies ++= {
       if (ScalaArtifacts.isScala3(scalaVersion.value)) Nil
-      else Seq(compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full))
+      else Seq(compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.4" cross CrossVersion.full))
     },
     // silence transitive eviction warnings
     update / evictionWarningOptions := EvictionWarningOptions.empty,

project/build.properties

@@ -1 +1 @@
-sbt.version=1.11.1
+sbt.version=1.11.7

project/build.sbt

@@ -1,5 +1,5 @@
-val sbtCiReleaseVersion = "1.11.1"
-val sbtScalafmtVersion = "2.5.4"
+val sbtCiReleaseVersion = "1.11.2"
+val sbtScalafmtVersion = "2.5.6"
 
 lazy val root = project
   .in(file("."))