Merge pull request #271 from circe/upgradathon

Upgradathon

.github/workflows/ci.yml

@@ -28,15 +28,21 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12, 2.13]
+        scala: [2.12, 2.13, 3]
         java: [temurin@11, temurin@17]
         project: [rootJVM]
         exclude:
           - scala: 2.12
             java: temurin@17
+          - scala: 3
+            java: temurin@17
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
+      - name: Install sbt
+        if: contains(runner.os, 'macos')
+        run: brew install sbt
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -115,6 +121,10 @@ jobs:
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install sbt
+        if: contains(runner.os, 'macos')
+        run: brew install sbt
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -166,6 +176,16 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (3, rootJVM)
+        uses: actions/download-artifact@v4
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
+
+      - name: Inflate target directories (3, rootJVM)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Import signing key
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
         env:
@@ -199,6 +219,10 @@ jobs:
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install sbt
+        if: contains(runner.os, 'macos')
+        run: brew install sbt
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -233,5 +257,5 @@ jobs:
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
         with:
-          modules-ignore: rootjs_2.12 rootjs_2.13 rootjvm_2.12 rootjvm_2.13 rootnative_2.12 rootnative_2.13 example1_2.12 example1_2.13
+          modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 example1_2.12 example1_2.13 example1_3
           configs-ignore: test scala-tool scala-doc-tool test-internal

.gitignore

@@ -10,3 +10,7 @@ target/
 .classpath
 tmp/
 .bsp/
+.metals/
+.vscode/
+.jvm/
+*.semanticdb

.scalafmt.conf

@@ -15,3 +15,9 @@ rewrite.rules = [
   AsciiSortImports,
   PreferCurlyFors
 ]
+
+fileOverride {
+  "glob:**/scala-3/**/*.scala" {
+    runner.dialect = scala3
+  }
+}

build.sbt

@@ -1,17 +1,18 @@
-ThisBuild / tlBaseVersion := "0.4"
-ThisBuild / description := "Yet another Typesafe Config decoder"
+ThisBuild / tlBaseVersion := "0.5"
+ThisBuild / description := "Circe Golden Testing"
 ThisBuild / circeRootOfCodeCoverage := None
 ThisBuild / startYear := Some(2016)
 
 val scala212 = "2.12.19"
-val scala213 = "2.13.11"
+val scala213 = "2.13.14"
+val scala3 = "3.3.3"
 ThisBuild / scalaVersion := scala213
-ThisBuild / crossScalaVersions := Seq(scala212, scala213)
+ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3)
 
-val circeVersion = "0.14.6"
-val scalacheckVersion = "1.17.0"
-val disciplineScalatestVersion = "2.2.0"
-val scalacheckScalaTestVersion = "3.2.18.0"
+val circeVersion = "0.14.9"
+val scalacheckVersion = "1.18.0"
+val disciplineScalatestVersion = "2.3.0"
+val scalacheckScalaTestVersion = "3.2.19.0"
 
 val root = tlCrossRootProject.aggregate(golden, example1)
 
@@ -21,23 +22,31 @@ lazy val golden = crossProject(JVMPlatform)
   .settings(
     moduleName := "circe-golden",
     libraryDependencies ++= Seq(
-      "org.scalatestplus" %%% "scalacheck-1-17" % scalacheckScalaTestVersion,
+      "org.scalatestplus" %%% "scalacheck-1-18" % scalacheckScalaTestVersion,
       "io.circe" %%% "circe-core" % circeVersion,
       "io.circe" %%% "circe-parser" % circeVersion,
       "io.circe" %%% "circe-testing" % circeVersion,
       "io.circe" %%% "circe-generic" % circeVersion % Test,
       "org.scalacheck" %% "scalacheck" % scalacheckVersion,
-      "org.typelevel" %%% "discipline-scalatest" % disciplineScalatestVersion % Test,
-      scalaOrganization.value % "scala-reflect" % scalaVersion.value % Provided
-    )
+      "org.typelevel" %%% "discipline-scalatest" % disciplineScalatestVersion % Test
+    ),
+    libraryDependencies ++= {
+      if (tlIsScala3.value) Nil
+      else
+        Seq(
+          scalaOrganization.value % "scala-reflect" % scalaVersion.value % Provided
+        )
+    },
+    Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat,
+    tlVersionIntroduced := List("2.13", "2.12", "3").map(_ -> "0.5.0").toMap
   )
 
 lazy val example1 = crossProject(JVMPlatform)
   .crossType(CrossType.Pure)
   .in(file("examples/example-1"))
   .settings(
     libraryDependencies ++= Seq(
-      "io.circe" %% "circe-core" % circeVersion,
+      "io.circe" %%% "circe-core" % circeVersion,
       "org.scalacheck" %% "scalacheck" % scalacheckVersion,
       "org.typelevel" %%% "discipline-scalatest" % disciplineScalatestVersion % Test
     )
@@ -46,16 +55,16 @@ lazy val example1 = crossProject(JVMPlatform)
   .dependsOn(golden % Test)
 
 ThisBuild / developers := List(
-  Developer(
+  tlGitHubDev(
     "travisbrown",
-    "Travis Brown",
-    "[email protected]",
-    url("https://twitter.com/travisbrown")
+    "Travis Brown"
   ),
-  Developer(
+  tlGitHubDev(
     "zarthross",
-    "Darren Gibson",
-    "[email protected]",
-    url("https://twitter.com/zarthross")
+    "Darren Gibson"
+  ),
+  tlGitHubDev(
+    "hamnis",
+    "Erlend Hamnaberg"
   )
 )