Group upgrade of bunch of dependencies together (#546)

* Group upgrade of bunch of dependencies together * Do not forget Java 11 for testing
alonsodomin · Dec 30, 2023 · 7103f34 · 7103f34
1 parent 5c58f00
commit 7103f34
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 36 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.10, 2.12.17, 3.3.0]
+        scala: [2.13.12, 2.12.17, 3.3.1]
         java:
           - adopt-hotspot@8
           - adopt-hotspot@11
@@ -35,9 +35,9 @@ jobs:
           - platform: native
             java: adopt-hotspot@8
           - platform: js
-            java: temurin@17
+            java: adopt-hotspot@11
           - platform: native
-            java: temurin@17
+            java: adopt-hotspot@11
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -72,8 +72,8 @@ jobs:
       - name: Check that workflows are up to date
         run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
 
-      - name: Check source code formatting
-        run: sbt '++ ${{ matrix.scala }}' checkfmt
+      - name: Lint source code
+        run: sbt '++ ${{ matrix.scala }}' lint
 
       - name: Validate JavaScript
         if: matrix.platform == 'js'

diff --git a/build.sbt b/build.sbt
@@ -20,7 +20,7 @@ inThisBuild(
     organizationName                                     := "Antonio Alonso Dominguez",
     description                                          := "CRON expression parser for Scala",
     startYear                                            := Some(2017),
-    crossScalaVersions                                   := Seq("2.13.10", "2.12.17", "3.3.0"),
+    crossScalaVersions                                   := Seq("2.13.12", "2.12.17", "3.3.1"),
     homepage := Some(url("https://github.com/alonsodomin/cron4s")),
     licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt")),
     scmInfo := Some(
@@ -462,33 +462,30 @@ lazy val doobie = (project in file("modules/doobie"))
 // Utility command aliases
 // =================================================================================
 
-addCommandAlias("fmt", "scalafmtSbt;scalafmt;Test/scalafmt")
-addCommandAlias("checkfmt", "scalafmtSbtCheck;scalafmtCheck;Test/scalafmtCheck")
+def addCompoundCommandAlias(alias: String)(subcommands: String*) =
+  addCommandAlias(alias, subcommands.mkString(";"))
+
+addCompoundCommandAlias("fmt")("scalafmtSbt", "scalafmt", "Test/scalafmt")
+addCompoundCommandAlias("lint")("scalafmtSbtCheck", "scalafmtCheck", "Test/scalafmtCheck")
 addCommandAlias("testJVM", "cron4sJVM/test")
 addCommandAlias("testJS", "cron4sJS/test")
 addCommandAlias("testNative", "cron4sNative/test")
 addCommandAlias("binCompatCheck", "cron4sJVM/mimaReportBinaryIssues")
-addCommandAlias(
-  "validateJVM",
-  Seq(
-    "coverage",
-    "testJVM",
-    "coverageReport",
-    "coverageAggregate"
-  ).mkString(";")
+addCompoundCommandAlias("validateJVM")(
+  "coverage",
+  "testJVM",
+  "coverageReport",
+  "coverageAggregate"
 )
 addCommandAlias("validateJS", "testJS")
 addCommandAlias("validateNative", "testNative")
 addCommandAlias("validateBench", "bench/compile")
-addCommandAlias(
-  "validate",
-  Seq(
-    "checkfmt",
-    "validateJS",
-    "validateJVM",
-    "validateNative",
-    "validateBench",
-    "binCompatCheck"
-  ).mkString(";")
+addCompoundCommandAlias("validate")(
+  "lint",
+  "validateJS",
+  "validateJVM",
+  "validateNative",
+  "validateBench",
+  "binCompatCheck"
 )
-addCommandAlias("rebuild", "clean;validate")
+addCompoundCommandAlias("rebuild")("clean", "validate")
diff --git a/modules/core/shared/src/main/scala/cron4s/datetime/DateTimeNode.scala b/modules/core/shared/src/main/scala/cron4s/datetime/DateTimeNode.scala
@@ -87,6 +87,6 @@ object DateTimeNode {
       E0: FieldExpr[E, F]
   ): DateTimeNode[E, F] =
     new DateTimeNode[E, F] {
-      implicit val E = E0
+      implicit val E: FieldExpr[E, F] = E0
     }
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -12,7 +12,7 @@ object Dependencies {
     val atto = "0.9.5"
 
     object cats {
-      val main      = "2.9.0"
+      val main      = "2.10.0"
       val scalatest = "2.1.5"
     }
 

diff --git a/project/GithubWorkflow.scala b/project/GithubWorkflow.scala
@@ -1,7 +1,7 @@
 import sbtghactions.GenerativePlugin.autoImport._
 
 object GithubWorkflow {
-  val DefaultJVM = JavaSpec(JavaSpec.Distribution.Adopt, "11")
+  val DefaultJVM = JavaSpec(JavaSpec.Distribution.Temurin, "17")
 
   val IsJvm    = "matrix.platform == 'jvm'"
   val IsJs     = "matrix.platform == 'js'"
@@ -11,8 +11,8 @@ object GithubWorkflow {
     Seq(
       githubWorkflowJavaVersions := Seq(
         JavaSpec(JavaSpec.Distribution.Adopt, "8"),
-        DefaultJVM,
-        JavaSpec(JavaSpec.Distribution.Temurin, "17")
+        JavaSpec(JavaSpec.Distribution.Adopt, "11"),
+        DefaultJVM
       ),
       githubWorkflowTargetBranches := Seq("master"),
       githubWorkflowTargetTags ++= Seq("v*"),
@@ -43,8 +43,8 @@ object GithubWorkflow {
       githubWorkflowArtifactUpload := false,
       githubWorkflowBuild := Seq(
         WorkflowStep.Sbt(
-          List("checkfmt"),
-          name = Some("Check source code formatting")
+          List("lint"),
+          name = Some("Lint source code")
         ),
         WorkflowStep
           .Sbt(List("validateJS"), name = Some("Validate JavaScript"), cond = Some(IsJs)),

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,9 +4,9 @@ addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.14.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.2")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.16")
-addSbtPlugin("org.scoverage"      % "sbt-scoverage"                 % "2.0.7")
+addSbtPlugin("org.scoverage"      % "sbt-scoverage"                 % "2.0.9")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"                       % "0.4.6")
-addSbtPlugin("com.47deg"          % "sbt-microsites"                % "1.4.3")
+addSbtPlugin("com.47deg"          % "sbt-microsites"                % "1.4.4")
 addSbtPlugin("com.github.sbt"     % "sbt-unidoc"                    % "0.5.0")
 addSbtPlugin("com.typesafe"       % "sbt-mima-plugin"               % "1.1.3")
 addSbtPlugin("de.heikoseeberger"  % "sbt-header"                    % "5.9.0")