Add Scala 3 and drop 2.12

nafg · Feb 6, 2022 · 8e916cb · 8e916cb
1 parent 2b08763
commit 8e916cb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 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.12.15, 2.13.8]
+        scala: [2.13.8, 3.1.1]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.8]
+        scala: [3.1.1]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -101,22 +101,22 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.12.15)
+      - name: Download target directories (2.13.8)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12.15)
+      - name: Inflate target directories (2.13.8)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.8)
+      - name: Download target directories (3.1.1)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.1.1-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.8)
+      - name: Inflate target directories (3.1.1)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/.mergify.yml b/.mergify.yml
@@ -6,8 +6,8 @@ pull_request_rules:
   - name: Automatically merge successful scala-steward PRs
     conditions:
       - author=scala-steward
-      - check-success=Build and Test (ubuntu-latest, 2.12.15, temurin@11)
       - check-success=Build and Test (ubuntu-latest, 2.13.8, temurin@11)
+      - check-success=Build and Test (ubuntu-latest, 3.1.1, temurin@11)
     actions:
         queue:
             name: default
diff --git a/appender/src/main/scala/io/github/nafg/cloudlogging/appender/CloudJsonLoggingAppender.scala b/appender/src/main/scala/io/github/nafg/cloudlogging/appender/CloudJsonLoggingAppender.scala
@@ -4,7 +4,7 @@ import java.io.{PrintWriter, StringWriter}
 import java.util
 import java.util.Collections
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.mutable
 
 import io.github.nafg.cloudlogging.marker.JsonMarker

diff --git a/...r/src/test/scala/io/github/nafg/cloudlogging/appender/CloudJsonLoggingAppenderTests.scala b/...r/src/test/scala/io/github/nafg/cloudlogging/appender/CloudJsonLoggingAppenderTests.scala
@@ -2,16 +2,17 @@ package io.github.nafg.cloudlogging.appender
 
 import java.util
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
+
+import io.github.nafg.cloudlogging.marker.JsonMarker
 
 import ch.qos.logback.classic.spi._
 import ch.qos.logback.classic.{Level, LoggerContext}
 import com.google.cloud.logging.{Payload, Severity}
 import io.circe.Json
-import io.github.nafg.cloudlogging.marker.JsonMarker
 import org.scalatest.Inside._
-import org.slf4j.Marker
 import org.scalatest.funsuite.AnyFunSuite
+import org.slf4j.Marker
 
 
 class CloudJsonLoggingAppenderTests extends AnyFunSuite {

diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8")
+ThisBuild / crossScalaVersions := Seq("2.13.8", "3.1.1")
 ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.last
 
 ThisBuild / organization := "io.github.nafg.cloudlogging"

diff --git a/marker/src/main/scala/io/github/nafg/cloudlogging/marker/JsonMarker.scala b/marker/src/main/scala/io/github/nafg/cloudlogging/marker/JsonMarker.scala
@@ -1,6 +1,6 @@
 package io.github.nafg.cloudlogging.marker
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import io.circe.Json
 import org.slf4j.Marker