Fix ci, run formatter

zio · Feb 9, 2025 · db4b367 · db4b367
1 parent a660394
commit db4b367
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,33 +4,38 @@
 name: CI
 env:
   JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags
-  JVM_OPTS: -XX:+PrintCommandLineFlags
 'on':
   workflow_dispatch: {}
   release:
     types:
     - published
   push: {}
-  pull_request: {}
-  create: {}
+  pull_request:
+    branches-ignore:
+    - gh-pages
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.run_id || github.ref }}
+  cancel-in-progress: true
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v4
       with:
         fetch-depth: '0'
     - name: Install libuv
       run: sudo apt-get update && sudo apt-get install -y libuv1-dev
     - name: Setup Scala
-      uses: actions/setup-java@v3.10.0
+      uses: actions/setup-java@v4
       with:
-        distribution: temurin
-        java-version: '8'
+        distribution: corretto
+        java-version: '17'
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
     - name: Check all code compiles
@@ -43,17 +48,19 @@ jobs:
     continue-on-error: false
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v4
       with:
         fetch-depth: '0'
     - name: Install libuv
       run: sudo apt-get update && sudo apt-get install -y libuv1-dev
     - name: Setup Scala
-      uses: actions/setup-java@v3.10.0
+      uses: actions/setup-java@v4
       with:
-        distribution: temurin
-        java-version: '8'
+        distribution: corretto
+        java-version: '17'
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
     - name: Check if the site workflow is up to date
@@ -78,15 +85,17 @@ jobs:
     - name: Install libuv
       run: sudo apt-get update && sudo apt-get install -y libuv1-dev
     - name: Setup Scala
-      uses: actions/setup-java@v3.10.0
+      uses: actions/setup-java@v4
       with:
-        distribution: temurin
+        distribution: corretto
         java-version: ${{ matrix.java }}
         check-latest: true
+    - name: Setup SBT
+      uses: sbt/setup-sbt@v1
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
     - name: Git Checkout
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v4
       with:
         fetch-depth: '0'
     - name: Test

diff --git a/build.sbt b/build.sbt
@@ -9,15 +9,14 @@ inThisBuild(
     ciPostReleaseJobs          := Seq.empty,
     ciCheckWebsiteBuildProcess := Seq.empty,
     scalaVersion               := scala213.value,
-    ciTargetScalaVersions := makeTargetScalaMap(
+    ciTargetScalaVersions := targetScalaVersionsFor(
       `zio-quickstart-encode-decode-json`,
       `zio-quickstart-sql`,
       `zio-quickstart-prelude`,
       `zio-quickstart-restful-webservice`
     ).value,
-    ciDefaultTargetJavaVersions := Seq("17"),
-    semanticdbEnabled           := true,
-    semanticdbVersion           := scalafixSemanticdb.revision
+    ciTargetJavaVersions := Seq("17"),
+    semanticdbEnabled    := true
   )
 )
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,11 +1,11 @@
-val zioSbtVersion = "0.4.0-alpha.6+15-525bdf8e-SNAPSHOT"
+val zioSbtVersion = "0.4.0-alpha.30"
 
-//addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % zioSbtVersion)
-addSbtPlugin("dev.zio" % "zio-sbt-website" % zioSbtVersion)
-addSbtPlugin("dev.zio" % "zio-sbt-ci"      % zioSbtVersion)
+addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % zioSbtVersion)
+addSbtPlugin("dev.zio" % "zio-sbt-website"   % zioSbtVersion)
+addSbtPlugin("dev.zio" % "zio-sbt-ci"        % zioSbtVersion)
 
-addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.1")
 addSbtPlugin("io.spray"       % "sbt-revolver"        % "0.10.0")
-addSbtPlugin("ch.epfl.scala"  % "sbt-scalafix"        % "0.11.1")
+addSbtPlugin("ch.epfl.scala"  % "sbt-scalafix"        % "0.14.0")
 
 resolvers ++= Resolver.sonatypeOssRepos("public")
diff --git a/zio-quickstart-kafka/src/main/scala/dev/zio/quickstart/JsonStreamingKafkaApp.scala b/zio-quickstart-kafka/src/main/scala/dev/zio/quickstart/JsonStreamingKafkaApp.scala
@@ -61,7 +61,9 @@ object JsonStreamingKafkaApp extends ZIOAppDefault {
       ZIO.scoped {
         for {
           consumer <- Consumer.make(
-            ConsumerSettings(BOOSTRAP_SERVERS).withGroupId("streaming-kafka-app")
+            ConsumerSettings(BOOSTRAP_SERVERS).withGroupId(
+              "streaming-kafka-app"
+            )
           )
           _ <- consumer
             .plainStream(

diff --git a/zio-quickstart-kafka/src/main/scala/dev/zio/quickstart/SimpleKafkaApp.scala b/zio-quickstart-kafka/src/main/scala/dev/zio/quickstart/SimpleKafkaApp.scala
@@ -22,7 +22,9 @@ object SimpleKafkaApp extends ZIOAppDefault {
           keyDeserializer = Serde.long,
           valueDeserializer = Serde.string
         ) { record =>
-          Console.printLine(s"Consumed ${record.key()}, ${record.value()}").orDie
+          Console
+            .printLine(s"Consumed ${record.key()}, ${record.value()}")
+            .orDie
         }
         .fork