Branch 0.10

.gitignore

@@ -2,4 +2,5 @@ target/
 target-shaded/
 project/sbt-launch-*.jar
 .idea/
+.DS_Store
 .bsp/

.jvmopts

@@ -1,10 +1,4 @@
--Dfile.encoding=UTF8
--Xms1G
--Xmx4G
--XX:ReservedCodeCacheSize=250M
--XX:+TieredCompilation
--XX:-UseGCOverheadLimit
-# effectively adds GC to Perm space
--XX:+CMSClassUnloadingEnabled
-# must be enabled for CMSClassUnloadingEnabled to work
--XX:+UseConcMarkSweepGC
+-Xms512M
+-Xmx4096M
+-Xss2M
+-XX:MaxMetaspaceSize=1024M

.scalafmt.conf

@@ -1,2 +1,3 @@
+version = "2.6.4"
 style = default
 maxColumn = 100

build.sbt

@@ -1,8 +1,8 @@
 lazy val commonSettings = Seq(
   organization := "com.whisk",
-  version := "0.9.9",
+  version := "0.10.0-RC",
   scalaVersion := "2.13.6",
-  crossScalaVersions := Seq("2.13.6", "2.12.15", "2.11.12", "3.0.2"),
+  crossScalaVersions := Seq("2.13.6", "2.12.15", "2.11.12"),
   scalacOptions ++= Seq("-feature", "-deprecation"),
   Test / fork := true,
   licenses += ("MIT", url("http://opensource.org/licenses/MIT")),
@@ -36,99 +36,60 @@ lazy val root =
     .in(file("."))
     .settings(commonSettings: _*)
     .settings(publish := {}, publishLocal := {}, packagedArtifacts := Map.empty)
-    .aggregate(core,
-               testkitSpotifyImpl,
-               testkitSpotifyShadedImpl,
-               testkitDockerJavaImpl,
-               config,
-               scalatest,
-               specs2,
-               samples)
+    .aggregate(core, scalatest, samples, coreShaded)
 
 lazy val core =
   project
-    .settings(commonSettings: _*)
-    .settings(name := "docker-testkit-core",
-              libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.22")
-
-lazy val testkitSpotifyImpl =
-  project
-    .in(file("impl/spotify"))
-    .settings(commonSettings: _*)
-    .settings(name := "docker-testkit-impl-spotify",
-              libraryDependencies ++=
-                Seq("com.spotify" % "docker-client" % "8.11.5",
-                    "com.google.code.findbugs" % "jsr305" % "3.0.1"))
-    .dependsOn(core)
-
-lazy val testkitSpotifyShadedImpl =
-  project
-    .in(file("impl/spotify"))
     .settings(commonSettings: _*)
     .settings(
-      name := "docker-testkit-impl-spotify-shaded",
-      libraryDependencies ++=
-        Seq("com.spotify" % "docker-client" % "8.11.5" classifier "shaded",
-            "com.google.code.findbugs" % "jsr305" % "3.0.1"),
-      target := baseDirectory.value / "target-shaded"
+      name := "docker-testkit-core",
+      libraryDependencies ++= Seq(
+        "org.slf4j" % "slf4j-api" % "1.7.25",
+        "com.spotify" % "docker-client" % "8.16.0",
+        "com.google.code.findbugs" % "jsr305" % "3.0.1"
+      )
     )
-    .dependsOn(core)
 
-lazy val testkitDockerJavaImpl =
+lazy val scalatest =
   project
-    .in(file("impl/docker-java"))
     .settings(commonSettings: _*)
     .settings(
-      name := "docker-testkit-impl-docker-java",
-      libraryDependencies ++=
-        Seq("com.github.docker-java" % "docker-java" % "3.2.3",
-            "com.google.code.findbugs" % "jsr305" % "3.0.1")
+      name := "docker-testkit-scalatest",
+      libraryDependencies ++= Seq(
+        "org.scalatest" %% "scalatest" % "3.1.2",
+        "ch.qos.logback" % "logback-classic" % "1.2.3" % "test"
+      )
     )
     .dependsOn(core)
 
 lazy val samples =
   project
     .settings(commonSettings: _*)
     .settings(name := "docker-testkit-samples")
-    .dependsOn(core)
+    .dependsOn(core, scalatest)
 
-lazy val scalatest =
+lazy val tests =
   project
     .settings(commonSettings: _*)
     .settings(
-      name := "docker-testkit-scalatest",
-      libraryDependencies ++=
-        Seq(
-          "org.scalatest" %% "scalatest" % "3.2.9",
-          "ch.qos.logback" % "logback-classic" % "1.2.1" % "test",
-          "org.postgresql" % "postgresql" % "9.4.1210" % "test",
-          "javax.activation" % "activation" % "1.1.1" % "test"
-        )
+      name := "docker-testkit-tests",
+      libraryDependencies ++= Seq(
+        "org.postgresql" % "postgresql" % "42.1.4" % "test",
+        "mysql" % "mysql-connector-java" % "5.1.44" % "test"
+      )
     )
-    .dependsOn(core, testkitSpotifyShadedImpl % "test", testkitDockerJavaImpl % "test", samples % "test")
+    .dependsOn(core, scalatest, samples % "test")
 
-lazy val specs2 =
+lazy val coreShaded =
   project
+    .in(file("core"))
     .settings(commonSettings: _*)
     .settings(
-      name := "docker-testkit-specs2",
+      name := "docker-testkit-core-shaded",
       libraryDependencies ++=
         Seq(
-          "org.specs2" %% "specs2-core" % (if (scalaVersion.value.startsWith("2.1")) "4.5.1"
-                                           else "5.0.0-RC-11"),
-          "ch.qos.logback" % "logback-classic" % "1.2.1" % "test",
-          "org.postgresql" % "postgresql" % "9.4.1210" % "test",
-          "javax.activation" % "activation" % "1.1.1" % "test"
-        )
-    )
-    .dependsOn(core, samples % "test", testkitDockerJavaImpl % "test")
-
-lazy val config =
-  project
-    .settings(commonSettings: _*)
-    .settings(
-      name := "docker-testkit-config",
-      libraryDependencies ++=
-        Seq("com.typesafe" % "config" % "1.4.1", "org.scalatest" %% "scalatest" % "3.2.9" % "test")
+          "com.spotify" % "docker-client" % "8.16.0" classifier "shaded",
+          "com.google.code.findbugs" % "jsr305" % "3.0.1"
+        ),
+      target := baseDirectory.value / "target-shaded"
     )
-    .dependsOn(core, testkitDockerJavaImpl)