From 1ba642daf8ebe5ad2ad638f6fbf4aa4aa83aa0e9 Mon Sep 17 00:00:00 2001 From: Robin Verduijn Date: Mon, 17 Jun 2019 11:59:57 -0700 Subject: [PATCH] Fix it so Task options work under Gradle 5. The `Option` class has moved from `org.gradle.api.internal.tasks.options` to the `org.gradle.api.tasks.options` package. --- .../com/here/gradle/plugins/jobdsl/tasks/AbstractDslTask.groovy | 2 +- .../com/here/gradle/plugins/jobdsl/tasks/GenerateXmlTask.groovy | 2 +- .../here/gradle/plugins/jobdsl/tasks/UpdateJenkinsTask.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/AbstractDslTask.groovy b/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/AbstractDslTask.groovy index 3f05cae..4dcb8a8 100644 --- a/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/AbstractDslTask.groovy +++ b/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/AbstractDslTask.groovy @@ -23,7 +23,7 @@ import com.here.gradle.plugins.jobdsl.ServerDefinition import com.here.gradle.plugins.jobdsl.util.PathComparator import groovy.json.JsonBuilder import org.gradle.api.GradleException -import org.gradle.api.internal.tasks.options.Option +import org.gradle.api.tasks.options.Option import org.gradle.api.tasks.Internal import org.gradle.api.tasks.JavaExec import org.gradle.util.CollectionUtils diff --git a/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/GenerateXmlTask.groovy b/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/GenerateXmlTask.groovy index 7de0938..c32c656 100644 --- a/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/GenerateXmlTask.groovy +++ b/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/GenerateXmlTask.groovy @@ -19,7 +19,7 @@ package com.here.gradle.plugins.jobdsl.tasks -import org.gradle.api.internal.tasks.options.Option +import org.gradle.api.tasks.options.Option import org.gradle.api.tasks.Input import org.gradle.api.tasks.Optional diff --git a/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/UpdateJenkinsTask.groovy b/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/UpdateJenkinsTask.groovy index 3ae1e90..e348373 100644 --- a/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/UpdateJenkinsTask.groovy +++ b/plugin/src/main/groovy/com/here/gradle/plugins/jobdsl/tasks/UpdateJenkinsTask.groovy @@ -19,7 +19,7 @@ package com.here.gradle.plugins.jobdsl.tasks -import org.gradle.api.internal.tasks.options.Option +import org.gradle.api.tasks.options.Option import org.gradle.api.tasks.Input import org.gradle.api.tasks.Optional