Merge branch '0.23' into 0.23-scala3-merge

http4s · Nov 11, 2024 · e2400fc · e2400fc
2 parents 6da2dca + effcf4b
commit e2400fc
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 50 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,13 +28,12 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         scala: [2.12]
-        java: [temurin@11, temurin@17, graalvm@17]
+        java: [temurin@11, temurin@17]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
@@ -67,29 +66,8 @@ jobs:
         if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
         run: sbt +update
 
-      - name: Setup Java (graalvm@17)
-        id: setup-java-graalvm-17
-        if: matrix.java == 'graalvm@17'
-        uses: graalvm/setup-graalvm@v1
-        with:
-          distribution: graalvm
-          java-version: 17
-          cache: sbt
-
-      - name: sbt update
-        if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
-        run: sbt +update
-
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
 
       - name: Test generated template
         run: sbt '++ ${{ matrix.scala }}' g8Test
-
-      - name: Build native assembly
-        if: startsWith(matrix.java, 'graalvm')
-        run: |
-          cd target/sbt-test/http4s-g8/scripted
-          sbt assembly
-          gu install native-image
-          cat native-image-readme.md | grep 'native-image  -H*' | sh
diff --git a/build.sbt b/build.sbt
@@ -4,16 +4,6 @@
 
 ThisBuild / githubWorkflowBuild := Seq(
   WorkflowStep.Sbt(List("g8Test"), name = Some("Test generated template")),
-  WorkflowStep.Run(
-    List(
-      "cd target/sbt-test/http4s-g8/scripted",
-      "sbt assembly",
-      "gu install native-image",
-      "cat native-image-readme.md | grep 'native-image  -H*' | sh"
-    ),
-    cond = Some("startsWith(matrix.java, 'graalvm')"),
-    name = Some("Build native assembly")
-  )
 )
 
 val PrimaryOS = "ubuntu-latest"
@@ -22,14 +12,13 @@ ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, MacOS)
 ThisBuild / githubWorkflowJavaVersions := Seq(
   JavaSpec.temurin("11"),
   JavaSpec.temurin("17"),
-  JavaSpec.graalvm("17")
 )
 ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty
 
-val Http4sVersion = "0.23.27"
-val CirceVersion = "0.14.9"
-val MunitVersion = "1.0.0"
-val LogbackVersion = "1.5.6"
+val Http4sVersion = "0.23.29"
+val CirceVersion = "0.14.10"
+val MunitVersion = "1.0.2"
+val LogbackVersion = "1.5.12"
 val MunitCatsEffectVersion = "2.0.0"
 
 lazy val root = project
@@ -46,9 +35,9 @@ lazy val root = project
       "org.typelevel"   %% "munit-cats-effect"   % MunitCatsEffectVersion % Test,
       "ch.qos.logback"  %  "logback-classic"     % LogbackVersion         % Runtime,
     ),
-    addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1"),
+    addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2"),
     addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0"),
-    addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0"),
+    addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0"),
     Test / test := {
       val _ = (Test / g8Test).toTask("").value
     },

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.5
diff --git a/project/plugin.sbt b/project/plugin.sbt
@@ -1,2 +1,2 @@
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.2")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.4")
diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt
@@ -1,7 +1,7 @@
-val Http4sVersion = "0.23.27"
-val CirceVersion = "0.14.9"
-val MunitVersion = "1.0.0"
-val LogbackVersion = "1.5.6"
+val Http4sVersion = "0.23.29"
+val CirceVersion = "0.14.10"
+val MunitVersion = "1.0.2"
+val LogbackVersion = "1.5.12"
 val MunitCatsEffectVersion = "2.0.0"
 
 lazy val root = (project in file("."))

diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.5
diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1")
+addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")