Merge branch 'main' into update/scala-library-2.13.13

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.13]
+        scala: [2.12]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60

build.sbt

@@ -1,25 +1,25 @@
 lazy val root = (project in file(".")).settings(
   name                                            := "base.g8",
-  scalaVersion                                    := "2.13.13",
-  Test / test                                     := { val _ = (Test / g8Test).toTask("").value },
   scriptedLaunchOpts ++= List(
     "-Xms1024m",
     "-Xmx1024m",
     "-XX:ReservedCodeCacheSize=128m",
     "-Xss2m",
     "-Dfile.encoding=UTF-8"
   ),
-  ThisBuild / githubWorkflowPublishTargetBranches := Seq(),
-  ThisBuild / githubWorkflowScalaVersions         := Seq("2.13.13"),
+  ThisBuild / githubWorkflowPublishTargetBranches := Nil,
+  ThisBuild / githubWorkflowScalaVersions         := List("2.12"),
   ThisBuild / githubWorkflowBuild                 :=
-    Seq(WorkflowStep.Sbt(List("g8Test"), name = Some("Testing template"))),
+    List(WorkflowStep.Sbt(List("g8Test"), name = Some("Testing template"))),
   // These are here for scala-steward
   libraryDependencies ++= Seq(
     "org.typelevel"       %% "cats-core"         % "2.10.0",
     "org.typelevel"       %% "cats-effect"       % "3.5.4",
     "co.fs2"              %% "fs2-io"            % "3.10.2",
     "com.monovore"        %% "decline-effect"    % "2.4.1",
-    "com.disneystreaming" %% "weaver-cats"       % "0.8.3",
-    "com.disneystreaming" %% "weaver-scalacheck" % "0.8.3"
+    "com.disneystreaming" %% "weaver-cats"       % "0.8.4",
+    "com.disneystreaming" %% "weaver-scalacheck" % "0.8.4",
+    "org.scala-lang"       % "scala-library"     % "2.13.13",
+    "org.scala-lang"       % "scala3-library_3"  % "3.3.3"
   )
 )

src/main/g8/project/Dependencies.scala

@@ -10,8 +10,9 @@ object Dependencies {
     "com.monovore"  %% "decline-effect" % "2.4.1"
   )
 
-  val testDependencies: Seq[ModuleID] =
-    Seq("com.disneystreaming" %% "weaver-cats" % "0.8.3", "com.disneystreaming" %% "weaver-scalacheck" % "0.8.3")
-      .map(_ % Test)
+  val testDependencies: Seq[ModuleID] = Seq(
+    "com.disneystreaming" %% "weaver-cats"       % "0.8.4",
+    "com.disneystreaming" %% "weaver-scalacheck" % "0.8.3"
+  ).map(_ % Test)
 
 }