Merge branch 'main' into update/munit-cats-effect-3-2.0.0

Author: valencik

.github/workflows/ci.yml

@@ -29,7 +29,10 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         scala: [2.12]
-        java: [temurin@8, temurin@17]
+        java: [temurin@8, temurin@21]
+        exclude:
+          - os: macos-latest
+            java: temurin@8
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
@@ -55,17 +58,17 @@ jobs:
         if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
         run: sbt +update
 
-      - name: Setup Java (temurin@17)
-        id: setup-java-temurin-17
-        if: matrix.java == 'temurin@17'
+      - name: Setup Java (temurin@21)
+        id: setup-java-temurin-21
+        if: matrix.java == 'temurin@21'
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
+        if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
         run: sbt +update
 
       - name: Check that workflows are up to date

build.sbt

@@ -17,9 +17,14 @@ val MacOS = "macos-latest"
 ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, MacOS)
 
 val PrimaryJava = JavaSpec.temurin("8")
-val LTSJava = JavaSpec.temurin("17")
+val LTSJava = JavaSpec.temurin("21")
 ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava)
 
+// MacOS runners do not have temurin@8
+ThisBuild / githubWorkflowBuildMatrixExclusions := Seq(
+  MatrixExclude(Map("os" -> MacOS, "java" -> JavaSpec.temurin("8").render))
+)
+
 // This build is for this Giter8 template.
 // To test the template run `g8` or `g8Test` from the sbt session.
 // See http://www.foundweekends.org/giter8/testing.html#Using+the+Giter8Plugin for more details.
@@ -39,9 +44,9 @@ lazy val phantomDependencies = project
     libraryDependencies ++= Seq(
       "org.typelevel" %%% "cats-core" % "2.10.0",
       "org.typelevel" %%% "cats-effect" % "3.5.4",
-      "org.scalameta" %%% "munit" % "0.7.29" % Test,
+      "org.scalameta" %%% "munit" % "1.0.0" % Test,
       "org.typelevel" %%% "munit-cats-effect" % "2.0.0" % Test,
-      "org.scala-lang"  % "scala-library" % "2.13.13",
+      "org.scala-lang"  % "scala-library" % "2.13.14",
       "org.scala-lang"  % "scala3-library_3" % "3.3.3"
     ),
   )

flake.nix

@@ -10,7 +10,7 @@
       let
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [ typelevel-nix.overlay ];
+          overlays = [ typelevel-nix.overlays.default ];
         };
       in
       {

project/plugins.sbt

@@ -1,6 +1,6 @@
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.0")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.0")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.7.0")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.1")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.1")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.7.1")
 addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.16.2")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")

src/main/g8/.github/workflows/ci.yml

@@ -262,7 +262,7 @@ jobs:
 
       - name: Publish site
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
-        uses: peaceiris/actions-gh-pages@v3.9.3
+        uses: peaceiris/actions-gh-pages@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: site/target/docs/site

src/main/g8/build.sbt

@@ -30,7 +30,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
     libraryDependencies ++= Seq(
       "org.typelevel" %%% "cats-core" % "2.10.0",
       "org.typelevel" %%% "cats-effect" % "3.5.4",
-      "org.scalameta" %%% "munit" % "0.7.29" % Test,
+      "org.scalameta" %%% "munit" % "1.0.0" % Test,
       "org.typelevel" %%% "munit-cats-effect" % "2.0.0" % Test
     )
   )

src/main/g8/default.properties

@@ -4,8 +4,8 @@ organization = com.example
 package = $organization$.$name;format="norm,word"$
 organization_name = Example
 
-scala_version = 2.13.12
-other_scala_version = 3.3.1
+scala_version = 2.13.14
+other_scala_version = 3.3.3
 jdk_version = 8
 
 github_username = valencik

src/main/g8/flake.nix

@@ -10,7 +10,7 @@
       let
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [ typelevel-nix.overlay ];
+          overlays = [ typelevel-nix.overlays.default ];
         };
       in
       {

src/main/g8/project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.0")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.0")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.7.0")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.1")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.1")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.7.1")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")