From 27ec0761d01d9685c094009f79abad1033e0f95d Mon Sep 17 00:00:00 2001 From: "R. Tyler Croy" Date: Thu, 10 Sep 2015 16:03:57 -0700 Subject: [PATCH] Upgrade to jruby/gradle core 1.0.4 with some more recent bugfixes This commit also changes JRubyStormJar a bit to override properties now that they are properly overwritable in 1.0.4 Fixes #22 --- gradle.properties | 2 +- .../jrubygradle/storm/internal/JRubyStormJar.groovy | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index a05e22e..3cc6a80 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ bintrayKey= sourceCompatibility=1.7 targetCompatibility=1.7 -jrubyGradleMinVersion=1.0.3 +jrubyGradleMinVersion=1.0.4 diff --git a/src/main/groovy/com/github/jrubygradle/storm/internal/JRubyStormJar.groovy b/src/main/groovy/com/github/jrubygradle/storm/internal/JRubyStormJar.groovy index 76952f4..e4840b2 100644 --- a/src/main/groovy/com/github/jrubygradle/storm/internal/JRubyStormJar.groovy +++ b/src/main/groovy/com/github/jrubygradle/storm/internal/JRubyStormJar.groovy @@ -31,11 +31,17 @@ class JRubyStormJar extends JRubyJar { return '1.7.22' } - String mainClass = REDSTORM_MAIN + @Override + String getMainClass() { + return REDSTORM_MAIN + } @Override String getConfiguration() { - return parentTask.configuration.name + if (parentTask) { + return parentTask.configuration.name + } + return JRubyStorm.DEFAULT_CONFIGURATION_NAME } JRubyStormJar() {