Merge branch 'master' into update/model-1.5.2

pureconfig · Sep 10, 2022 · c2e6664 · c2e6664
2 parents b6fba0c + 50f1bc1
commit c2e6664
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,14 +9,14 @@ jobs:
       fail-fast: false
       matrix:
         jdk: [adopt@1.8]
-        scala: ['2.12', '2.13', '3.1']
+        scala: ['2.12', '2.13', '3']
         include:
           - scala: '2.12'
             scala-version: 2.12.16
           - scala: '2.13'
             scala-version: 2.13.8
-          - scala: '3.1'
-            scala-version: 3.1.3
+          - scala: '3'
+            scala-version: 3.2.0
 
     steps:
       - name: Checkout repository

diff --git a/build.sbt b/build.sbt
@@ -122,7 +122,7 @@ lazy val commonSettings = Seq(
 def crossVersionSharedSources(unmanagedSrcs: SettingKey[Seq[File]]) = {
   unmanagedSrcs ++= {
     val versionNumber = CrossVersion.partialVersion(scalaVersion.value)
-    val expectedVersions = Seq(scala212, scala213, scala31).flatMap(CrossVersion.partialVersion)
+    val expectedVersions = Seq(scala212, scala213, scala3).flatMap(CrossVersion.partialVersion)
     expectedVersions.flatMap { case v @ (major, minor) =>
       List(
         if (versionNumber.exists(_ <= v)) unmanagedSrcs.value.map { dir => new File(dir.getPath + s"-$major.$minor-") }

diff --git a/core/build.sbt b/core/build.sbt
@@ -2,6 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-core"
 
-crossScalaVersions := Seq(scala212, scala213, scala31)
+crossScalaVersions := Seq(scala212, scala213, scala3)
 
 libraryDependencies += Dependencies.typesafeConfig
diff --git a/modules/akka-http/build.sbt b/modules/akka-http/build.sbt
@@ -6,7 +6,7 @@ crossScalaVersions := Seq(scala212, scala213)
 
 libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-stream" % "2.6.20" % "provided",
-  "com.typesafe.akka" %% "akka-http" % "10.2.9"
+  "com.typesafe.akka" %% "akka-http" % "10.2.10"
 )
 mdocLibraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-stream" % "2.6.20"

diff --git a/modules/cats-effect/build.sbt b/modules/cats-effect/build.sbt
@@ -3,7 +3,7 @@ import Utilities._
 
 name := "pureconfig-cats-effect"
 
-crossScalaVersions := Seq(scala212, scala213, scala31)
+crossScalaVersions := Seq(scala212, scala213, scala3)
 
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-effect" % "3.3.14"

diff --git a/modules/cats-effect2/build.sbt b/modules/cats-effect2/build.sbt
@@ -3,7 +3,7 @@ import Utilities._
 
 name := "pureconfig-cats-effect2"
 
-crossScalaVersions := Seq(scala212, scala213, scala31)
+crossScalaVersions := Seq(scala212, scala213, scala3)
 
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-effect" % "2.5.5"

diff --git a/modules/http4s/build.sbt b/modules/http4s/build.sbt
@@ -2,7 +2,7 @@ import Dependencies.Version._
 
 name := "pureconfig-http4s"
 
-crossScalaVersions := Seq(scala212, scala213, scala31)
+crossScalaVersions := Seq(scala212, scala213, scala3)
 
 libraryDependencies ++= Seq("org.http4s" %% "http4s-core" % "0.23.15")
 

diff --git a/modules/ip4s/build.sbt b/modules/ip4s/build.sbt
@@ -2,7 +2,7 @@ import Dependencies.Version._
 
 name := "pureconfig-ip4s"
 
-crossScalaVersions := Seq(scala212, scala213, scala31)
+crossScalaVersions := Seq(scala212, scala213, scala3)
 
 libraryDependencies ++= Seq("com.comcast" %% "ip4s-core" % "3.1.3")
 

diff --git a/modules/sttp/build.sbt b/modules/sttp/build.sbt
@@ -2,7 +2,7 @@ import Dependencies.Version._
 
 name := "pureconfig-sttp"
 
-crossScalaVersions := Seq(scala212, scala213, scala31)
+crossScalaVersions := Seq(scala212, scala213, scala3)
 
 libraryDependencies ++= Seq(
   "com.softwaremill.sttp.model" %% "core" % "1.5.2"

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,7 +6,7 @@ object Dependencies {
   object Version {
     val scala212 = "2.12.16"
     val scala213 = "2.13.8"
-    val scala31 = "3.1.3"
+    val scala3 = "3.2.0"
 
     val typesafeConfig = "1.4.2"
 

diff --git a/testkit/build.sbt b/testkit/build.sbt
@@ -2,7 +2,7 @@ import Dependencies.Version._
 
 name := "pureconfig-testkit"
 
-crossScalaVersions := Seq(scala212, scala213, scala31)
+crossScalaVersions := Seq(scala212, scala213, scala3)
 
 libraryDependencies ++= Seq(
   Dependencies.scalaTest.value,

diff --git a/tests/build.sbt b/tests/build.sbt
@@ -2,6 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-tests"
 
-crossScalaVersions := Seq(scala212, scala213, scala31)
+crossScalaVersions := Seq(scala212, scala213, scala3)
 
 publish / skip := true