Create a pureconfig-testkit project and simplify build (#844)

* Create a pureconfig-testkit project and simplify build * Move test suites for shapeless derivation to `generic` module
pureconfig · Oct 11, 2020 · 770a7d4 · 770a7d4
1 parent 35521a5
commit 770a7d4
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 20 deletions.
diff --git a/build.sbt b/build.sbt
@@ -5,30 +5,21 @@ import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._
 organization in ThisBuild := "com.github.pureconfig"
 
 lazy val core = (project in file("core"))
-  .enablePlugins(BoilerplatePlugin, SbtOsgi, TutPlugin)
+  .enablePlugins(BoilerplatePlugin, SbtOsgi)
   .settings(commonSettings)
   .dependsOn(macros)
 
-// Two special modules for now, since `tests` depend on them. We should improve this organization later by separating
-// the test helpers (which all projects' tests should depend on) from the core+generic test implementations.
-lazy val `generic-base` = (project in file("modules/generic-base"))
-  .enablePlugins(SbtOsgi, TutPlugin)
-  .dependsOn(core)
-  .settings(commonSettings, tutTargetDirectory := baseDirectory.value)
-
-lazy val generic = (project in file("modules/generic"))
-  .enablePlugins(SbtOsgi, TutPlugin)
-  .dependsOn(core, `generic-base`)
-  .settings(commonSettings, tutTargetDirectory := baseDirectory.value)
-// -----
+lazy val macros = (project in file("macros"))
+  .settings(commonSettings)
 
-lazy val macros = (project in file("macros")).enablePlugins(TutPlugin).settings(commonSettings)
+lazy val testkit = (project in file("testkit"))
+  .settings(commonSettings)
+  .dependsOn(core)
 
 lazy val tests = (project in file("tests"))
   .enablePlugins(BoilerplatePlugin)
   .settings(commonSettings)
-  .dependsOn(core, generic)
-  .dependsOn(macros % "test->test") // provides helpers to test pureconfig macros
+  .dependsOn(core, testkit, generic)
 
 // aggregates pureconfig-core and pureconfig-generic with the original "pureconfig" name
 lazy val bundle = (project in file("bundle"))
@@ -42,13 +33,16 @@ lazy val docs = (project in file("docs"))
   .settings(docsSettings)
   .dependsOn(bundle)
 
-def module(proj: Project) = proj
+def genericModule(proj: Project) = proj
   .enablePlugins(SbtOsgi, TutPlugin)
   .dependsOn(core)
-  .dependsOn(tests % "test")
-  .dependsOn(generic % "Tut") // Allow auto-derivation in documentation
+  .dependsOn(testkit % "test")
   .settings(commonSettings, tutTargetDirectory := baseDirectory.value)
 
+def module(proj: Project) = genericModule(proj)
+  .dependsOn(generic % "test")
+  .dependsOn(generic % "Tut") // Allow auto-derivation in documentation
+
 lazy val akka = module(project) in file("modules/akka")
 lazy val `akka-http` = module(project) in file("modules/akka-http")
 lazy val cats = module(project) in file("modules/cats")
@@ -58,6 +52,8 @@ lazy val cron4s = module(project) in file("modules/cron4s")
 lazy val enum = module(project) in file("modules/enum")
 lazy val enumeratum = module(project) in file("modules/enumeratum")
 lazy val fs2 = module(project) in file("modules/fs2")
+lazy val generic = genericModule(project) in file("modules/generic") dependsOn `generic-base`
+lazy val `generic-base` = genericModule(project) in file("modules/generic-base")
 lazy val hadoop = module(project) in file("modules/hadoop")
 lazy val http4s = module(project) in file("modules/http4s")
 lazy val javax = module(project) in file("modules/javax")

diff --git a/.../test/scala/pureconfig/AnimalConfig.scala → ...ic/src/test/pureconfig/AnimalConfig.scala b/.../test/scala/pureconfig/AnimalConfig.scala → ...ic/src/test/pureconfig/AnimalConfig.scala
diff --git a/...pureconfig/CoproductConvertersSuite.scala → ...pureconfig/CoproductConvertersSuite.scala b/...pureconfig/CoproductConvertersSuite.scala → ...pureconfig/CoproductConvertersSuite.scala
diff --git a/...scala/pureconfig/CoproductHintSuite.scala → .../test/pureconfig/CoproductHintSuite.scala b/...scala/pureconfig/CoproductHintSuite.scala → .../test/pureconfig/CoproductHintSuite.scala
diff --git a/...ala/pureconfig/DerivationModesSuite.scala → ...est/pureconfig/DerivationModesSuite.scala b/...ala/pureconfig/DerivationModesSuite.scala → ...est/pureconfig/DerivationModesSuite.scala
diff --git a/.../scala/pureconfig/EnumerationsSuite.scala → ...c/test/pureconfig/EnumerationsSuite.scala b/.../scala/pureconfig/EnumerationsSuite.scala → ...c/test/pureconfig/EnumerationsSuite.scala
diff --git a/...a/pureconfig/ProductConvertersSuite.scala → ...t/pureconfig/ProductConvertersSuite.scala b/...a/pureconfig/ProductConvertersSuite.scala → ...t/pureconfig/ProductConvertersSuite.scala
diff --git a/...t/scala/pureconfig/ProductHintSuite.scala → ...rc/test/pureconfig/ProductHintSuite.scala b/...t/scala/pureconfig/ProductHintSuite.scala → ...rc/test/pureconfig/ProductHintSuite.scala
diff --git a/...ala/pureconfig/TupleConvertersSuite.scala → ...est/pureconfig/TupleConvertersSuite.scala b/...ala/pureconfig/TupleConvertersSuite.scala → ...est/pureconfig/TupleConvertersSuite.scala
diff --git a/...st/scala/pureconfig/ValueClassSuite.scala → ...src/test/pureconfig/ValueClassSuite.scala b/...st/scala/pureconfig/ValueClassSuite.scala → ...src/test/pureconfig/ValueClassSuite.scala
diff --git a/...config/CoproductConvertersSuite2_12.scala → ...config/CoproductConvertersSuite2_12.scala b/...config/CoproductConvertersSuite2_12.scala → ...config/CoproductConvertersSuite2_12.scala
diff --git a/testkit/build.sbt b/testkit/build.sbt
@@ -0,0 +1,7 @@
+import Dependencies._
+
+name := "pureconfig-testkit"
+
+libraryDependencies ++= Seq(scalaTest, scalaCheck, scalaTestPlusScalaCheck)
+
+skip in publish := true
diff --git a/...src/main/scala/pureconfig/BaseSuite.scala → ...src/main/scala/pureconfig/BaseSuite.scala b/...src/main/scala/pureconfig/BaseSuite.scala → ...src/main/scala/pureconfig/BaseSuite.scala
diff --git a/...cala/pureconfig/ConfigConvertChecks.scala → ...cala/pureconfig/ConfigConvertChecks.scala b/...cala/pureconfig/ConfigConvertChecks.scala → ...cala/pureconfig/ConfigConvertChecks.scala
diff --git a/...ala/pureconfig/ConfigReaderMatchers.scala → ...ala/pureconfig/ConfigReaderMatchers.scala b/...ala/pureconfig/ConfigReaderMatchers.scala → ...ala/pureconfig/ConfigReaderMatchers.scala
diff --git a/...t/scala/pureconfig/DerivationChecks.scala → ...n/scala/pureconfig/DerivationChecks.scala b/...t/scala/pureconfig/DerivationChecks.scala → ...n/scala/pureconfig/DerivationChecks.scala
diff --git a/...src/main/scala/pureconfig/PathUtils.scala → ...src/main/scala/pureconfig/PathUtils.scala b/...src/main/scala/pureconfig/PathUtils.scala → ...src/main/scala/pureconfig/PathUtils.scala
diff --git a/.../scala/pureconfig/arbitrary/package.scala → .../scala/pureconfig/arbitrary/package.scala b/.../scala/pureconfig/arbitrary/package.scala → .../scala/pureconfig/arbitrary/package.scala
diff --git a/...in/scala/pureconfig/data/Percentage.scala → ...in/scala/pureconfig/data/Percentage.scala b/...in/scala/pureconfig/data/Percentage.scala → ...in/scala/pureconfig/data/Percentage.scala
diff --git a/...n/scala/pureconfig/equality/package.scala → ...n/scala/pureconfig/equality/package.scala b/...n/scala/pureconfig/equality/package.scala → ...n/scala/pureconfig/equality/package.scala
diff --git a/...c/main/scala/pureconfig/gen/package.scala → ...c/main/scala/pureconfig/gen/package.scala b/...c/main/scala/pureconfig/gen/package.scala → ...c/main/scala/pureconfig/gen/package.scala
diff --git a/tests/build.sbt b/tests/build.sbt
@@ -2,6 +2,6 @@ import Dependencies._
 
 name := "pureconfig-tests"
 
-libraryDependencies ++= Seq(scalaTest, scalaCheck, scalaTestPlusScalaCheck, scalaCheckShapeless % "test")
+libraryDependencies ++= Seq(scalaCheckShapeless % "test")
 
 skip in publish := true