Fixes #57, #58. Forces jar name. Upgrade to JRuby 1.7.16

ysb33r · ysb33r · commit d3f21d099ad6 · 2014-09-25T23:38:42.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -15,6 +15,7 @@ apply from: 'gradle/integration-tests.gradle'
 
 group = 'com.github.jruby-gradle'
 version = '0.1.3'
+archivesBaseName = 'jruby-gradle-plugin'
 
 if (System.env.RELEASE != '1') {
     version = "${version}-SNAPSHOT"
@@ -27,7 +28,7 @@ configurations {
 }
 
 ext {
-    jrubyVersion = '1.7.15'
+    jrubyVersion = '1.7.16'
     jrubyClassPathFromConfiguration = { Configuration cfg ->
         def f = cfg.files.find { it.name.startsWith('jruby-complete-') }
         return  f?.absolutePath
@@ -37,7 +38,6 @@ ext {
 project.afterEvaluate {
     test {
         systemProperties TEST_JRUBY_CLASSPATH: "${jrubyClassPathFromConfiguration(configurations.testJRubyPrepare)}"
-
     }
 }
 
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.15'
+    String defaultVersion = '1.7.16'
 
     /** Directory for jrubyPrepare to install .gem dependencies into
      *

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ apply from: 'gradle/integration-tests.gradle'`
`15`	`15`
`16`	`16`	`group = 'com.github.jruby-gradle'`
`17`	`17`	`version = '0.1.3'`
	`18`	`+archivesBaseName = 'jruby-gradle-plugin'`
`18`	`19`
`19`	`20`	`if (System.env.RELEASE != '1') {`
`20`	`21`	`version = "${version}-SNAPSHOT"`
`@@ -27,7 +28,7 @@ configurations {`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`ext {`
`30`		`- jrubyVersion = '1.7.15'`
	`31`	`+ jrubyVersion = '1.7.16'`
`31`	`32`	`jrubyClassPathFromConfiguration = { Configuration cfg ->`
`32`	`33`	`def f = cfg.files.find { it.name.startsWith('jruby-complete-') }`
`33`	`34`	`return f?.absolutePath`
`@@ -37,7 +38,6 @@ ext {`
`37`	`38`	`project.afterEvaluate {`
`38`	`39`	`test {`
`39`	`40`	`systemProperties TEST_JRUBY_CLASSPATH: "${jrubyClassPathFromConfiguration(configurations.testJRubyPrepare)}"`
`40`		`-`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
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.15'`
	`10`	`+ String defaultVersion = '1.7.16'`
`11`	`11`
`12`	`12`	`/** Directory for jrubyPrepare to install .gem dependencies into`
`13`	`13`	`*`