diff --git a/gradle.properties b/gradle.properties index 57cfbbd..6d31b98 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -currentVersion=1.8.0 +currentVersion=1.8.1-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a13e64..d406239 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip diff --git a/src/main/groovy/com/jfrog/bintray/gradle/BintrayExtension.groovy b/src/main/groovy/com/jfrog/bintray/gradle/BintrayExtension.groovy index acf0373..eacbb6a 100644 --- a/src/main/groovy/com/jfrog/bintray/gradle/BintrayExtension.groovy +++ b/src/main/groovy/com/jfrog/bintray/gradle/BintrayExtension.groovy @@ -1,7 +1,7 @@ package com.jfrog.bintray.gradle -import org.gradle.api.Action import org.gradle.api.Project +import org.gradle.util.ConfigureUtil class BintrayExtension { @@ -31,13 +31,13 @@ class BintrayExtension { this.project = project } - def pkg(Action action) { - action.execute(pkg) + def pkg(Closure closure) { + ConfigureUtil.configure(closure, pkg) } - def filesSpec(Action action) { - filesSpec = project.tasks.create(RecordingCopyTask.NAME, RecordingCopyTask) - action.execute(filesSpec) + def filesSpec(Closure closure) { + filesSpec = project.task(type: RecordingCopyTask, RecordingCopyTask.NAME) + ConfigureUtil.configure(closure, filesSpec) filesSpec.outputs.upToDateWhen { false } } @@ -58,13 +58,13 @@ class BintrayExtension { Map attributes VersionConfig version = new VersionConfig() - def version(Action action) { - action.execute(version) + def version(Closure closure) { + ConfigureUtil.configure(closure, version) } DebianConfig debian = new DebianConfig() - def debian(Action action) { - action.execute(debian) + def debian(Closure closure) { + ConfigureUtil.configure(closure, debian) } } @@ -82,13 +82,13 @@ class BintrayExtension { Map attributes GpgConfig gpg = new GpgConfig() - def gpg(Action action) { - action.execute(gpg) + def gpg(Closure closure) { + ConfigureUtil.configure(closure, gpg) } MavenCentralSyncConfig mavenCentralSync = new MavenCentralSyncConfig() - def mavenCentralSync(Action action) { - action.execute(mavenCentralSync) + def mavenCentralSync(Closure closure) { + ConfigureUtil.configure(closure, mavenCentralSync) } } @@ -103,4 +103,4 @@ class BintrayExtension { String password String close } -} +} \ No newline at end of file diff --git a/src/test/resources/gradle/projects/configuration/build.gradle b/src/test/resources/gradle/projects/configuration/build.gradle index 4fd4358..9aa496f 100644 --- a/src/test/resources/gradle/projects/configuration/build.gradle +++ b/src/test/resources/gradle/projects/configuration/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0-SNAPSHOT" + classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1-SNAPSHOT" } } diff --git a/src/test/resources/gradle/projects/fileSpec/build.gradle b/src/test/resources/gradle/projects/fileSpec/build.gradle index 5623a91..42ee995 100644 --- a/src/test/resources/gradle/projects/fileSpec/build.gradle +++ b/src/test/resources/gradle/projects/fileSpec/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0-SNAPSHOT" + classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1-SNAPSHOT" } } diff --git a/src/test/resources/gradle/projects/publication/build.gradle b/src/test/resources/gradle/projects/publication/build.gradle index f0f142a..6951d0d 100644 --- a/src/test/resources/gradle/projects/publication/build.gradle +++ b/src/test/resources/gradle/projects/publication/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0-SNAPSHOT" + classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1-SNAPSHOT" } }