Merge pull request #142 from novoda/update-gradle-4

Gets the plugin working with the latest versions of Gradle

README.md

@@ -36,7 +36,7 @@ publish {
     userOrg = 'novoda'
     groupId = 'com.novoda'
     artifactId = 'bintray-release'
-    publishVersion = '0.3.4'
+    publishVersion = '0.6.1'
     desc = 'Oh hi, this is a nice description for a project, right?'
     website = 'https://github.com/novoda/bintray-release'
 }

build.gradle

@@ -1,16 +1,9 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
-        classpath 'com.novoda:bintray-release:0.4.0'
-    }
-}
+
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
-    version = "0.5.0"
+    version = "0.6.1"
 }

core/build.gradle

@@ -2,10 +2,27 @@ apply plugin: 'com.novoda.bintray-release'
 apply plugin: 'groovy'
 apply plugin: 'maven'
 
+buildscript {
+    repositories {
+        jcenter()
+        google()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.novoda:bintray-release:0.6.0'
+    }
+}
+
+repositories {
+    google()
+    jcenter()
+}
+
+
 dependencies {
     compile gradleApi()
     compile localGroovy()
-    compile 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.2'
+    compile 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
 
     testCompile gradleTestKit()
     testCompile 'junit:junit:4.12'

core/src/test/groovy/com/novoda/gradle/release/TestBintrayUploadTask.groovy

@@ -1,18 +1,30 @@
 package com.novoda.gradle.release
 
 import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.BuildTask
 import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.TaskOutcome
 import org.junit.Test
 
-import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
-
 public class TestBintrayUploadTask {
 
     @Test
     public void testBintrayUploadTask() {
         BuildResult result = runTasksOnBintrayReleasePlugin('-PbintrayUser=U', '-PbintrayKey=K', "bintrayUpload")
 
-        assert result.tasks(SUCCESS).collect { it.path }.contains(":core:bintrayUpload")
+        TaskOutcome success = TaskOutcome.SUCCESS
+        List<BuildTask> tasks = result.tasks(success)
+
+        List<String> successfulTaskPaths = new ArrayList<>();
+        for (BuildTask task : tasks) {
+            successfulTaskPaths.add(task.path)
+        }
+//        List<BuildTask> successfulTasks = tasks.collect {
+//            BuildTask buildTask = it
+//            String path = buildTask.path
+//            return path
+//        }
+        assert successfulTaskPaths.contains(":bintrayUpload")
         assert result.getOutput().contains("BUILD SUCCESSFUL")
     }
 

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-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip