Merge 04fcd6f into 4708272

pureconfig · Jul 17, 2021 · 9a78733 · 9a78733
2 parents 4708272 + 04fcd6f
commit 9a78733
Show file tree

Hide file tree

Showing 34 changed files with 522 additions and 59 deletions.
diff --git a/build.sbt b/build.sbt
@@ -11,15 +11,15 @@ ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports"
 
 lazy val core = (project in file("core"))
   .enablePlugins(BoilerplatePlugin, SbtOsgi)
-  .settings(commonSettings)
+  .settings(commonSettings ++ withScala3Settings)
 
 lazy val testkit = (project in file("testkit"))
-  .settings(commonSettings)
+  .settings(commonSettings ++ withScala3Settings)
   .dependsOn(core)
 
 lazy val tests = (project in file("tests"))
   .enablePlugins(BoilerplatePlugin)
-  .settings(commonSettings)
+  .settings(commonSettings ++ withScala3Settings)
   .dependsOn(core, testkit)
 
 // aggregates pureconfig-core and pureconfig-generic with the original "pureconfig" name
@@ -62,10 +62,13 @@ lazy val joda = module(project) in file("modules/joda")
 lazy val magnolia = module(project) in file("modules/magnolia") dependsOn `generic-base`
 lazy val `scala-xml` = module(project) in file("modules/scala-xml")
 lazy val scalaz = module(project) in file("modules/scalaz")
+lazy val spark = module(project) in file("modules/spark") settings onlyScala212settings
 lazy val squants = module(project) in file("modules/squants")
 lazy val sttp = module(project) in file("modules/sttp")
 lazy val yaml = module(project) in file("modules/yaml")
 
