update CI and all that (#561)

* update CI and all that

* update mergify

* update scala, SN

* Upgrade everything

* regenerate workflow

* not just patches, just merge everything Steward sends

Author: kubukoz

.github/workflows/ci.yml

@@ -27,45 +27,37 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.3.0]
-        java: [temurin@11]
+        scala: [3.6.4]
+        java: [zulu@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@11)
-        if: matrix.java == 'temurin@11'
-        uses: actions/setup-java@v2
+      - name: Setup Java (zulu@8)
+        if: matrix.java == 'zulu@8'
+        uses: actions/setup-java@v4
         with:
-          distribution: temurin
-          java-version: 11
+          distribution: zulu
+          java-version: 8
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Check that workflows are up to date
-        run: sbt ++${{ matrix.scala }} githubWorkflowCheck
+        run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
 
       - name: Build project
-        run: sbt ++${{ matrix.scala }} test
+        run: sbt '++ ${{ matrix.scala }}' test
 
       - name: Compress target directories
         run: tar cf targets.tar target app/.jvm/target app/.native/target project/target
 
       - name: Upload target directories
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
           path: targets.tar
@@ -77,43 +69,35 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.3.0]
-        java: [temurin@11]
+        scala: [3.6.4]
+        java: [zulu@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@11)
-        if: matrix.java == 'temurin@11'
-        uses: actions/setup-java@v2
+      - name: Setup Java (zulu@8)
+        if: matrix.java == 'zulu@8'
+        uses: actions/setup-java@v4
         with:
-          distribution: temurin
-          java-version: 11
+          distribution: zulu
+          java-version: 8
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Download target directories (3.3.0)
-        uses: actions/download-artifact@v2
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
+      - name: Download target directories (3.6.4)
+        uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-3.3.0-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.6.4-${{ matrix.java }}
 
-      - name: Inflate target directories (3.3.0)
+      - name: Inflate target directories (3.6.4)
         run: |
           tar xf targets.tar
           rm targets.tar
 
       - id: release
-        run: sbt ++${{ matrix.scala }} ci-release
+        run: sbt ci-release

.github/workflows/clean.yml

@@ -17,6 +17,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Delete artifacts
+        shell: bash {0}
         run: |
           # Customize those three lines with your repository and credentials:
           REPO=${GITHUB_API_URL}/repos/${{ github.repository }}
@@ -25,7 +26,7 @@ jobs:
           ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; }
 
           # A temporary file which receives HTTP response headers.
-          TMPFILE=/tmp/tmp.$$
+          TMPFILE=$(mktemp)
 
           # An associative array, key: artifact name, value: number of artifacts of that name.
           declare -A ARTCOUNT

.mergify.yml

@@ -2,8 +2,7 @@ pull_request_rules:
   - name: automatically merge Scala Steward PRs on CI success
     conditions:
       - author=scala-steward
-      - status-success=Build and Test (ubuntu-latest, 3.0.1, [email protected])
-      - body~=labels:.*semver-patch.*
+      - status-success=Build and Test (ubuntu-latest, 3.6.4, zulu@8)
     actions:
       merge:
         method: merge

.scalafmt.conf

@@ -1,9 +1,9 @@
 runner.dialect = scala3
 runner.dialectOverride.allowSignificantIndentation = false
-version = "3.7.2"
+version = "3.9.4"
 maxColumn = 140
 align.preset = some
