From 7822d8ec4dcc7434ed9a1705fcf9895d6f276314 Mon Sep 17 00:00:00 2001 From: sullis Date: Mon, 29 Jul 2024 12:42:21 -0700 Subject: [PATCH] Scala 3.x --- .github/workflows/ci.yml | 4 ++-- build.sbt | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f8f488..0ee9488 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,8 +13,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '8', '17', '21' ] - scala: [ '2.13.14', '3.4.2' ] + java: [ '21' ] + scala: [ '3.4.2' ] steps: - uses: actions/checkout@v4 - name: Set up JDK diff --git a/build.sbt b/build.sbt index febfe0b..c5deadb 100644 --- a/build.sbt +++ b/build.sbt @@ -6,9 +6,9 @@ name := "scala-hello-world-app" organization := "io.github.sullis" -scalaVersion := "2.13.14" +scalaVersion := "3.4.2" -crossScalaVersions := Seq(scalaVersion.value, "3.4.2") +crossScalaVersions := Seq(scalaVersion.value) scalacOptions += "-target:jvm-1.8" @@ -26,12 +26,11 @@ javacOptions ++= Seq("-source", "1.8", "-target", "1.8") val logbackVersion = "1.5.6" libraryDependencies ++= Seq( - "org.gfccollective" %% "gfc-logging" % "1.0.0", + "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5", "ch.qos.logback" % "logback-classic" % logbackVersion, "ch.qos.logback" % "logback-core" % logbackVersion, "com.google.guava" % "guava" % "32.1.2-jre", - "org.mockito" % "mockito-core" % "4.8.0" % Test, - "org.mockito" %% "mockito-scala-scalatest" % "1.16.37" % Test, + "org.mockito" %% "mockito-scala-scalatest" % "1.17.37" % Test, "org.scalatest" %% "scalatest" % "3.2.19" % Test )