Only initialise default jruby version in the project extension (#390)

ysb33r · ysb33r · commit ac7db6fe24e4 · 2019-12-20T18:06:40.000+01:00
diff --git a/base-plugin/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy b/base-plugin/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy
@@ -189,7 +189,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
      */
     @Deprecated
     String getJrubyVersion() {
-        deprecated('Use jruby.getJrubyVersion rather getJrubyVersion()')
+        deprecated('Use jruby.getJrubyVersion() rather getJrubyVersion()')
         jruby.jrubyVersion
     }
 
diff --git a/base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPluginExtension.groovy b/base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPluginExtension.groovy
@@ -60,6 +60,7 @@ class JRubyPluginExtension extends AbstractCombinedProjectTaskExtension {
      */
     JRubyPluginExtension(Project p) {
         super(p)
+        this.jrubyVersion = DEFAULT_JRUBY_VERSION
     }
 
     /** Task extension constructor
@@ -322,7 +323,7 @@ class JRubyPluginExtension extends AbstractCombinedProjectTaskExtension {
     }
 
     private static final String JRUBY_COMPLETE_DEPENDENCY = 'org.jruby:jruby-complete'
-    private Object jrubyVersion = DEFAULT_JRUBY_VERSION
+    private Object jrubyVersion
 
     private Provider<Configuration> gemConfiguration
     private String gemPrepareTaskName

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {`
`189`	`189`	`*/`
`190`	`190`	`@Deprecated`
`191`	`191`	`String getJrubyVersion() {`
`192`		`- deprecated('Use jruby.getJrubyVersion rather getJrubyVersion()')`
	`192`	`+ deprecated('Use jruby.getJrubyVersion() rather getJrubyVersion()')`
`193`	`193`	`jruby.jrubyVersion`
`194`	`194`	`}`
`195`	`195`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ class JRubyPluginExtension extends AbstractCombinedProjectTaskExtension {`
`60`	`60`	`*/`
`61`	`61`	`JRubyPluginExtension(Project p) {`
`62`	`62`	`super(p)`
	`63`	`+ this.jrubyVersion = DEFAULT_JRUBY_VERSION`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`/** Task extension constructor`
`@@ -322,7 +323,7 @@ class JRubyPluginExtension extends AbstractCombinedProjectTaskExtension {`
`322`	`323`	`}`
`323`	`324`
`324`	`325`	`private static final String JRUBY_COMPLETE_DEPENDENCY = 'org.jruby:jruby-complete'`
`325`		`- private Object jrubyVersion = DEFAULT_JRUBY_VERSION`
	`326`	`+ private Object jrubyVersion`
`326`	`327`
`327`	`328`	`private Provider<Configuration> gemConfiguration`
`328`	`329`	`private String gemPrepareTaskName`