Merge pull request #71 from scala-steward/update/scala3-library-3.1.0

Update scala3-library to 3.1.0
trace4cats · Nov 20, 2021 · 4ad2a20 · 4ad2a20
2 parents 99adaaf + 60ab067
commit 4ad2a20
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 29 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -24,12 +24,12 @@ pull_request_rules:
           - body~=labels:.*semver-patch
           - "#approved-reviews-by>=1"
       - and:
-          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.8\)
-          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.11\)
-          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.8\)
-          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.11\)
-          - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adopt@1\.8\)
-          - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adopt@1\.11\)
+          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adoptium@8\)
+          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adoptium@17\)
+          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adoptium@8\)
+          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adoptium@17\)
+          - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adoptium@8\)
+          - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adoptium@17\)
     actions:
       merge:
         method: rebase
@@ -44,12 +44,12 @@ pull_request_rules:
           - label=skip-release
           - label=ready-to-merge
       - and:
-          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.8\)
-          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.11\)
-          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.8\)
-          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.11\)
-          - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adopt@1\.8\)
-          - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adopt@1\.11\)
+          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adoptium@8\)
+          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adoptium@17\)
+          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adoptium@8\)
+          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adoptium@17\)
+          - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adoptium@8\)
+          - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adoptium@17\)
     actions:
       merge:
         method: rebase

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,4 +1,4 @@
-name-template: 'Trace4Cats OpenTelemetry $NEXT_MINOR_VERSION'
+name-template: 'v$NEXT_MINOR_VERSION'
 tag-template: 'v$NEXT_MINOR_VERSION'
 categories:
   - title: '🚀 Features'

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,15 +16,16 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  JABBA_INDEX: 'https://github.com/typelevel/jdk-index/raw/main/index.json'
 
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.7, 2.12.15, 3.0.2]
-        java: [adopt@1.8, [email protected]]
+        scala: [2.13.7, 2.12.15, 3.1.0]
+        java: [adoptium@8, adoptium@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -81,7 +82,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.7]
-        java: [adopt@1.8]
+        java: [adoptium@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -126,12 +127,12 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.0.2)
+      - name: Download target directories (3.1.0)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-3.0.2-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.1.0-${{ matrix.java }}
 
-      - name: Inflate target directories (3.0.2)
+      - name: Inflate target directories (3.1.0)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/build.sbt b/build.sbt
@@ -7,14 +7,7 @@ lazy val commonSettings = Seq(
       case _ => Seq.empty
     }
   },
-  scalacOptions := {
-    val opts = scalacOptions.value
-    val wconf = "-Wconf:any:wv"
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, _)) => opts :+ wconf
-      case _ => opts
-    }
-  },
+  scalacOptions += "-Wconf:any:wv",
   Test / fork := true,
   resolvers += Resolver.sonatypeRepo("releases"),
 )

diff --git a/ci-release.sbt b/ci-release.sbt
@@ -5,7 +5,8 @@ ThisBuild / crossScalaVersions := Seq(
   Dependencies.Versions.scala3
 )
 ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
-ThisBuild / githubWorkflowJavaVersions := Seq("[email protected]", "[email protected]")
+ThisBuild / githubWorkflowEnv += ("JABBA_INDEX" -> "https://github.com/typelevel/jdk-index/raw/main/index.json")
+ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@8", "adoptium@17")
 
 ThisBuild / githubWorkflowBuildPreamble += WorkflowStep.Run(
   commands = List("docker-compose up -d"),

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -4,7 +4,7 @@ object Dependencies {
   object Versions {
     val scala212 = "2.12.15"
     val scala213 = "2.13.7"
-    val scala3 = "3.0.2"
+    val scala3 = "3.1.0"
 
     val trace4cats = "0.12.0"
     val trace4catsExporterHttp = "0.12.0"