Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop jasync modules #2889

Merged
merged 1 commit into from Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
matrix:
scala: [2.12.x, 2.13.x, 3.3.x]
module: [base, db, async, codegen, bigdata]
module: [base, db, codegen, bigdata]
include:
- scala: 2.12.x
scala_short: 212
Expand All @@ -42,8 +42,6 @@ jobs:
# For now, only do the `base` build for Scala 3
- scala: 3.3.x
module: db
- scala: 3.3.x
module: async
- scala: 3.3.x
module: codegen
- scala: 3.3.x
Expand Down
82 changes: 3 additions & 79 deletions build.sbt
Expand Up @@ -46,14 +46,6 @@ lazy val dbModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
`quill-jdbc-zio`
)

lazy val jasyncModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
`quill-jasync`,
`quill-jasync-postgres`,
`quill-jasync-mysql`,
`quill-jasync-zio`,
`quill-jasync-zio-postgres`
)

lazy val codegenModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
`quill-codegen`,
`quill-codegen-jdbc`,
Expand All @@ -70,10 +62,10 @@ lazy val bigdataModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
)

lazy val allModules =
baseModules ++ dbModules ++ jasyncModules ++ codegenModules ++ bigdataModules ++ docsModules
baseModules ++ dbModules ++ codegenModules ++ bigdataModules ++ docsModules

lazy val scala213Modules =
baseModules ++ dbModules ++ jasyncModules ++ codegenModules ++ bigdataModules
baseModules ++ dbModules ++ codegenModules ++ bigdataModules

lazy val scala3Modules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](`quill-engine`, `quill-util`)

Expand Down Expand Up @@ -112,15 +104,12 @@ lazy val filteredModules = {
case "db" =>
println("SBT =:> Compiling Database Modules")
dbModules
case "async" =>
println("SBT =:> Compiling Async Database Modules")
jasyncModules
case "codegen" =>
println("SBT =:> Compiling Code Generator Modules")
codegenModules
case "nocodegen" =>
println("Compiling Not-Code Generator Modules")
baseModules ++ dbModules ++ jasyncModules ++ bigdataModules
baseModules ++ dbModules ++ bigdataModules
case "bigdata" =>
println("SBT =:> Compiling Big Data Modules")
bigdataModules
Expand Down Expand Up @@ -421,71 +410,6 @@ lazy val `quill-spark` =
.dependsOn(`quill-sql` % "compile->compile;test->test")
.enablePlugins(MimaPlugin)

lazy val `quill-jasync` =
(project in file("quill-jasync"))
.settings(commonSettings: _*)
.settings(
Test / fork := true,
libraryDependencies ++= Seq(
"com.github.jasync-sql" % "jasync-common" % "2.2.4",
"org.scala-lang.modules" %% "scala-java8-compat" % "0.9.1"
)
)
.dependsOn(`quill-sql` % "compile->compile;test->test")
.enablePlugins(MimaPlugin)

lazy val `quill-jasync-postgres` =
(project in file("quill-jasync-postgres"))
.settings(commonSettings: _*)
.settings(
Test / fork := true,
libraryDependencies ++= Seq(
"com.github.jasync-sql" % "jasync-postgresql" % "2.2.4"
)
)
.dependsOn(`quill-jasync` % "compile->compile;test->test")
.enablePlugins(MimaPlugin)

lazy val `quill-jasync-mysql` =
(project in file("quill-jasync-mysql"))
.settings(commonSettings: _*)
.settings(
Test / fork := true,
libraryDependencies ++= Seq(
"com.github.jasync-sql" % "jasync-mysql" % "2.2.4"
)
)
.dependsOn(`quill-jasync` % "compile->compile;test->test")
.enablePlugins(MimaPlugin)

lazy val `quill-jasync-zio` =
(project in file("quill-jasync-zio"))
.settings(commonSettings: _*)
.settings(
Test / fork := true,
libraryDependencies ++= Seq(
"com.github.jasync-sql" % "jasync-common" % "2.2.4",
"org.scala-lang.modules" %% "scala-java8-compat" % "0.9.1",
"dev.zio" %% "zio" % Version.zio,
"dev.zio" %% "zio-streams" % Version.zio
)
)
.dependsOn(`quill-zio` % "compile->compile;test->test")
.dependsOn(`quill-sql` % "compile->compile;test->test")
.enablePlugins(MimaPlugin)

lazy val `quill-jasync-zio-postgres` =
(project in file("quill-jasync-zio-postgres"))
.settings(commonSettings: _*)
.settings(
Test / fork := true,
libraryDependencies ++= Seq(
"com.github.jasync-sql" % "jasync-postgresql" % "2.2.4"
)
)
.dependsOn(`quill-jasync-zio` % "compile->compile;test->test")
.enablePlugins(MimaPlugin)

lazy val `quill-cassandra` =
(project in file("quill-cassandra"))
.settings(commonSettings: _*)
Expand Down
10 changes: 0 additions & 10 deletions build/build.sh
Expand Up @@ -177,13 +177,6 @@ function db_build() {
./build/aware_run.sh "sbt -Dmodules=db $SBT_ARGS test"
}

function async_build() {
echo "build.sh =:> Async Build Specified"
wait_for_mysql_postgres
echo "build.sh =:> Starting Async Build Primary"
sbt -Dmodules=async $SBT_ARGS test
}

function codegen_build() {
echo "build.sh =:> Codegen Build Specified"
wait_for_databases
Expand Down Expand Up @@ -236,9 +229,6 @@ elif [[ $modules == "js" ]]; then
elif [[ $modules == "finagle" ]]; then
echo "build.sh =:> Build Script: Doing Finagle Database Build"
finagle_build
elif [[ $modules == "async" ]]; then
echo "build.sh =:> Build Script: Doing Async Database Build"
async_build
elif [[ $modules == "codegen" ]]; then
echo "build.sh =:> Build Script: Doing Code Generator Build"
codegen_build
Expand Down
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.md
Expand Up @@ -68,7 +68,7 @@ docker-compose run --rm sbt sbt "test-only io.getquill.context.sql.SqlQuerySpec"

Run all tests in specific sub-project:
```bash
docker-compose run --rm sbt sbt "project quill-async" test
docker-compose run --rm sbt sbt "project quill-jdbc-zio" test
```

Run specific test in specific sub-project:
Expand Down