Skip to content

Commit 5fb0846

Browse files
committed
Release 0.4. Upgrade to sbt 0.11.0, scala 2.9.1 and JRuby 1.6.4
1 parent 4e2dee5 commit 5fb0846

File tree

12 files changed

+19
-16
lines changed

12 files changed

+19
-16
lines changed

.idea/misc.xml

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/scopes/scope_settings.xml

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
xsbt-cucumber-plugin
22
====================
33

4-
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).
4+
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).
55

66
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:
77

build.sbt

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ scalaVersion := "2.9.1"
99
sbtPlugin := true
1010

1111
libraryDependencies ++= Seq(
12+
"org.jruby" % "jruby-complete" % "1.6.4" % "test",
1213
"org.scalatest" %% "scalatest" % "1.6.1" % "test"
1314
)
1415

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import sbt._
77
*/
88
trait JRubyDependencies {
99

10-
private val jrubyVersion = "1.6.1"
10+
private val jrubyVersion = "1.6.4"
1111
private val cuke4DukeVersion = "0.4.4"
1212
private val picoContainerVersion = "2.11.2"
1313

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class GemInstallerSpec extends FlatSpec with MustMatchers with BeforeAndAfterEac
1313

1414
private val jRubyHome = new File(System.getProperty("user.dir"), "target")
1515
private val gemDir = new File(jRubyHome, "gems")
16-
private val jRubyJar = new File(System.getProperty("user.home")) / ".ivy2" / "cache" / "org.jruby" / "jruby-complete" / "jars" / "jruby-complete-1.6.1.jar"
16+
private val jRubyJar = new File(System.getProperty("user.home")) / ".ivy2" / "cache" / "org.jruby" / "jruby-complete" / "jars" / "jruby-complete-1.6.4.jar"
1717

1818
private val gemName = "json"
1919
private val gemVersion = "1.5.3"

testProjects/multiModuleTestProject/project/Build.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import templemore.xsbt.cucumber.CucumberPlugin
44

55
object BuildSettings {
66
val buildOrganization = "templemore"
7-
val buildScalaVersion = "2.9.0-1"
8-
val buildVersion = "0.3"
7+
val buildScalaVersion = "2.9.1"
8+
val buildVersion = "0.4"
99

1010
val buildSettings = Defaults.defaultSettings ++
1111
Seq (organization := buildOrganization,
@@ -16,7 +16,7 @@ object BuildSettings {
1616

1717
object Dependencies {
1818

19-
val scalaTest = "org.scalatest" % "scalatest_2.9.0" % "1.4.1" % "test"
19+
val scalaTest = "org.scalatest" %% "scalatest" % "1.6.1" % "test"
2020

2121
val testDeps = Seq(scalaTest)
2222
}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sbt.version=0.10.1
1+
sbt.version=0.11.0
22

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
resolvers += Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString))
22

3-
libraryDependencies += "templemore" %% "xsbt-cucumber-plugin" % "0.3"
3+
addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.4")

testProjects/testProject/build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name := "test-project"
22

3-
version := "0.3"
3+
version := "0.4"
44

55
organization := "templemore"
66

7-
scalaVersion := "2.9.0-1"
7+
scalaVersion := "2.9.1"
88

99
libraryDependencies ++= Seq(
10-
"org.scalatest" % "scalatest_2.9.0" % "1.4.1" % "test"
10+
"org.scalatest" %% "scalatest" % "1.6.1" % "test"
1111
)
1212

1313
seq(cucumberSettings : _*)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.10.1
1+
sbt.version=0.11.0
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
resolvers += Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString))
22

3-
libraryDependencies += "templemore" %% "xsbt-cucumber-plugin" % "0.3"
3+
addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.4")

0 commit comments

Comments
 (0)