+lazy val isScala212 = settingKey[Boolean]("Is the scala version 2.12.")
+
 lazy val commonSettings = Seq(
   // format: off
   homepage := Some(url("https://github.com/pureconfig/pureconfig")),
@@ -80,6 +83,8 @@ lazy val commonSettings = Seq(
   ),
 
   scalaVersion := scala212,
+  crossScalaVersions := Seq(scala212, scala213),
+  isScala212 := scalaVersion.value == scala212,
 
   resolvers ++= Seq(Resolver.sonatypeRepo("releases"), Resolver.sonatypeRepo("snapshots")),
 
@@ -110,6 +115,19 @@ lazy val commonSettings = Seq(
   // format: on
 )
 
+//scalafix does not honour `scala213` removal from `crossScalaVersions` so we need to disable it explicitly.
+//It might be because all modules depend on `generic` which still has to cross-compile for `scala213`.
+val onlyScala212settings = Seq(
+  crossScalaVersions := Seq(scala212), //removal of `scala213` necessary but not sufficient
+  scalafix := isScala212.value,
+  scalafixAll := isScala212.value,
+  scalafixOnCompile := isScala212.value
+)
+
+val withScala3Settings = Seq(
+  crossScalaVersions += scala30
+)
+
 // add support for Scala version ranges such as "scala-2.12+" or "scala-2.13-" in source folders (single version folders
 // such as "scala-2.12" are natively supported by SBT).
 def crossVersionSharedSources(unmanagedSrcs: SettingKey[Seq[File]]) = {
@@ -170,9 +188,6 @@ lazy val lintFlags = forScalaVersions {
 // Use the same Scala 2.12 version in the root project as in subprojects
 scalaVersion := scala212
 
-// Workaround for https://github.com/sbt/sbt/issues/3465
-crossScalaVersions := Nil
-
 // do not publish the root project
 publish / skip := true
 

diff --git a/bundle/build.sbt b/bundle/build.sbt
@@ -1,5 +1,3 @@
 import Dependencies.Version._
 
 name := "pureconfig"
-
-crossScalaVersions := Seq(scala212, scala213)
diff --git a/core/build.sbt b/core/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-core"
 
-crossScalaVersions := Seq(scala212, scala213, scala30)
-
 libraryDependencies += Dependencies.typesafeConfig
 
 osgiSettings

diff --git a/docs/build.sbt b/docs/build.sbt
@@ -1,7 +1,6 @@
 import Dependencies.Version._
 
 // Code snippets in the website are written using Scala 2.12+ compatible code
-crossScalaVersions := Seq(scala212, scala213)
 
 micrositeName := "PureConfig"
 micrositeDescription := "A boilerplate-free library for loading configuration files"

diff --git a/modules/akka-http/build.sbt b/modules/akka-http/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-akka-http"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-stream" % "2.6.15" % "provided",
   "com.typesafe.akka" %% "akka-http" % "10.2.4"

diff --git a/modules/akka/build.sbt b/modules/akka/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-akka"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq("com.typesafe.akka" %% "akka-actor" % "2.6.15")
 
 developers := List(

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

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

diff --git a/modules/cats/build.sbt b/modules/cats/build.sbt
@@ -3,8 +3,6 @@ import Utilities._
 
 name := "pureconfig-cats"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-core" % "2.6.1",
   "org.typelevel" %% "cats-laws" % "2.6.1" % "test",

diff --git a/modules/circe/build.sbt b/modules/circe/build.sbt
@@ -3,8 +3,6 @@ import Utilities._
 
 name := "pureconfig-circe"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq(
   "io.circe" %% "circe-core" % "0.14.1",
   "io.circe" %% "circe-literal" % "0.14.1" % Test,

diff --git a/modules/cron4s/build.sbt b/modules/cron4s/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-cron4s"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies += "com.github.alonsodomin.cron4s" %% "cron4s-core" % "0.6.1"
 
 developers := List(

diff --git a/modules/enum/build.sbt b/modules/enum/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-enum"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq("org.julienrf" %% "enum" % "3.1")
 
 developers := List(

diff --git a/modules/enumeratum/build.sbt b/modules/enumeratum/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-enumeratum"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq("com.beachape" %% "enumeratum" % "1.7.0")
 
 developers := List(Developer("aeons", "Bjørn Madsen", "bm@aeons.dk", url("https://github.com/aeons")))

diff --git a/modules/fs2/build.sbt b/modules/fs2/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-fs2"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq(
   "co.fs2" %% "fs2-core" % "3.0.6",
   "co.fs2" %% "fs2-io" % "3.0.6"

diff --git a/modules/generic-base/build.sbt b/modules/generic-base/build.sbt
@@ -1,5 +1,3 @@
 import Dependencies.Version._
 
 name := "pureconfig-generic-base"
-
-crossScalaVersions := Seq(scala212, scala213)
diff --git a/modules/generic/build.sbt b/modules/generic/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-generic"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq(
   Dependencies.shapeless,
   "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided

diff --git a/modules/hadoop/build.sbt b/modules/hadoop/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-hadoop"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq("org.apache.hadoop" % "hadoop-common" % "3.3.1" % "provided")
 mdocLibraryDependencies ++= Seq("org.apache.hadoop" % "hadoop-common" % "3.3.1")
 

diff --git a/modules/http4s/build.sbt b/modules/http4s/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-http4s"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq("org.http4s" %% "http4s-core" % "0.21.24")
 
 developers := List(

diff --git a/modules/javax/build.sbt b/modules/javax/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-javax"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 developers := List(Developer("derekmorr", "Derek Morr", "morr.derek@gmail.com", url("https://github.com/derekmorr")))
 
 osgiSettings

diff --git a/modules/joda/build.sbt b/modules/joda/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-joda"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq("joda-time" % "joda-time" % "2.10.10", "org.joda" % "joda-convert" % "2.2.1")
 
 developers := List(

diff --git a/modules/magnolia/build.sbt b/modules/magnolia/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-magnolia"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq(
   "com.propensive" %% "magnolia" % "0.17.0",
   "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided

diff --git a/modules/scala-xml/build.sbt b/modules/scala-xml/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-scala-xml"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq("org.scala-lang.modules" %% "scala-xml" % "1.3.0")
 
 developers := List(Developer("derekmorr", "Derek Morr", "morr.derek@gmail.com", url("https://github.com/derekmorr")))

diff --git a/modules/scalaz/build.sbt b/modules/scalaz/build.sbt
@@ -2,8 +2,6 @@ import Dependencies.Version._
 
 name := "pureconfig-scalaz"
 
-crossScalaVersions := Seq(scala212, scala213)
-
 libraryDependencies ++= Seq(
   "org.scalaz" %% "scalaz-core" % "7.3.4",
   "org.scalaz" %% "scalaz-scalacheck-binding" % "7.3.4" % "test"