test with latest scala releases (#134)

apache · Oct 31, 2023 · 505215d · 505215d
1 parent f0f9853
commit 505215d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -13,12 +13,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { javaVersion: 8,  scalaVersion: 2.12.18, pekkoVersion: 'default' }
-          - { javaVersion: 8,  scalaVersion: 2.12.18, pekkoVersion: 'main' }
-          - { javaVersion: 8,  scalaVersion: 2.13.11, pekkoVersion: 'default' }
-          - { javaVersion: 8,  scalaVersion: 2.13.11, pekkoVersion: 'main' }
-          - { javaVersion: 8,  scalaVersion: 3.3.0,   pekkoVersion: 'default' }
-          - { javaVersion: 8,  scalaVersion: 3.3.0,   pekkoVersion: 'main' }
+          - { javaVersion: 8,  scalaVersion: 2.12, pekkoVersion: 'default' }
+          - { javaVersion: 8,  scalaVersion: 2.12, pekkoVersion: 'main' }
+          - { javaVersion: 8,  scalaVersion: 2.13, pekkoVersion: 'default' }
+          - { javaVersion: 8,  scalaVersion: 2.13, pekkoVersion: 'main' }
+          - { javaVersion: 8,  scalaVersion: 3.3,   pekkoVersion: 'default' }
+          - { javaVersion: 8,  scalaVersion: 3.3,   pekkoVersion: 'main' }
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -17,12 +17,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { javaVersion: 8,  scalaVersion: 2.12.18, sbtOpts: '' }
-          - { javaVersion: 11, scalaVersion: 2.12.18, sbtOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
-          - { javaVersion: 8,  scalaVersion: 2.13.11, sbtOpts: '' }
-          - { javaVersion: 11, scalaVersion: 2.13.11, sbtOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
-          - { javaVersion: 8,  scalaVersion: 3.3.0,   sbtOpts: '' }
-          - { javaVersion: 11, scalaVersion: 3.3.0,   sbtOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { javaVersion: 8,  scalaVersion: 2.12, sbtOpts: '' }
+          - { javaVersion: 11, scalaVersion: 2.12, sbtOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { javaVersion: 8,  scalaVersion: 2.13, sbtOpts: '' }
+          - { javaVersion: 11, scalaVersion: 2.13, sbtOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { javaVersion: 8,  scalaVersion: 3.3,   sbtOpts: '' }
+          - { javaVersion: 11, scalaVersion: 3.3,   sbtOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -12,8 +12,8 @@ import sbt._
 object Dependencies {
   // keep in sync with .github/workflows/unit-tests.yml
   val scala212Version = "2.12.18"
-  val scala213Version = "2.13.11"
-  val scala3Version = "3.3.0"
+  val scala213Version = "2.13.12"
+  val scala3Version = "3.3.1"
   val crossScalaVersions = Seq(scala212Version, scala213Version, scala3Version)
 
   val pekkoVersion = PekkoDependency.pekkoVersion
@@ -26,6 +26,7 @@ object Dependencies {
   val jacksonVersion = "2.14.3"
 
   val log4j2Version = "2.17.2"
+  val logbackVersion = "1.2.11"
 
   // often called-in transitively with insecure versions of databind / core
   private val jacksonDatabind = Seq(
@@ -45,7 +46,7 @@ object Dependencies {
     "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
     "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
     "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion % Test,
-    "ch.qos.logback" % "logback-classic" % "1.2.11" % Test) ++ jacksonDatabind ++ jacksonDatatype // consul depends on insecure version of jackson
+    "ch.qos.logback" % "logback-classic" % logbackVersion % Test) ++ jacksonDatabind ++ jacksonDatatype // consul depends on insecure version of jackson
 
   val discoveryKubernetesApi = Seq(
     "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
@@ -99,7 +100,7 @@ object Dependencies {
     "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
     "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,
     "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
-    "ch.qos.logback" % "logback-classic" % "1.2.11",
+    "ch.qos.logback" % "logback-classic" % logbackVersion,
     "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion,
     "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
     "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
@@ -161,7 +162,7 @@ object Dependencies {
     "org.apache.pekko" %% "pekko-discovery" % pekkoVersion,
     "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
     "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,
-    "ch.qos.logback" % "logback-classic" % "1.2.11",
+    "ch.qos.logback" % "logback-classic" % logbackVersion,
     "org.scalatest" %% "scalatest" % scalaTestVersion % Test)
 
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -19,10 +19,10 @@ addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
 addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.31")
 addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10")
-addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.10")
+addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.11")
 addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.6.1")
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.0")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
 
 // We have to deliberately use older versions of sbt-paradox because current Pekko sbt build
 // only loads on JDK 1.8 so we need to bring in older versions of parboiled which support JDK 1.8