Reorganize into multiple sbt projects (#45)

(This introduces a change in the project dependencies)
gaelrenoux · Jul 29, 2023 · e05778a · e05778a
1 parent 038cfd5
commit e05778a
Show file tree

Hide file tree

Showing 39 changed files with 63 additions and 29 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/sbt.xml b/.idea/sbt.xml
diff --git a/.idea/scala_compiler.xml b/.idea/scala_compiler.xml
diff --git a/README.md b/README.md
@@ -45,16 +45,12 @@ That's where TranzactIO comes from. I wanted a way to use ZIO everywhere, and ru
 
 TranzactIO is available on the Sonatype Central Repository (see the Nexus badge on top of this README to get the version number). In your build.sbt:
 ```sbt
-libraryDependencies += "io.github.gaelrenoux" %% "tranzactio" % TranzactIOVersion
+// Add this if you use doobie:
+libraryDependencies += "io.github.gaelrenoux" %% "tranzactio-doobie" % TranzactIOVersion
+// Or this if you use anorm:
+libraryDependencies += "io.github.gaelrenoux" %% "tranzactio-anorm" % TranzactIOVersion
 ```
 
-In addition, you will need to declare the database access library you are using. For instance, with Doobie:
-```sbt
-libraryDependencies += "org.tpolecat" %% "doobie-core" % DoobieVersion
-```
-
-
-
 ### Imports
 
 Most of the time, you will need to import two packages.

diff --git a/...gaelrenoux/tranzactio/anorm/package.scala → ...gaelrenoux/tranzactio/anorm/package.scala b/...gaelrenoux/tranzactio/anorm/package.scala → ...gaelrenoux/tranzactio/anorm/package.scala
diff --git a/build.sbt b/build.sbt
@@ -1,14 +1,43 @@
 import BuildHelper._
 
-lazy val tranzactio = (project in file(".")).settings(
-  name := "tranzactio",
+lazy val root = (project in file(".")).settings(
+  name := "tranzactio-root",
   description := "ZIO wrapper for Scala DB libraries (e.g. Doobie, Anorm)",
+  publish / skip := true,
+).aggregate(core, anorm, doobie, examples)
+
+lazy val core = project.settings(
+  name := "tranzactio-core",
+  description := "Core classes for Tranzactio",
+  stdSettings,
+  publishSettings,
+  libraryDependencies ++= coreDeps,
+)
+
+lazy val anorm = project.settings(
+  name := "tranzactio-anorm",
+  description := "ZIO wrapper for Anorm",
   stdSettings,
   publishSettings,
-  /* Adds samples as test sources */
-  Test / unmanagedSourceDirectories ++= Seq(
-    baseDirectory.value /"src/samples/scala"
-  ),
+  libraryDependencies ++= anormDeps,
+).dependsOn(core)
+
+lazy val doobie = project.settings(
+  name := "tranzactio-doobie",
+  description := "ZIO wrapper for Doobie",
+  stdSettings,
+  publishSettings,
+  libraryDependencies ++= doobieDeps,
+).dependsOn(core)
+
+lazy val examples = project.settings(
+  stdSettings,
+  publish / skip := true,
+).dependsOn(
+  // https://www.scala-sbt.org/1.x/docs/Multi-Project.html#Per-configuration+classpath+dependencies
+  core % "test->compile;test->test",
+  anorm % Test,
+  doobie % Test,
 )
 
 /* Makes processes is SBT cancelable without closing SBT */

diff --git a/...lrenoux/tranzactio/ConnectionSource.scala → ...lrenoux/tranzactio/ConnectionSource.scala b/...lrenoux/tranzactio/ConnectionSource.scala → ...lrenoux/tranzactio/ConnectionSource.scala
diff --git a/...enoux/tranzactio/DatabaseModuleBase.scala → ...enoux/tranzactio/DatabaseModuleBase.scala b/...enoux/tranzactio/DatabaseModuleBase.scala → ...enoux/tranzactio/DatabaseModuleBase.scala
diff --git a/...b/gaelrenoux/tranzactio/DatabaseOps.scala → ...b/gaelrenoux/tranzactio/DatabaseOps.scala b/...b/gaelrenoux/tranzactio/DatabaseOps.scala → ...b/gaelrenoux/tranzactio/DatabaseOps.scala
diff --git a/...noux/tranzactio/DatabaseServiceBase.scala → ...noux/tranzactio/DatabaseServiceBase.scala b/...noux/tranzactio/DatabaseServiceBase.scala → ...noux/tranzactio/DatabaseServiceBase.scala
diff --git a/...b/gaelrenoux/tranzactio/DbException.scala → ...b/gaelrenoux/tranzactio/DbException.scala b/...b/gaelrenoux/tranzactio/DbException.scala → ...b/gaelrenoux/tranzactio/DbException.scala
diff --git a/...ithub/gaelrenoux/tranzactio/Wrapper.scala → ...ithub/gaelrenoux/tranzactio/Wrapper.scala b/...ithub/gaelrenoux/tranzactio/Wrapper.scala → ...ithub/gaelrenoux/tranzactio/Wrapper.scala
diff --git a/...elrenoux/tranzactio/errorStrategies.scala → ...elrenoux/tranzactio/errorStrategies.scala b/...elrenoux/tranzactio/errorStrategies.scala → ...elrenoux/tranzactio/errorStrategies.scala
diff --git a/...ithub/gaelrenoux/tranzactio/package.scala → ...ithub/gaelrenoux/tranzactio/package.scala b/...ithub/gaelrenoux/tranzactio/package.scala → ...ithub/gaelrenoux/tranzactio/package.scala
diff --git a/...anzactio/test/DatabaseModuleTestOps.scala → ...anzactio/test/DatabaseModuleTestOps.scala b/...anzactio/test/DatabaseModuleTestOps.scala → ...anzactio/test/DatabaseModuleTestOps.scala
diff --git a/.../tranzactio/test/NoopJdbcConnection.scala → .../tranzactio/test/NoopJdbcConnection.scala b/.../tranzactio/test/NoopJdbcConnection.scala → .../tranzactio/test/NoopJdbcConnection.scala
diff --git a/...x/tranzactio/DatabaseOpsCompileTest.scala → ...x/tranzactio/DatabaseOpsCompileTest.scala b/...x/tranzactio/DatabaseOpsCompileTest.scala → ...x/tranzactio/DatabaseOpsCompileTest.scala
diff --git a/...ub/gaelrenoux/tranzactio/JdbcLayers.scala → ...ub/gaelrenoux/tranzactio/JdbcLayers.scala b/...ub/gaelrenoux/tranzactio/JdbcLayers.scala → ...ub/gaelrenoux/tranzactio/JdbcLayers.scala
diff --git a/...anzactio/SingleConnectionSourceTest.scala → ...anzactio/SingleConnectionSourceTest.scala b/...anzactio/SingleConnectionSourceTest.scala → ...anzactio/SingleConnectionSourceTest.scala
diff --git a/...enoux/tranzactio/integration/ITSpec.scala → ...enoux/tranzactio/integration/ITSpec.scala b/...enoux/tranzactio/integration/ITSpec.scala → ...enoux/tranzactio/integration/ITSpec.scala
diff --git a/...aelrenoux/tranzactio/doobie/package.scala → ...aelrenoux/tranzactio/doobie/package.scala b/...aelrenoux/tranzactio/doobie/package.scala → ...aelrenoux/tranzactio/doobie/package.scala
diff --git a/...noux/tranzactio/integration/AnormIT.scala → ...noux/tranzactio/integration/AnormIT.scala b/...noux/tranzactio/integration/AnormIT.scala → ...noux/tranzactio/integration/AnormIT.scala
@@ -9,7 +9,7 @@ import zio.test.Assertion._
 import zio.test._
 import zio.{Scope, ZIO, ZLayer}
 
-/** Integration tests for Doobie */
+/** Integration tests for Anorm */
 object AnormIT extends ITSpec {
 
   /** Layer is recreated on each test, to have a different database every time. */

diff --git a/...oux/tranzactio/integration/DoobieIT.scala → ...oux/tranzactio/integration/DoobieIT.scala b/...oux/tranzactio/integration/DoobieIT.scala → ...oux/tranzactio/integration/DoobieIT.scala
diff --git a/src/samples/scala/samples/Conf.scala → examples/src/test/scala/samples/Conf.scala b/src/samples/scala/samples/Conf.scala → examples/src/test/scala/samples/Conf.scala
diff --git a/...amples/scala/samples/ConnectionPool.scala → ...c/test/scala/samples/ConnectionPool.scala b/...amples/scala/samples/ConnectionPool.scala → ...c/test/scala/samples/ConnectionPool.scala
diff --git a/src/samples/scala/samples/Person.scala → examples/src/test/scala/samples/Person.scala b/src/samples/scala/samples/Person.scala → examples/src/test/scala/samples/Person.scala
diff --git a/src/samples/scala/samples/SamplesSpec.scala → .../src/test/scala/samples/SamplesSpec.scala b/src/samples/scala/samples/SamplesSpec.scala → .../src/test/scala/samples/SamplesSpec.scala
diff --git a/...ples/scala/samples/anorm/LayeredApp.scala → ...test/scala/samples/anorm/LayeredApp.scala b/...ples/scala/samples/anorm/LayeredApp.scala → ...test/scala/samples/anorm/LayeredApp.scala
diff --git a/...s/scala/samples/anorm/PersonQueries.scala → ...t/scala/samples/anorm/PersonQueries.scala b/...s/scala/samples/anorm/PersonQueries.scala → ...t/scala/samples/anorm/PersonQueries.scala
diff --git a/...samples/scala/samples/anorm/package.scala → ...rc/test/scala/samples/anorm/package.scala b/...samples/scala/samples/anorm/package.scala → ...rc/test/scala/samples/anorm/package.scala
diff --git a/...s/scala/samples/anorm/test/SomeTest.scala → ...t/scala/samples/anorm/test/SomeTest.scala b/...s/scala/samples/anorm/test/SomeTest.scala → ...t/scala/samples/anorm/test/SomeTest.scala
diff --git a/...les/scala/samples/doobie/LayeredApp.scala → ...est/scala/samples/doobie/LayeredApp.scala b/...les/scala/samples/doobie/LayeredApp.scala → ...est/scala/samples/doobie/LayeredApp.scala
diff --git a/.../samples/doobie/LayeredAppStreaming.scala → .../samples/doobie/LayeredAppStreaming.scala b/.../samples/doobie/LayeredAppStreaming.scala → .../samples/doobie/LayeredAppStreaming.scala
diff --git a/.../scala/samples/doobie/PersonQueries.scala → .../scala/samples/doobie/PersonQueries.scala b/.../scala/samples/doobie/PersonQueries.scala → .../scala/samples/doobie/PersonQueries.scala
diff --git a/...amples/scala/samples/doobie/package.scala → ...c/test/scala/samples/doobie/package.scala b/...amples/scala/samples/doobie/package.scala → ...c/test/scala/samples/doobie/package.scala
diff --git a/.../scala/samples/doobie/test/SomeTest.scala → .../scala/samples/doobie/test/SomeTest.scala b/.../scala/samples/doobie/test/SomeTest.scala → .../scala/samples/doobie/test/SomeTest.scala
diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -16,15 +16,10 @@ object BuildHelper {
     val scala3 = "3.2.2"
   }
 
-  private val dependencies = Seq(
+  val coreDeps: Seq[ModuleID] = Seq(
     /* ZIO */
     "dev.zio" %% "zio" % V.zio,
     "dev.zio" %% "zio-streams" % V.zio,
-    "dev.zio" %% "zio-interop-cats" % V.zioCats,
-
-    /* Doobie */
-    "org.tpolecat" %% "doobie-core" % V.doobie % Optional,
-    "org.playframework.anorm" %% "anorm" % V.anorm % Optional,
 
     /* ZIO test */
     "dev.zio" %% "zio-test" % V.zio % Test,
@@ -37,12 +32,18 @@ object BuildHelper {
     /* H2 for tests */
     "com.h2database" % "h2" % V.h2 % Test
   )
-
+  val anormDeps: Seq[ModuleID] = Seq(
+    "org.playframework.anorm" %% "anorm" % V.anorm,
+  )
+  val doobieDeps: Seq[ModuleID] = Seq(
+    "dev.zio" %% "zio-interop-cats" % V.zioCats,
+    "org.tpolecat" %% "doobie-core" % V.doobie,
+  )
+
   val stdSettings: Seq[Setting[_]] = Seq(
     scalaVersion := V.scala3,
     crossScalaVersions := Seq(V.scala212, V.scala213, V.scala3),
     scalacOptions ++= scalaVersion(ScalacOptions(_)).value,
-    libraryDependencies ++= dependencies,
     Test / fork := true,
     Test / testForkedParallel := true, // run tests in parallel on the forked JVM
     Test / testOptions += Tests.Argument("-oD"), // show test duration