Merge pull request #728 from mockito/ep

Make shipkit gradle 4.8 ready
mockito · Jun 30, 2018 · 98b9ff1 · 98b9ff1
2 parents 23d257f + 7253d8a
commit 98b9ff1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git 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.3'
     compile "com.gradle.publish:plugin-publish-plugin:0.9.7"
     compile 'com.googlecode.java-diff-utils:diffutils:1.3.0'
 

diff --git a/...cts/shipkit/src/main/groovy/org/shipkit/internal/gradle/bintray/ShipkitBintrayPlugin.java b/...cts/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;

diff --git 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
@@ -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.7.3"
-                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 {