Drop ndbc support (#2760)

zio · Jun 6, 2023 · cfaab11 · cfaab11
1 parent 5c03195
commit cfaab11
Show file tree

Hide file tree

Showing 35 changed files with 4 additions and 2,081 deletions.
diff --git a/build.sbt b/build.sbt
@@ -78,12 +78,6 @@ lazy val jasyncModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
   `quill-jasync-zio-postgres`
 )
 
-lazy val asyncModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
-  `quill-ndbc`,
-  `quill-ndbc-postgres`,
-  `quill-ndbc-monix`
-) ++ jasyncModules
-
 lazy val codegenModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
   `quill-codegen`,
   `quill-codegen-jdbc`,
@@ -100,7 +94,7 @@ lazy val bigdataModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
 )
 
 lazy val allModules =
-  baseModules ++ jsModules ++ dbModules ++ asyncModules ++ codegenModules ++ bigdataModules ++ docsModules
+  baseModules ++ jsModules ++ dbModules ++ jasyncModules ++ codegenModules ++ bigdataModules ++ docsModules
 
 lazy val scala213Modules =
   baseModules ++ jsModules ++ dbModules ++ codegenModules ++ Seq[sbt.ClasspathDep[sbt.ProjectReference]](
@@ -159,13 +153,13 @@ lazy val filteredModules = {
         dbModules
       case "async" =>
         println("SBT =:> Compiling Async Database Modules")
-        asyncModules
+        jasyncModules
       case "codegen" =>
         println("SBT =:> Compiling Code Generator Modules")
         codegenModules
       case "nocodegen" =>
         println("Compiling Not-Code Generator Modules")
-        baseModules ++ jsModules ++ dbModules ++ asyncModules ++ bigdataModules
+        baseModules ++ jsModules ++ dbModules ++ jasyncModules ++ bigdataModules
       case "bigdata" =>
         println("SBT =:> Compiling Big Data Modules")
         bigdataModules
@@ -523,18 +517,6 @@ lazy val `quill-jdbc-zio` =
     .dependsOn(`quill-jdbc` % "compile->compile;test->test")
     .enablePlugins(MimaPlugin)
 
-lazy val `quill-ndbc-monix` =
-  (project in file("quill-ndbc-monix"))
-    .settings(commonSettings: _*)
-    .settings(
-      Test / fork := true
-    )
-    .dependsOn(`quill-monix` % "compile->compile;test->test")
-    .dependsOn(`quill-sql-jvm` % "compile->compile;test->test")
-    .dependsOn(`quill-ndbc` % "compile->compile;test->test")
-    .dependsOn(`quill-ndbc-postgres` % "compile->compile;test->test")
-    .enablePlugins(MimaPlugin)
-
 lazy val `quill-spark` =
   (project in file("quill-spark"))
     .settings(commonNoLogSettings: _*)
@@ -611,32 +593,6 @@ lazy val `quill-jasync-zio-postgres` =
     .dependsOn(`quill-jasync-zio` % "compile->compile;test->test")
     .enablePlugins(MimaPlugin)
 
-lazy val `quill-ndbc` =
-  (project in file("quill-ndbc"))
-    .settings(commonSettings: _*)
-    .settings(
-      Test / fork := true,
-      libraryDependencies ++= Seq(
-        "io.trane" % "future-scala" % "0.3.2",
-        "io.trane" % "ndbc-core"    % "0.1.3"
-      )
-    )
-    .dependsOn(`quill-sql-jvm` % "compile->compile;test->test")
-    .enablePlugins(MimaPlugin)
-
-lazy val `quill-ndbc-postgres` =
-  (project in file("quill-ndbc-postgres"))
-    .settings(commonSettings: _*)
-    .settings(
-      Test / fork := true,
-      libraryDependencies ++= Seq(
-        "io.trane" % "future-scala"         % "0.3.2",
-        "io.trane" % "ndbc-postgres-netty4" % "0.1.3"
-      )
-    )
-    .dependsOn(`quill-ndbc` % "compile->compile;test->test")
-    .enablePlugins(MimaPlugin)
-
 lazy val `quill-cassandra` =
   (project in file("quill-cassandra"))
     .settings(commonSettings: _*)

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -7,6 +7,7 @@ title: "Quill Changelog"
 
 - [Update Scala 2.12 && Drop `quill-finagle-mysql` and `quill-finagle-postgres` modules](https://github.com/zio/zio-quill/pull/2756)
 - [Update Scala3 version to `3.3.0`](https://github.com/zio/zio-quill/pull/2759)
+- [Drop `ndbc` support](https://github.com/zio/zio-quill/pull/2760)
 
 # 4.6.1
 

diff --git a/quill-ndbc-monix/src/main/scala/io/getquill/PostgresMonixNdbcContext.scala b/quill-ndbc-monix/src/main/scala/io/getquill/PostgresMonixNdbcContext.scala
diff --git a/quill-ndbc-monix/src/main/scala/io/getquill/context/monix/MonixNdbcContext.scala b/quill-ndbc-monix/src/main/scala/io/getquill/context/monix/MonixNdbcContext.scala
diff --git a/quill-ndbc-monix/src/test/resources/application.conf b/quill-ndbc-monix/src/test/resources/application.conf
diff --git a/quill-ndbc-monix/src/test/scala/io/getquill/MonixSpec.scala b/quill-ndbc-monix/src/test/scala/io/getquill/MonixSpec.scala
diff --git a/quill-ndbc-monix/src/test/scala/io/getquill/context/monix/MonixNdbcContextEffectSpec.scala b/quill-ndbc-monix/src/test/scala/io/getquill/context/monix/MonixNdbcContextEffectSpec.scala
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ title: "Quill Changelog" @@
     - [Update Scala 2.12 && Drop `quill-finagle-mysql` and `quill-finagle-postgres` modules](https://github.com/zio/zio-quill/pull/2756)
     - [Update Scala3 version to `3.3.0`](https://github.com/zio/zio-quill/pull/2759)
+    - [Drop `ndbc` support](https://github.com/zio/zio-quill/pull/2760)
     # 4.6.1
@@ Expand Down @@