Merge branch 'master' into develop

Author: skipoleschris

.idea/misc.xml

@@ -1,14 +1,14 @@
 xsbt-cucumber-plugin
 ====================
 
-An [sbt 0.10](https://github.com/harrah/xsbt/wiki) plugin for running [Cucumber](http://cukes.info) features under [cuke4duke](http://github.com/aslakhellesoy/cuke4duke).
+An [sbt 0.11.0](https://github.com/harrah/xsbt/wiki) plugin for running [Cucumber](http://cukes.info) features under [cuke4duke](http://github.com/aslakhellesoy/cuke4duke).
 
 Provides the ability to run Cucumber via Cuke4Duke within the SBT environment. Originally based on the [cuke4duke-sbt-plugin](https://github.com/rubbish/cuke4duke-sbt-plugin) by rubbish and my original implementation for SBT 0.7.x. Specifics for this release:
 
-* Works with xsbt 0.10.1
+* Works with xsbt 0.11.0
 * Works with Cucumber 1.0.0
 * Works with cuke4duke 0.4.4
-* Allows projects compiled and running against Scala 2.8.x and 2.9.x
+* Allows projects compiled and running against Scala 2.9.1
 
 ## Usage ##
 Install the plugin (see later). Be default features files go in a 'features' directory at the root of the project. Step definitions go in "src/test/scala'. Finally from the sbt console call the task:
@@ -75,7 +75,7 @@ To install the cucumber plugin, add entries to the build plugins file (project/p
 
     resolvers += "Templemore Repository" at "http://templemore.co.uk/repo"
 
-    libraryDependencies += "templemore" %% "xsbt-cucumber-plugin" % "0.3"
+    addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.4")
 
 ### Basic Configuration ###
 To add the cucumber plugin settings to a basic project, just add the following to the build.sbt file:
@@ -155,6 +155,9 @@ Current plan is to upgrade to the next major version of SBT and then to switch t
 
 ## Release History ##
 
+### 0.4 ###
+Updated to support xsbt 0.11.0 & scala 2.9.1
+
 ### 0.3 ###
 Bug fix to correct --names parameter which should in fact be --name. Thanks to https://github.com/zvozin for the patch.
 

.idea/scopes/scope_settings.xml

@@ -1,15 +1,16 @@
 name := "xsbt-cucumber-plugin"
 
-version := "0.3"
+version := "0.4"
 
 organization := "templemore"
 
-scalaVersion := "2.8.1"
+scalaVersion := "2.9.1"
 
 sbtPlugin := true
 
 libraryDependencies ++= Seq(
-	"org.scalatest" %% "scalatest" % "1.5" % "test"
+    "org.jruby" % "jruby-complete" % "1.6.4" % "test",
+	"org.scalatest" %% "scalatest" % "1.6.1" % "test"
 )
 
 publishTo := Some(Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString)))

README.markdown

@@ -1 +1 @@
-sbt.version=0.10.1
+sbt.version=0.11.0

build.sbt

@@ -7,7 +7,7 @@ import sbt._
  */
 trait JRubyDependencies {
 
-  private val jrubyVersion = "1.6.1"
+  private val jrubyVersion = "1.6.4"
   private val cuke4DukeVersion = "0.4.4"
   private val picoContainerVersion = "2.11.2"
 

project/build.properties

@@ -13,7 +13,7 @@ class GemInstallerSpec extends FlatSpec with MustMatchers with BeforeAndAfterEac
 
   private val jRubyHome = new File(System.getProperty("user.dir"), "target")
   private val gemDir = new File(jRubyHome, "gems")
-  private val jRubyJar = new File(System.getProperty("user.home")) / ".ivy2" / "cache" / "org.jruby" / "jruby-complete" / "jars" / "jruby-complete-1.6.1.jar"
+  private val jRubyJar = new File(System.getProperty("user.home")) / ".ivy2" / "cache" / "org.jruby" / "jruby-complete" / "jars" / "jruby-complete-1.6.4.jar"
 
   private val gemName = "json"
   private val gemVersion = "1.5.3"

src/main/scala/templemore/jruby/JRubyDependencies.scala

@@ -4,8 +4,8 @@ import templemore.xsbt.cucumber.CucumberPlugin
 
 object BuildSettings {
   val buildOrganization = "templemore"
-  val buildScalaVersion = "2.9.0-1"
-  val buildVersion      = "0.3"
+  val buildScalaVersion = "2.9.1"
+  val buildVersion      = "0.4"
 
   val buildSettings = Defaults.defaultSettings ++
                       Seq (organization := buildOrganization,
@@ -16,7 +16,7 @@ object BuildSettings {
 
 object Dependencies {
 
-  val scalaTest = 	"org.scalatest" % "scalatest_2.9.0" % "1.4.1" % "test"
+  val scalaTest = 	"org.scalatest" %% "scalatest" % "1.6.1" % "test"
 
   val testDeps = Seq(scalaTest)
 }

src/test/scala/templemore/jruby/GemInstallerSpec.scala

@@ -1,2 +1,2 @@
-sbt.version=0.10.1
+sbt.version=0.11.0
 

testProjects/multiModuleTestProject/project/Build.scala

@@ -1,3 +1,3 @@
 resolvers += Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString))
 
-libraryDependencies += "templemore" %% "xsbt-cucumber-plugin" % "0.3"
+addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.4")

testProjects/multiModuleTestProject/project/build.properties

@@ -1,13 +1,13 @@
 name := "test-project"
 
-version := "0.3"
+version := "0.4"
 
 organization := "templemore"
 
-scalaVersion := "2.9.0-1"
+scalaVersion := "2.9.1"
 
 libraryDependencies ++= Seq(
-	"org.scalatest" % "scalatest_2.9.0" % "1.4.1" % "test"
+	"org.scalatest" %% "scalatest" % "1.6.1" % "test"
 )
 
 seq(cucumberSettings : _*)

testProjects/multiModuleTestProject/project/plugins/build.sbt

@@ -1 +1 @@
-sbt.version=0.10.1
+sbt.version=0.11.0

testProjects/testProject/build.sbt

@@ -1,3 +1,3 @@
 resolvers += Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString))
 
-libraryDependencies += "templemore" %% "xsbt-cucumber-plugin" % "0.3"
+addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.4")