Fix tests. Don't hardcode plugin version

sbt · Sep 30, 2016 · 085dcd4 · 085dcd4
1 parent 53adc3c
commit 085dcd4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/src/sbt-test/sbt-xjc/compile-and-test/project/plugins.sbt b/src/sbt-test/sbt-xjc/compile-and-test/project/plugins.sbt
@@ -1 +1,7 @@
-addSbtPlugin("org.scala-sbt.plugins" % "sbt-xjc" % "0.8-SNAPSHOT")
+{
+  val pluginVersion = System.getProperty("plugin.version")
+  if(pluginVersion == null)
+    throw new RuntimeException("""|The system property 'plugin.version' is not defined.
+                                  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
+  else addSbtPlugin("org.scala-sbt.plugins" % "sbt-xjc" % pluginVersion)
+}
diff --git a/src/sbt-test/sbt-xjc/fluent/project/plugins.sbt b/src/sbt-test/sbt-xjc/fluent/project/plugins.sbt
@@ -1 +1,7 @@
-addSbtPlugin("org.scala-sbt.plugins" % "sbt-xjc" % "0.8-SNAPSHOT")
+{
+  val pluginVersion = System.getProperty("plugin.version")
+  if(pluginVersion == null)
+    throw new RuntimeException("""|The system property 'plugin.version' is not defined.
+                                  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
+  else addSbtPlugin("org.scala-sbt.plugins" % "sbt-xjc" % pluginVersion)
+}
diff --git a/src/sbt-test/sbt-xjc/simple/project/plugins.sbt b/src/sbt-test/sbt-xjc/simple/project/plugins.sbt
@@ -1 +1,7 @@
-addSbtPlugin("org.scala-sbt.plugins" % "sbt-xjc" % "0.8-SNAPSHOT")
+{
+  val pluginVersion = System.getProperty("plugin.version")
+  if(pluginVersion == null)
+    throw new RuntimeException("""|The system property 'plugin.version' is not defined.
+                                  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
+  else addSbtPlugin("org.scala-sbt.plugins" % "sbt-xjc" % pluginVersion)
+}
diff --git a/src/sbt-test/sbt-xjc/xero/project/plugins.sbt b/src/sbt-test/sbt-xjc/xero/project/plugins.sbt
@@ -1 +1,7 @@
-addSbtPlugin("org.scala-sbt.plugins" % "sbt-xjc" % "0.8-SNAPSHOT")
+{
+  val pluginVersion = System.getProperty("plugin.version")
+  if(pluginVersion == null)
+    throw new RuntimeException("""|The system property 'plugin.version' is not defined.
+                                  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
+  else addSbtPlugin("org.scala-sbt.plugins" % "sbt-xjc" % pluginVersion)
+}