From 8489aa8c20ac50ca4d6bbce03bca27484b90e4a6 Mon Sep 17 00:00:00 2001 From: epeee Date: Wed, 27 Jun 2018 19:03:32 +0200 Subject: [PATCH 1/3] Make shipkit gradle 4.8 ready - make use of gradle-bintray-plugin v1.8.1 --- subprojects/shipkit/shipkit.gradle | 2 +- .../shipkit/internal/gradle/bintray/ShipkitBintrayPlugin.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/subprojects/shipkit/shipkit.gradle b/subprojects/shipkit/shipkit.gradle index a9ad93d0..e1fd66dc 100644 --- a/subprojects/shipkit/shipkit.gradle +++ b/subprojects/shipkit/shipkit.gradle @@ -20,7 +20,7 @@ dependencies { compile gradleApi() compile "com.github.cliftonlabs:json-simple:2.1.2" - compile 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0' + compile 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1' compile "com.gradle.publish:plugin-publish-plugin:0.9.7" compile 'com.googlecode.java-diff-utils:diffutils:1.3.0' diff --git a/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/bintray/ShipkitBintrayPlugin.java b/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/bintray/ShipkitBintrayPlugin.java index e44afb6e..88c529d5 100644 --- a/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/bintray/ShipkitBintrayPlugin.java +++ b/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/bintray/ShipkitBintrayPlugin.java @@ -1,8 +1,8 @@ package org.shipkit.internal.gradle.bintray; -import com.jfrog.bintray.gradle.Artifact; import com.jfrog.bintray.gradle.BintrayExtension; -import com.jfrog.bintray.gradle.BintrayUploadTask; +import com.jfrog.bintray.gradle.tasks.BintrayUploadTask; +import com.jfrog.bintray.gradle.tasks.entities.Artifact; import org.gradle.api.GradleException; import org.gradle.api.Plugin; import org.gradle.api.Project; From 9ec24a537a5b1664f9adaf3533ed86eb25f0358d Mon Sep 17 00:00:00 2001 From: epeee Date: Wed, 27 Jun 2018 19:15:04 +0200 Subject: [PATCH 2/3] fix integration tests --- .../test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy | 1 + .../shipkit/src/test/groovy/testutil/GradleSpecification.groovy | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy b/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy index 24860e4e..30824bb9 100644 --- a/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy +++ b/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy @@ -82,6 +82,7 @@ class ShipkitJavaIntegTest extends GradleSpecification { :performGitPush :api:bintrayUpload :impl:bintrayUpload +:bintrayPublish :performRelease""" where: diff --git a/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy b/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy index 40907820..e13269d2 100644 --- a/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy +++ b/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy @@ -33,7 +33,7 @@ abstract class GradleSpecification extends Specification implements GradleVersio classpath files("${CLASSES_DIR}") classpath files("${RESOURCES_DIR}") classpath "com.github.cliftonlabs:json-simple:2.1.2" - classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3" + classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1" classpath "com.gradle.publish:plugin-publish-plugin:0.9.6" } From 7253d8a06a82cd24540b733d87f069246ffaae3a Mon Sep 17 00:00:00 2001 From: epeee Date: Wed, 27 Jun 2018 20:14:04 +0200 Subject: [PATCH 3/3] update gradle-bintray-plugin (v1.8.3) --- subprojects/shipkit/shipkit.gradle | 2 +- .../src/test/groovy/testutil/GradleSpecification.groovy | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/subprojects/shipkit/shipkit.gradle b/subprojects/shipkit/shipkit.gradle index e1fd66dc..663e144a 100644 --- a/subprojects/shipkit/shipkit.gradle +++ b/subprojects/shipkit/shipkit.gradle @@ -20,7 +20,7 @@ dependencies { compile gradleApi() compile "com.github.cliftonlabs:json-simple:2.1.2" - compile 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1' + compile 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.3' compile "com.gradle.publish:plugin-publish-plugin:0.9.7" compile 'com.googlecode.java-diff-utils:diffutils:1.3.0' diff --git a/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy b/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy index e13269d2..a522d4b6 100644 --- a/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy +++ b/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy @@ -33,8 +33,8 @@ abstract class GradleSpecification extends Specification implements GradleVersio classpath files("${CLASSES_DIR}") classpath files("${RESOURCES_DIR}") classpath "com.github.cliftonlabs:json-simple:2.1.2" - classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1" - classpath "com.gradle.publish:plugin-publish-plugin:0.9.6" + classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.3" + classpath "com.gradle.publish:plugin-publish-plugin:0.9.7" } repositories {