Merge pull request #55 from rtyler/jruby-15-upgrade

ysb33r · ysb33r · commit 0c315922e93f · 2014-09-04T08:54:05.000+01:00
Upgrade the default JRuby version to 1.7.15
diff --git a/build.gradle b/build.gradle
@@ -39,7 +39,7 @@ project.afterEvaluate {
 // --- up to here
 
 dependencies {
-    testJRubyPrepare 'org.jruby:jruby-complete:1.7.14'
+    testJRubyPrepare 'org.jruby:jruby-complete:1.7.15'
 }
 
 
diff --git a/src/main/groovy/com/github/jrubygradle/JRubyPluginExtension.groovy b/src/main/groovy/com/github/jrubygradle/JRubyPluginExtension.groovy
@@ -7,7 +7,7 @@ class JRubyPluginExtension {
     /** The default version of jruby that will be used by jrubyWar
      *
      */
-    String defaultVersion = '1.7.14'
+    String defaultVersion = '1.7.15'
 
     /** Directory for jrubyPrepare to install .gem dependencies into
      *

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ project.afterEvaluate {`
`39`	`39`	`// --- up to here`
`40`	`40`
`41`	`41`	`dependencies {`
`42`		`- testJRubyPrepare 'org.jruby:jruby-complete:1.7.14'`
	`42`	`+ testJRubyPrepare 'org.jruby:jruby-complete:1.7.15'`
`43`	`43`	`}`
`44`	`44`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class JRubyPluginExtension {`
`7`	`7`	`/** The default version of jruby that will be used by jrubyWar`
`8`	`8`	`*`
`9`	`9`	`*/`
`10`		`- String defaultVersion = '1.7.14'`
	`10`	`+ String defaultVersion = '1.7.15'`
`11`	`11`
`12`	`12`	`/** Directory for jrubyPrepare to install .gem dependencies into`
`13`	`13`	`*`