Merge branch 'sbt-0.10.1' into develop

skipoleschris · skipoleschris · commit 4c1b8db38854 · 2011-07-20T08:44:35.000+01:00
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := "xsbt-cucumber-plugin"
 
-version := "0.1"
+version := "0.2"
 
 organization := "templemore"
 
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.10.0
+sbt.version=0.10.1
diff --git a/testProjects/multiModuleTestProject/project/Build.scala b/testProjects/multiModuleTestProject/project/Build.scala
@@ -5,7 +5,7 @@ import templemore.xsbt.cucumber.CucumberPlugin
 object BuildSettings {
   val buildOrganization = "templemore"
   val buildScalaVersion = "2.9.0-1"
-  val buildVersion      = "0.1"
+  val buildVersion      = "0.2"
 
   val buildSettings = Defaults.defaultSettings ++
                       Seq (organization := buildOrganization,
@@ -34,4 +34,4 @@ object TestProjectBuild extends Build {
 
   lazy val warProject = Project ("war-project", file ("war-project"),
            settings = buildSettings ++ Seq (libraryDependencies ++= testDeps)) dependsOn (jarProject)
-}
+}
diff --git a/testProjects/multiModuleTestProject/project/build.properties b/testProjects/multiModuleTestProject/project/build.properties
@@ -0,0 +1,2 @@
+sbt.version=0.10.1
+
diff --git a/testProjects/multiModuleTestProject/project/plugins/build.sbt b/testProjects/multiModuleTestProject/project/plugins/build.sbt
@@ -1,3 +1,3 @@
 resolvers += Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString))
 
-libraryDependencies += "templemore" %% "xsbt-cucumber-plugin" % "0.1"
+libraryDependencies += "templemore" %% "xsbt-cucumber-plugin" % "0.2"
diff --git a/testProjects/testProject/build.sbt b/testProjects/testProject/build.sbt
@@ -1,6 +1,6 @@
 name := "test-project"
 
-version := "0.1"
+version := "0.2"
 
 organization := "templemore"
 
diff --git a/testProjects/testProject/project/build.properties b/testProjects/testProject/project/build.properties
@@ -1 +1 @@
-sbt.version=0.10.0
+sbt.version=0.10.1
diff --git a/testProjects/testProject/project/plugins/build.sbt b/testProjects/testProject/project/plugins/build.sbt
@@ -1,3 +1,3 @@
 resolvers += Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString))
 
-libraryDependencies += "templemore" %% "xsbt-cucumber-plugin" % "0.1"
+libraryDependencies += "templemore" %% "xsbt-cucumber-plugin" % "0.2"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=0.10.0`
	`1`	`+sbt.version=0.10.1`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`resolvers += Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString))`
`2`	`2`
`3`		`-libraryDependencies += "templemore" %% "xsbt-cucumber-plugin" % "0.1"`
	`3`	`+libraryDependencies += "templemore" %% "xsbt-cucumber-plugin" % "0.2"`