Merge branch 'master' into update/sbt-scoverage-2.0.2

pureconfig · Sep 14, 2022 · 9869923 · 9869923
2 parents dd38ba2 + a501e88
commit 9869923
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -11,6 +11,11 @@ ThisBuild / semanticdbEnabled := true
 ThisBuild / semanticdbVersion := scalafixSemanticdb.revision
 ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.6.0"
 
+// taken from https://github.com/scala/bug/issues/12632
+ThisBuild / libraryDependencySchemes ++= Seq(
+  "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
+)
+
 lazy val core = (project in file("core"))
   .enablePlugins(BoilerplatePlugin)
   .settings(commonSettings)

diff --git a/modules/generic/build.sbt b/modules/generic/build.sbt
@@ -5,6 +5,6 @@ name := "pureconfig-generic"
 crossScalaVersions := Seq(scala212, scala213)
 
 libraryDependencies ++= Seq(
-  "com.chuusai" %% "shapeless" % "2.3.9",
+  "com.chuusai" %% "shapeless" % "2.3.10",
   "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
 )
diff --git a/modules/magnolia/build.sbt b/modules/magnolia/build.sbt
@@ -8,7 +8,7 @@ libraryDependencies ++= Seq(
   "com.propensive" %% "magnolia" % "0.17.0",
   "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
   // We're using shapeless for illTyped in tests.
-  "com.chuusai" %% "shapeless" % "2.3.9" % Test
+  "com.chuusai" %% "shapeless" % "2.3.10" % Test
 )
 
 developers := List(

diff --git a/modules/sttp/build.sbt b/modules/sttp/build.sbt
@@ -5,7 +5,7 @@ name := "pureconfig-sttp"
 crossScalaVersions := Seq(scala212, scala213, scala3)
 
 libraryDependencies ++= Seq(
-  "com.softwaremill.sttp.model" %% "core" % "1.5.1"
+  "com.softwaremill.sttp.model" %% "core" % "1.5.2"
 )
 
 developers := List(Developer("bszwej", "Bartlomiej Szwej", "bszwej@gmail.com", url("https://github.com/bszwej")))
diff --git a/modules/yaml/build.sbt b/modules/yaml/build.sbt
@@ -4,7 +4,7 @@ name := "pureconfig-yaml"
 
 crossScalaVersions := Seq(scala212, scala213)
 
-libraryDependencies ++= Seq("org.yaml" % "snakeyaml" % "1.31")
+libraryDependencies ++= Seq("org.yaml" % "snakeyaml" % "1.32")
 
 developers := List(
   Developer("ruippeixotog", "Rui Gonçalves", "ruippeixotog@gmail.com", url("https://github.com/ruippeixotog"))

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -12,7 +12,7 @@ object Dependencies {
 
     // can't use 3.2.11+ on Scala 2.12 because it pulls in scala-xml 2.
     // See https://github.com/scoverage/sbt-scoverage/issues/439
-    val scalaTest212 = "3.2.10"
+    val scalaTest212 = "3.2.13"
     val scalaTestPlusScalaCheck212 = "3.2.10.0"
     val scalaTest = "3.2.12"
     val scalaTestPlusScalaCheck = "3.2.11.0"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -10,3 +10,8 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.2")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13")
 
 libraryDependencies += "org.slf4j" % "slf4j-simple" % "2.0.0"
+
+// taken from https://github.com/scala/bug/issues/12632
+ThisBuild / libraryDependencySchemes ++= Seq(
+  "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
+)