Updating to Release 1.0.30 with fix for 'dockerComposeTest -debug' parameter

kurtkopchik · kurtkopchik · commit 0208255098e7 · 2017-11-30T16:58:09.000-05:00
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Steps to Enable and Configure sbt-docker-compose
 
 1) Add the sbt-docker-compose plugin to your projects plugins.sbt file:
    ```
-   addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")
+   addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")
    ``` 
    sbt-docker-compose is an auto-plugin which requires that sbt version 0.13.5+ or sbt version 1.0.0+ be used.
    
diff --git a/examples/basic-native-packager/project/plugins.sbt b/examples/basic-native-packager/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("com.typesafe.sbt" %% "sbt-native-packager" % "1.1.0")
 
-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")
+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")
diff --git a/examples/basic-variable-substitution/project/plugins.sbt b/examples/basic-variable-substitution/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("com.typesafe.sbt" %% "sbt-native-packager" % "1.1.0")
 
-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")
+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")
diff --git a/examples/basic-with-tests-cucumber/project/plugins.sbt b/examples/basic-with-tests-cucumber/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.1")
-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")
+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")
 addSbtPlugin("com.waioeka.sbt" % "cucumber-plugin" % "0.1.2")
diff --git a/examples/basic-with-tests-integration/project/plugins.sbt b/examples/basic-with-tests-integration/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.1")
 
-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")
+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")
diff --git a/examples/basic-with-tests-specs2/project/plugins.sbt b/examples/basic-with-tests-specs2/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.1")
 
-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")
+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")
diff --git a/examples/basic-with-tests/project/plugins.sbt b/examples/basic-with-tests/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.1")
 
-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")
+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")
diff --git a/examples/multi-project/project/plugins.sbt b/examples/multi-project/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.1")
 
-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")
+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")
diff --git a/examples/no-build/project/plugins.sbt b/examples/no-build/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")
+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")
diff --git a/src/main/scala/com/tapad/docker/ComposeTestRunner.scala b/src/main/scala/com/tapad/docker/ComposeTestRunner.scala
@@ -97,7 +97,7 @@ trait ComposeTestRunner extends SettingsHelper with PrintFormatting {
 
     // Looks for the <-debug:port> argument and will suspend test case execution until a debugger is attached
     val debugSettings: String = getArgValue(testDebugPortArg, args) match {
-      case Some(port) => s"-J-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=$port"
+      case Some(port) => s"-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=$port"
       case None => ""
     }
 
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "1.0.31-SNAPSHOT"
+version in ThisBuild := "1.0.31"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`addSbtPlugin("com.typesafe.sbt" %% "sbt-native-packager" % "1.1.0")`
`2`	`2`
`3`		`-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")`
	`3`	`+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.1")`
`2`	`2`
`3`		`-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")`
	`3`	`+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.30")`
	`1`	`+addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.31")`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ trait ComposeTestRunner extends SettingsHelper with PrintFormatting {`
`97`	`97`
`98`	`98`	`// Looks for the <-debug:port> argument and will suspend test case execution until a debugger is attached`
`99`	`99`	`val debugSettings: String = getArgValue(testDebugPortArg, args) match {`
`100`		`- case Some(port) => s"-J-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=$port"`
	`100`	`+ case Some(port) => s"-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=$port"`
`101`	`101`	`case None => ""`
`102`	`102`	`}`
`103`	`103`