Merge cc447ee into 3090b8c

build.sbt

@@ -1,3 +1,4 @@
+import Dependencies.Version._
 import Utilities._
 import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._
 import scalariform.formatter.preferences._
@@ -39,7 +40,7 @@ lazy val docs = (project in file("docs")).
 def module(proj: Project) = proj.
   enablePlugins(SbtOsgi, TutPlugin).
   dependsOn(core).
-  dependsOn(tests % "test->test"). // In order to reuse thDerivationSuite scalacheck generators
+  dependsOn(tests % "test->test"). // In order to reuse the DerivationSuite scalacheck generators
   dependsOn(generic % "Tut"). // Allow auto-derivation in documentation
   settings(commonSettings, tutTargetDirectory := baseDirectory.value)
 
@@ -73,8 +74,8 @@ lazy val commonSettings = Seq(
     Developer("ruippeixotog", "Rui Gonçalves", "ruippeixotog@gmail.com", url("https://github.com/ruippeixotog")),
     Developer("derekmorr", "Derek Morr", "morr.derek@gmail.com", url("https://github.com/derekmorr"))),
 
-  scalaVersion := crossScalaVersions.value.head,
-  crossScalaVersions := Seq("2.12.10", "2.13.0", "2.11.12"),
+  crossScalaVersions := Seq(scala212, scala213, scala211),
+  scalaVersion := scala212,
 
   resolvers ++= Seq(
     Resolver.sonatypeRepo("releases"),
@@ -136,8 +137,8 @@ def crossVersionSharedSources(unmanagedSrcs: SettingKey[Seq[File]]) = {
   unmanagedSrcs ++= {
     val minor = CrossVersion.partialVersion(scalaVersion.value).map(_._2)
     List(
-      if(minor.exists(_ <= 12)) unmanagedSrcs.value.map { dir => new File(dir.getPath + "-2.12-") } else Nil,
-      if(minor.exists(_ >= 12)) unmanagedSrcs.value.map { dir => new File(dir.getPath + "-2.12+") } else Nil,
+      if (minor.exists(_ <= 12)) unmanagedSrcs.value.map { dir => new File(dir.getPath + "-2.12-") } else Nil,
+      if (minor.exists(_ >= 12)) unmanagedSrcs.value.map { dir => new File(dir.getPath + "-2.12+") } else Nil,
     ).flatten
   }
 }
@@ -179,6 +180,9 @@ lazy val lintFlags = {
   }
 }
 
+// Use the same Scala 2.12 version in the root project as in subprojects
+scalaVersion := scala212
+
 // do not publish the root project
 skip in publish := true
 

bundle/build.sbt

@@ -1,3 +1 @@
 name := "pureconfig"
-
-crossScalaVersions ~= { _ :+ "2.13.0" }

project/Dependencies.scala

@@ -1,9 +1,12 @@
-import Utilities._
 import sbt._
 
 object Dependencies {
 
   object Version {
+    val scala211            = "2.11.12"
+    val scala212            = "2.12.10"
+    val scala213            = "2.13.0"
+
     val shapeless           = "2.3.3"
     val typesafeConfig      = "1.3.4"
 

tests/build.sbt

@@ -2,8 +2,6 @@ import Dependencies._
 
 name := "pureconfig-tests"
 
-crossScalaVersions ~= { _ :+ "2.13.0" }
-
 libraryDependencies ++= Seq(
   scalaTest,
   scalaCheck,