Automatically set the sbt-osgi version for the scripted test.

arjenw · May 5, 2014 · 8082ec9 · 8082ec9
1 parent c6dd29a
commit 8082ec9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/scripted.sbt b/scripted.sbt
@@ -2,3 +2,5 @@
 scriptedSettings
 
 scriptedLaunchOpts += "-Xmx1024m"
+
+scriptedLaunchOpts <+= version apply { v => "-Dproject.version="+v }
diff --git a/src/sbt-test/sbt-osgi/test-00-defaults/project/plugins.sbt b/src/sbt-test/sbt-osgi/test-00-defaults/project/plugins.sbt
@@ -1,2 +1 @@
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0-SNAPSHOT")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % sys.props("project.version"))
diff --git a/src/sbt-test/sbt-osgi/test-01-contents/project/plugins.sbt b/src/sbt-test/sbt-osgi/test-01-contents/project/plugins.sbt
@@ -1,2 +1 @@
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0-SNAPSHOT")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % sys.props("project.version"))
diff --git a/src/sbt-test/sbt-osgi/test-02-includeresource/project/plugins.sbt b/src/sbt-test/sbt-osgi/test-02-includeresource/project/plugins.sbt
@@ -1,2 +1 @@
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0-SNAPSHOT")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % sys.props("project.version"))
diff --git a/src/sbt-test/sbt-osgi/test-03-arbitraryHeaders/project/plugins.sbt b/src/sbt-test/sbt-osgi/test-03-arbitraryHeaders/project/plugins.sbt
@@ -1,2 +1 @@
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0-SNAPSHOT")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % sys.props("project.version"))
diff --git a/src/sbt-test/sbt-osgi/test-04-embeddedJars/project/plugins.sbt b/src/sbt-test/sbt-osgi/test-04-embeddedJars/project/plugins.sbt
@@ -1,2 +1 @@
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0-SNAPSHOT")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % sys.props("project.version"))
diff --git a/src/sbt-test/sbt-osgi/test-05-exportJars/project/plugins.sbt b/src/sbt-test/sbt-osgi/test-05-exportJars/project/plugins.sbt
@@ -1,2 +1 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0-SNAPSHOT")
-
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % sys.props("project.version"))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,5 @@
		scriptedSettings

		scriptedLaunchOpts += "-Xmx1024m"

		scriptedLaunchOpts <+= version apply { v => "-Dproject.version="+v }
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@

		addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0-SNAPSHOT")
		addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % sys.props("project.version"))