-align.tokens.add = [
+align.tokens."+" = [
   {code = "<-", owner = Enumerator.Generator}
 ]
 align.multiline = true

app/src/main/scala/com/kubukoz/next/Program.scala

@@ -11,7 +11,6 @@ import cats.effect.kernel.Ref
 import cats.effect.std.Console
 import cats.implicits.*
 import com.kubukoz.next.Spotify.DeviceInfo
-import com.kubukoz.next.Spotify.SonosInfo
 import com.kubukoz.next.api.sonos
 import com.kubukoz.next.sonos.SonosApi
 import com.kubukoz.next.sonos.SonosApiGen
@@ -36,8 +35,6 @@ import org.http4s.headers.`Content-Type`
 import org.typelevel.log4cats.Logger
 import smithy4s.http4s.SimpleRestJsonBuilder
 
-import java.lang.System
-
 import concurrent.duration.*
 
 object Program {

build.sbt

@@ -15,7 +15,7 @@ inThisBuild(
 )
 Global / onChangedBuildSource := ReloadOnSourceChanges
 
-ThisBuild / scalaVersion := "3.3.1"
+ThisBuild / scalaVersion := "3.6.4"
 
 ThisBuild / githubWorkflowTargetTags := Seq("v*")
 ThisBuild / githubWorkflowPublishTargetBranches := List(RefPredicate.StartsWith(Ref.Tag("v")), RefPredicate.Equals(Ref.Branch("main")))
@@ -49,26 +49,22 @@ def crossPlugin(
   x: sbt.librarymanagement.ModuleID
 ) = compilerPlugin(x.cross(CrossVersion.full))
 
-val addCompilerPlugins = libraryDependencies ++= {
+val addCompilerPlugins = libraryDependencies ++=
   List(
     crossPlugin("org.polyvariant" % "better-tostring" % "0.3.17")
   )
-}
 
 val commonSettings = Seq(
   scalacOptions -= "-Xfatal-warnings",
   scalacOptions ++= List(
-    "-no-indent",
-    "-rewrite",
-    "-source",
-    "future-migration"
+    "-no-indent"
     // "-Ximport-suggestion-timeout",
     // "2000"
   ),
   libraryDependencies ++= Seq(
-    "org.typelevel" %%% "cats-effect" % "3.5.2",
-    "org.scalameta" %%% "munit" % "1.0.0-M10" % Test,
-    "org.typelevel" %%% "munit-cats-effect" % "2.0.0-M3" % Test
+    "org.typelevel" %%% "cats-effect" % "3.5.7",
+    "org.scalameta" %%% "munit" % "1.0.0" % Test,
+    "org.typelevel" %%% "munit-cats-effect" % "2.0.0" % Test
   ),
   addCompilerPlugins,
   Compile / doc / sources := Nil
@@ -126,14 +122,14 @@ val app = crossProject(JVMPlatform, NativePlatform)
   .settings(
     libraryDependencies ++= Seq(
       "com.disneystreaming.smithy4s" %%% "smithy4s-http4s" % smithy4sVersion.value,
-      "org.typelevel" %%% "cats-mtl" % "1.3.1",
+      "org.typelevel" %%% "cats-mtl" % "1.4.0",
       "com.monovore" %%% "decline-effect" % "2.4.1",
-      "org.http4s" %%% "http4s-dsl" % "0.23.23",
-      "org.http4s" %%% "http4s-ember-server" % "0.23.23",
-      "org.http4s" %%% "http4s-ember-client" % "0.23.23",
-      "org.http4s" %%% "http4s-circe" % "0.23.23",
-      "io.circe" %%% "circe-parser" % "0.14.6",
-      "org.typelevel" %%% "log4cats-noop" % "2.6.0",
+      "org.http4s" %%% "http4s-dsl" % "0.23.30",
+      "org.http4s" %%% "http4s-ember-server" % "0.23.30",
+      "org.http4s" %%% "http4s-ember-client" % "0.23.30",
+      "org.http4s" %%% "http4s-circe" % "0.23.30",
+      "io.circe" %%% "circe-parser" % "0.14.8",
+      "org.typelevel" %%% "log4cats-noop" % "2.7.0",
       "org.polyvariant" %%% "colorize" % "0.3.2"
       // waiting
       // "dev.optics" %%% "monocle-core" % "3.1.0"
@@ -150,7 +146,7 @@ val app = crossProject(JVMPlatform, NativePlatform)
   .jvmConfigure(
     _.settings(
       libraryDependencies ++= Seq(
-        "ch.qos.logback" % "logback-classic" % "1.2.11"
+        "ch.qos.logback" % "logback-classic" % "1.2.13"
       )
     ).enablePlugins(JavaAppPackaging)
   )

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.10.11

project/plugins.sbt

@@ -1,12 +1,12 @@
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
-addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0")
-addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3")
+addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.1")
 
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
-addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
+addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.25.0")
 
-addSbtPlugin("com.disneystreaming.smithy4s" % "smithy4s-sbt-codegen" % "0.18.2")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16")
+addSbtPlugin("com.disneystreaming.smithy4s" % "smithy4s-sbt-codegen" % "0.18.31")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 
 addDependencyTreePlugin