diff --git a/.travis.yml b/.travis.yml index b78de49..ad784ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ cache: - $HOME/.gradle jdk: -- oraclejdk8 +- openjdk8 script: - ./gradlew ci --stacktrace diff --git a/build.gradle b/build.gradle index de2187b..3a2994b 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ group = 'com.moowork.gradle' apply plugin: 'idea' apply plugin: 'groovy' -apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: 'java-gradle-plugin' apply from: "$rootDir/gradle/additional-artifacts.gradle" @@ -23,15 +22,15 @@ repositories { } configurations { - integTestCompile.extendsFrom testCompile - integTestRuntime.extendsFrom testRuntime + integTestCompile.extendsFrom testCompileClasspath + integTestRuntime.extendsFrom testRuntimeClasspath } dependencies { - compile gradleApi() - testCompile 'cglib:cglib-nodep:3.2.4' - testCompile 'org.apache.commons:commons-io:1.3.2' - testCompile( 'org.spockframework:spock-core:1.0-groovy-2.4' ) { + implementation gradleApi() + testImplementation 'cglib:cglib-nodep:3.2.4' + testImplementation 'org.apache.commons:commons-io:1.3.2' + testImplementation( 'org.spockframework:spock-core:1.0-groovy-2.4' ) { exclude group: 'org.codehaus.groovy' } } diff --git a/gradle/buildscript.gradle b/gradle/buildscript.gradle index 366e3c5..df282d7 100644 --- a/gradle/buildscript.gradle +++ b/gradle/buildscript.gradle @@ -7,5 +7,5 @@ repositories { dependencies { classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' - classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.4.0' + classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.9' } diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle index 98040f2..6d5968e 100644 --- a/gradle/publishing.gradle +++ b/gradle/publishing.gradle @@ -1,4 +1,3 @@ -apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: 'com.jfrog.artifactory' apply plugin: 'com.jfrog.bintray' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 02b1692..8f6887d 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-5.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/src/main/groovy/com/moowork/gradle/node/npm/NpmSetupTask.groovy b/src/main/groovy/com/moowork/gradle/node/npm/NpmSetupTask.groovy index 1e1d5ac..7ec6ed8 100644 --- a/src/main/groovy/com/moowork/gradle/node/npm/NpmSetupTask.groovy +++ b/src/main/groovy/com/moowork/gradle/node/npm/NpmSetupTask.groovy @@ -21,6 +21,7 @@ class NpmSetupTask private NodeExtension config + @Internal protected List args = [] private ExecResult result @@ -81,7 +82,6 @@ class NpmSetupTask return this.args } - @Internal void setArgs( final Iterable value ) { this.args = value.toList() diff --git a/src/main/groovy/com/moowork/gradle/node/task/SetupTask.groovy b/src/main/groovy/com/moowork/gradle/node/task/SetupTask.groovy index 417199c..7242af2 100644 --- a/src/main/groovy/com/moowork/gradle/node/task/SetupTask.groovy +++ b/src/main/groovy/com/moowork/gradle/node/task/SetupTask.groovy @@ -9,6 +9,7 @@ import org.gradle.api.tasks.Input import org.gradle.api.tasks.Internal import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.TaskAction +import org.gradle.util.GradleVersion import java.nio.file.Files import java.nio.file.Path @@ -177,11 +178,27 @@ class SetupTask this.project.repositories.clear() def distUrl = this.config.distBaseUrl - this.repo = this.project.repositories.ivy { - url distUrl - layout 'pattern', { - artifact 'v[revision]/[artifact](-v[revision]-[classifier]).[ext]' - ivy 'v[revision]/ivy.xml' + if(GradleVersion.current().baseVersion >= GradleVersion.version('5.0').baseVersion) { + this.repo = this.project.repositories.ivy { + url distUrl + patternLayout { + artifact 'v[revision]/[artifact](-v[revision]-[classifier]).[ext]' + ivy 'v[revision]/ivy.xml' + } + metadataSources { + artifact() + } + } + } else { + this.repo = this.project.repositories.ivy { + url distUrl + layout 'pattern', { + artifact 'v[revision]/[artifact](-v[revision]-[classifier]).[ext]' + ivy 'v[revision]/ivy.xml' + } + metadataSources { + artifact() + } } } }