Add Scala 3 support

Dwolla · Nov 8, 2023 · d9f1d05 · d9f1d05
1 parent 9e73ff5
commit d9f1d05
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13, 2.12]
+        scala: [3, 2.13, 2.12]
         java: [temurin@17]
         project: [rootJVM]
     runs-on: ${{ matrix.os }}
@@ -109,6 +109,16 @@ jobs:
         if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
         run: sbt +update
 
+      - name: Download target directories (3, rootJVM)
+        uses: actions/download-artifact@v3
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
+
+      - name: Inflate target directories (3, rootJVM)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Download target directories (2.13, rootJVM)
         uses: actions/download-artifact@v3
         with:
@@ -183,5 +193,5 @@ jobs:
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
         with:
-          modules-ignore: rootjs_2.13 rootjs_2.12 rootjvm_2.13 rootjvm_2.12 rootnative_2.13 rootnative_2.12
+          modules-ignore: rootjs_3 rootjs_2.13 rootjs_2.12 rootjvm_3 rootjvm_2.13 rootjvm_2.12 rootnative_3 rootnative_2.13 rootnative_2.12
           configs-ignore: test scala-tool scala-doc-tool test-internal
diff --git a/.mergify.yml b/.mergify.yml
@@ -12,6 +12,7 @@ pull_request_rules:
   - or:
     - body~=labels:.*early-semver-patch
     - body~=labels:.*early-semver-minor
+  - status-success=Build and Test (ubuntu-latest, 3, temurin@17, rootJVM)
   - status-success=Build and Test (ubuntu-latest, 2.13, temurin@17, rootJVM)
   - status-success=Build and Test (ubuntu-latest, 2.12, temurin@17, rootJVM)
   actions:

diff --git a/build.sbt b/build.sbt
@@ -11,13 +11,14 @@ ThisBuild / developers := List(
 
 ThisBuild / tlSonatypeUseLegacyHost := true
 
-val Scala213 = "2.13.12"
-ThisBuild / crossScalaVersions := Seq(Scala213, "2.12.18")
-ThisBuild / scalaVersion := Scala213 // the default Scala
+val Scala3 = "3.3.1"
+ThisBuild / crossScalaVersions := Seq(Scala3, "2.13.12", "2.12.18")
+ThisBuild / scalaVersion := Scala3 // the default Scala
 ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"))
-ThisBuild / githubWorkflowScalaVersions := Seq("2.13", "2.12")
+ThisBuild / githubWorkflowScalaVersions := Seq("3", "2.13", "2.12")
 ThisBuild / tlJdkRelease := Some(8)
 ThisBuild / tlCiReleaseBranches := Seq("main")
+ThisBuild / tlVersionIntroduced := Map("3" -> "0.2.2")
 ThisBuild / mergifyStewardConfig ~= { _.map(_.copy(
   author = "dwolla-oss-scala-steward[bot]",
   mergeMinors = true,

diff --git a/core/src/main/scala/com/dwolla/tracing/OpenTelemetryAtDwolla.scala b/core/src/main/scala/com/dwolla/tracing/OpenTelemetryAtDwolla.scala
@@ -1,9 +1,9 @@
 package com.dwolla.tracing
 
 import cats.effect.std.Env
-import cats.effect.syntax.all._
-import cats.effect.{Trace => _, _}
-import cats.syntax.all._
+import cats.effect.syntax.all.*
+import cats.effect.{Trace as _, *}
+import cats.syntax.all.*
 import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator
 import io.opentelemetry.context.propagation.{ContextPropagators, TextMapPropagator}
@@ -12,11 +12,11 @@ import io.opentelemetry.contrib.awsxray.AwsXrayIdGenerator
 import io.opentelemetry.contrib.awsxray.propagator.AwsXrayPropagator
 import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter
 import io.opentelemetry.extension.trace.propagation.B3Propagator
-import io.opentelemetry.sdk.resources.{Resource => OTResource}
+import io.opentelemetry.sdk.resources.Resource as OTResource
 import io.opentelemetry.sdk.trace.SdkTracerProvider
 import io.opentelemetry.sdk.trace.`export`.BatchSpanProcessor
 import io.opentelemetry.semconv.ResourceAttributes
-import natchez._
+import natchez.*
 import natchez.opentelemetry.OpenTelemetry
 
 object OpenTelemetryAtDwolla {

diff --git a/core/src/main/scala/com/dwolla/tracing/instances/package.scala b/core/src/main/scala/com/dwolla/tracing/instances/package.scala
@@ -1,8 +1,8 @@
 package com.dwolla.tracing
 
-import cats._
-import cats.effect.{Trace => _, _}
-import cats.mtl._
+import cats.*
+import cats.effect.{Trace as _, *}
+import cats.mtl.*
 
 package object instances extends LocalInstances