Merge pull request #348 from rtyler/gradle-4.10.2

rtyler · web-flow · commit d6c78b6eed0a · 2019-05-13T07:11:44.000-07:00
Upgrade the project to the latest Gradle 4 available.
diff --git a/base-plugin/src/test/groovy/com/github/jrubygradle/JRubyExecSpec.groovy b/base-plugin/src/test/groovy/com/github/jrubygradle/JRubyExecSpec.groovy
@@ -46,7 +46,7 @@ class JRubyExecSpec extends Specification {
         badProject.task('bad', type: JRubyExec)
 
         then: "An exception should be thrown"
-        thrown(TaskInstantiationException)
+        thrown(org.gradle.api.internal.tasks.DefaultTaskContainer.TaskCreationException)
     }
 
     void "Do not allow args to be set directly"() {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class JRubyExecSpec extends Specification {`
`46`	`46`	`badProject.task('bad', type: JRubyExec)`
`47`	`47`
`48`	`48`	`then: "An exception should be thrown"`
`49`		`- thrown(TaskInstantiationException)`
	`49`	`+ thrown(org.gradle.api.internal.tasks.DefaultTaskContainer.TaskCreationException)`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`void "Do not allow args to be set directly"() {`