Skip to content

Commit

Permalink
Move JdbcRunnerSpec to src/test
Browse files Browse the repository at this point in the history
  • Loading branch information
naderghanbari committed May 15, 2021
1 parent 16f97f5 commit e811c7f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 35 deletions.
42 changes: 7 additions & 35 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ lazy val root = project
mysql,
oracle,
postgres,
sqlserver,
test
sqlserver
)

lazy val core = crossProject(JSPlatform, JVMPlatform)
Expand Down Expand Up @@ -139,8 +138,8 @@ lazy val jdbc = project
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % zioVersion,
"dev.zio" %% "zio-streams" % zioVersion,
"dev.zio" %% "zio-test" % zioVersion,
"dev.zio" %% "zio-test-sbt" % zioVersion % "test"
"dev.zio" %% "zio-test" % zioVersion % Test,
"dev.zio" %% "zio-test-sbt" % zioVersion % Test
)
)
.settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
Expand All @@ -149,13 +148,11 @@ lazy val jdbc = project

lazy val mysql = project
.in(file("mysql"))
.dependsOn(jdbc % "compile->compile;test->test")
.settings(stdSettings("zio-sql-mysql"))
.settings(buildInfoSettings("zio.sql.mysql"))
.settings(
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % zioVersion,
"dev.zio" %% "zio-test" % zioVersion % "test",
"dev.zio" %% "zio-test-sbt" % zioVersion % "test",
"org.testcontainers" % "testcontainers" % testcontainersVersion % Test,
"org.testcontainers" % "database-commons" % testcontainersVersion % Test,
"org.testcontainers" % "jdbc" % testcontainersVersion % Test,
Expand All @@ -166,17 +163,14 @@ lazy val mysql = project
)
.settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
.settings(dottySettings)
.dependsOn(jdbc)

lazy val oracle = project
.in(file("oracle"))
.dependsOn(jdbc % "compile->compile;test->test")
.settings(stdSettings("zio-sql-oracle"))
.settings(buildInfoSettings("zio.sql.oracle"))
.settings(
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % zioVersion,
"dev.zio" %% "zio-test" % zioVersion % "test",
"dev.zio" %% "zio-test-sbt" % zioVersion % "test",
"org.testcontainers" % "testcontainers" % testcontainersVersion % Test,
"org.testcontainers" % "database-commons" % testcontainersVersion % Test,
"org.testcontainers" % "oracle-xe" % testcontainersVersion % Test,
Expand All @@ -187,17 +181,14 @@ lazy val oracle = project
)
.settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
.settings(dottySettings)
.dependsOn(jdbc)

lazy val postgres = project
.in(file("postgres"))
.dependsOn(jdbc % "compile->compile;test->test")
.settings(stdSettings("zio-sql-postgres"))
.settings(buildInfoSettings("zio.sql.postgres"))
.settings(
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % zioVersion,
"dev.zio" %% "zio-test" % zioVersion % Test,
"dev.zio" %% "zio-test-sbt" % zioVersion % Test,
"org.testcontainers" % "testcontainers" % testcontainersVersion % Test,
"org.testcontainers" % "database-commons" % testcontainersVersion % Test,
"org.testcontainers" % "postgresql" % testcontainersVersion % Test,
Expand All @@ -208,17 +199,14 @@ lazy val postgres = project
)
.settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
.settings(dottySettings)
.dependsOn(jdbc)

lazy val sqlserver = project
.in(file("sqlserver"))
.dependsOn(jdbc % "compile->compile;test->test")
.settings(stdSettings("zio-sql-sqlserver"))
.settings(buildInfoSettings("zio.sql.sqlserver"))
.settings(
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % zioVersion,
"dev.zio" %% "zio-test" % zioVersion % "test",
"dev.zio" %% "zio-test-sbt" % zioVersion % "test",
"org.testcontainers" % "testcontainers" % testcontainersVersion % Test,
"org.testcontainers" % "database-commons" % testcontainersVersion % Test,
"org.testcontainers" % "mssqlserver" % testcontainersVersion % Test,
Expand All @@ -227,19 +215,3 @@ lazy val sqlserver = project
)
.settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
.settings(dottySettings)
.dependsOn(jdbc)

lazy val test = project
.in(file("test"))
.settings(stdSettings("zio-sql-test"))
.settings(buildInfoSettings("zio.sql.test"))
.settings(
publish / skip := true,
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % zioVersion,
"dev.zio" %% "zio-test" % zioVersion % "test",
"dev.zio" %% "zio-test-sbt" % zioVersion % "test"
)
)
.settings(testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"))
.settings(dottySettings)

0 comments on commit e811c7f

Please sign in to comment.