From e811c7fef79a8afb85cdcfdcbddc171b6c49f9ee Mon Sep 17 00:00:00 2001
From: Nader Ghanbari <nader.h.ghanbari@gmail.com>
Date: Fri, 14 May 2021 20:54:27 -0400
Subject: [PATCH] Move JdbcRunnerSpec to src/test

---
 build.sbt                                     | 42 ++++---------------
 .../scala/zio/sql/JdbcRunnableSpec.scala      |  0
 2 files changed, 7 insertions(+), 35 deletions(-)
 rename jdbc/src/{main => test}/scala/zio/sql/JdbcRunnableSpec.scala (100%)

diff --git a/build.sbt b/build.sbt
index 62e5f9f12..4ceded679 100644
--- a/build.sbt
+++ b/build.sbt
@@ -68,8 +68,7 @@ lazy val root = project
     mysql,
     oracle,
     postgres,
-    sqlserver,
-    test
+    sqlserver
   )
 
 lazy val core = crossProject(JSPlatform, JVMPlatform)
@@ -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"))
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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)
diff --git a/jdbc/src/main/scala/zio/sql/JdbcRunnableSpec.scala b/jdbc/src/test/scala/zio/sql/JdbcRunnableSpec.scala
similarity index 100%
rename from jdbc/src/main/scala/zio/sql/JdbcRunnableSpec.scala
rename to jdbc/src/test/scala/zio/sql/JdbcRunnableSpec.scala