Fix compatibility with java gradle plugin and Gradle 4.8 (#243)

AlexeiVainshtein · eyalbe4 · commit 1e801c71f78f · 2018-06-18T08:46:41.000Z
* Issue 239 - Fix compatibility with java gradle plugin and Gradle 4.8

* Update version within build.gradle
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2"
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-currentVersion=1.8.1
+currentVersion=1.8.2
diff --git a/src/main/groovy/com/jfrog/bintray/gradle/BintrayPlugin.groovy b/src/main/groovy/com/jfrog/bintray/gradle/BintrayPlugin.groovy
@@ -10,7 +10,8 @@ class BintrayPlugin implements Plugin<Project> {
         if (project.getTasks().findByName(BintrayUploadTask.TASK_NAME) == null) {
             //Create and configure the task
             BintrayUploadTask bintrayUpload = project.task(type: BintrayUploadTask, BintrayUploadTask.TASK_NAME)
-            project.gradle.addListener(new ProjectsEvaluatedBuildListener(project, bintrayUpload))
+            bintrayUpload.project = project
+            project.gradle.addListener(new ProjectsEvaluatedBuildListener(bintrayUpload))
         }
 
         addBintrayUploadTask(project)
@@ -21,7 +22,8 @@ class BintrayPlugin implements Plugin<Project> {
                 // Reached this state means that the plugin is not enabled on the root project
                 BintrayUploadTask bintrayUploadRoot = project.getRootProject().task(type: BintrayUploadTask, BintrayUploadTask.TASK_NAME)
                 bintrayUploadRoot.setEnabled(false)
-                project.getRootProject().gradle.addListener(new ProjectsEvaluatedBuildListener(project.getRootProject(), bintrayUploadRoot))
+                bintrayUploadRoot.project = project.getRootProject()
+                project.getRootProject().gradle.addListener(new ProjectsEvaluatedBuildListener(bintrayUploadRoot))
                 project.getRootProject().getPluginManager().apply(BintrayPlugin.class)
             }
         }
diff --git a/src/main/groovy/com/jfrog/bintray/gradle/ProjectsEvaluatedBuildListener.groovy b/src/main/groovy/com/jfrog/bintray/gradle/ProjectsEvaluatedBuildListener.groovy
@@ -2,25 +2,27 @@ package com.jfrog.bintray.gradle
 
 import com.jfrog.bintray.gradle.tasks.BintrayPublishTask
 import com.jfrog.bintray.gradle.tasks.BintrayUploadTask
+import org.gradle.BuildAdapter
 import org.gradle.api.Project
 import org.gradle.api.ProjectEvaluationListener
 import org.gradle.api.ProjectState
 import org.gradle.api.Task
+import org.gradle.api.invocation.Gradle
 import org.gradle.api.publish.Publication
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.Upload
 
-class ProjectsEvaluatedBuildListener implements ProjectEvaluationListener {
-    private Project project
+import java.util.concurrent.ConcurrentHashMap
+
+class ProjectsEvaluatedBuildListener extends BuildAdapter implements ProjectEvaluationListener {
     private BintrayUploadTask bintrayUpload
-    private BintrayExtension extension
+    private final Set<BintrayUploadTask> bintrayUploadTasks = Collections.newSetFromMap(new ConcurrentHashMap<Task, Boolean>());
 
-    ProjectsEvaluatedBuildListener(Project project, BintrayUploadTask bintrayUpload) {
-        this.project = project
+    ProjectsEvaluatedBuildListener(BintrayUploadTask bintrayUpload) {
         this.bintrayUpload = bintrayUpload
-        extension = project.extensions.create("bintray", BintrayExtension, project)
-        extension.with {
+        this.bintrayUpload.extension = bintrayUpload.project.extensions.create("bintray", BintrayExtension, bintrayUpload.project)
+        this.bintrayUpload.extension.with {
             apiUrl = BintrayUploadTask.API_URL_DEFAULT
         }
     }
@@ -72,60 +74,67 @@ class ProjectsEvaluatedBuildListener implements ProjectEvaluationListener {
             ossCloseRepo = extension.pkg.version.mavenCentralSync.close
         }
 
-        if (extension.configurations?.length) {
-            extension.configurations.each {
-                def configuration = project.configurations.findByName(it)
-                if (!configuration) {
-                    project.logger.warn "Configuration ${it} specified but does not exist in project {}.",
-                            project.path
-                } else {
-                    bintrayUpload.dependsOn(configuration.allArtifacts)
-                }
-            }
-            Upload installTask = project.tasks.withType(Upload)?.findByName('install')
-            if (installTask) {
-                bintrayUpload.dependsOn(installTask)
-            } else {
-                project.logger.warn "Configuration(s) specified but the install task does not exist in project {}.",
-                        project.path
-            }
-        }
-        if (extension.publications?.length) {
-            def publicationExt = project.extensions.findByType(PublishingExtension)
-            if (!publicationExt) {
-                project.logger.warn "Publications(s) specified but no publications exist in project {}.",
-                        project.path
-            } else {
-                extension.publications.each {
-                    Publication publication = publicationExt?.publications?.findByName(it)
-                    if (!publication) {
-                        project.logger.warn 'Publication {} not found in project {}.', it, project.path
-                    } else if (publication instanceof MavenPublication) {
-                        def taskName =
-                                "publish${it[0].toUpperCase()}${it.substring(1)}PublicationToMavenLocal"
-                        bintrayUpload.dependsOn(taskName)
-                    } else {
-                        project.logger.warn "{} can only use maven publications - skipping {}.",
-                                bintrayUpload.path, publication.name
-                    }
-                }
-            }
-        }
+        bintrayUploadTasks.add(bintrayUpload)
 
-        Task deployTask = project.getRootProject().getTasks().findByName(BintrayPublishTask.TASK_NAME)
-        if (deployTask == null) {
+        Task bintrayPublish = bintrayUpload.project.getRootProject().getTasks().findByName(BintrayPublishTask.TASK_NAME)
+        if (bintrayPublish == null) {
             throw new IllegalStateException(String.format("Could not find %s in the root project", BintrayPublishTask.TASK_NAME))
         }
-        bintrayUpload.finalizedBy(deployTask)
+        bintrayUpload.finalizedBy(bintrayPublish)
         // Depend on tasks in sub-projects
-        project.subprojects.each {
+        bintrayUpload.project.subprojects.each {
             Task subTask = it.tasks.findByName(BintrayUploadTask.TASK_NAME)
             if (subTask) {
                 bintrayUpload.dependsOn(subTask)
             }
         }
-        if (extension.filesSpec) {
-            bintrayUpload.dependsOn(extension.filesSpec)
+        if (bintrayUpload.extension.filesSpec) {
+            bintrayUpload.dependsOn(bintrayUpload.extension.filesSpec)
+        }
+    }
+
+    @Override
+    void projectsEvaluated(Gradle gradle) {
+        for (BintrayUploadTask bintrayUpload : bintrayUploadTasks) {
+            if (bintrayUpload.extension.configurations?.length) {
+                bintrayUpload.extension.configurations.each {
+                    def configuration = bintrayUpload.project.configurations.findByName(it)
+                    if (!configuration) {
+                        bintrayUpload.project.logger.warn "Configuration ${it} specified but does not exist in project {}.",
+                                bintrayUpload.project.path
+                    } else {
+                        bintrayUpload.dependsOn(configuration.allArtifacts)
+                    }
+                }
+                Upload installTask = bintrayUpload.project.tasks.withType(Upload)?.findByName('install')
+                if (installTask) {
+                    bintrayUpload.dependsOn(installTask)
+                } else {
+                    bintrayUpload.project.logger.warn "Configuration(s) specified but the install task does not exist in project {}.",
+                            bintrayUpload.project.path
+                }
+            }
+            if (bintrayUpload.extension.publications?.length) {
+                def publicationExt = bintrayUpload.project.extensions.findByType(PublishingExtension)
+                if (!publicationExt) {
+                    bintrayUpload.project.logger.warn "Publications(s) specified but no publications exist in project {}.",
+                            bintrayUpload.project.path
+                } else {
+                    bintrayUpload.extension.publications.each {
+                        Publication publication = publicationExt?.publications?.findByName(it)
+                        if (!publication) {
+                            bintrayUpload.project.logger.warn 'Publication {} not found in project {}.', it, bintrayUpload.project.path
+                        } else if (publication instanceof MavenPublication) {
+                            def taskName =
+                                    "publish${it[0].toUpperCase()}${it.substring(1)}PublicationToMavenLocal"
+                            bintrayUpload.dependsOn(taskName)
+                        } else {
+                            bintrayUpload.project.logger.warn "{} can only use maven publications - skipping {}.",
+                                    bintrayUpload.path, publication.name
+                        }
+                    }
+                }
+            }
         }
     }
 }
diff --git a/src/main/groovy/com/jfrog/bintray/gradle/tasks/BintrayUploadTask.groovy b/src/main/groovy/com/jfrog/bintray/gradle/tasks/BintrayUploadTask.groovy
@@ -1,5 +1,6 @@
 package com.jfrog.bintray.gradle.tasks
 
+import com.jfrog.bintray.gradle.BintrayExtension
 import com.jfrog.bintray.gradle.BintrayHttpClientFactory
 import com.jfrog.bintray.gradle.BintrayPlugin
 import com.jfrog.bintray.gradle.Utils
@@ -11,6 +12,7 @@ import groovy.json.JsonBuilder
 import groovyx.net.http.HTTPBuilder
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
+import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.CopySpec
 import org.gradle.api.publish.Publication
@@ -31,6 +33,8 @@ class BintrayUploadTask extends DefaultTask {
     static final String GROUP = 'publishing'
     static final String DESCRIPTION = 'Publishes artifacts to bintray.com.'
     static final String API_URL_DEFAULT = 'https://api.bintray.com'
+    public BintrayExtension extension
+    public Project project
 
     private ConcurrentHashMap<String, Repository> repositories = new ConcurrentHashMap<>()
     private HTTPBuilder httpBuilder
diff --git a/src/test/groovy/com/jfrog/bintray/gradle/GradleBintrayPluginSpec.groovy b/src/test/groovy/com/jfrog/bintray/gradle/GradleBintrayPluginSpec.groovy
@@ -219,6 +219,32 @@ class GradleBintrayPluginSpec extends Specification {
         pkg.labels().sort() == config.pkgLabels.sort()
     }
 
+  def "[publicationWithJavaGradlePlugin]create package and version with publication"() {
+        when:
+        String version = PluginSpecUtils.createVersion()
+        versions.add(version)
+        savedVersion = version
+        String[] tasks = ["clean", "build", "bintrayUpload"]
+        def exitCode = PluginSpecUtils.launchGradle(testName.methodName, tasks, version)
+
+        then:
+        // Gradle build finished successfully:
+        exitCode == 0
+
+        String bintraySubject = getSubject()
+        checkExistence(bintraySubject, config.mavenRepo as String, config.pkgName as String, version)
+
+        when:
+        // Get the created package:
+        Pkg pkg = bintray.subject(bintraySubject).repository(config.mavenRepo)
+                .pkg(config.pkgName).get()
+
+        then:
+        pkg.name() == config.pkgName
+        pkg.description() == config.pkgDesc
+        pkg.labels().sort() == config.pkgLabels.sort()
+    }
+
     def "[publication]override"() {
         setup:
         String[] tasks = ["clean", "build", "bintrayUpload"]
diff --git 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.1"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2"
     }
 }
 
diff --git a/src/test/resources/gradle/projects/configurationWithSubModules/build.gradle b/src/test/resources/gradle/projects/configurationWithSubModules/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2"
     }
 }
 
diff --git 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.1"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2"
     }
 }
 
diff --git 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.1"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2"
     }
 }
 
diff --git a/src/test/resources/gradle/projects/publicationWithJavaGradlePlugin/build.gradle b/src/test/resources/gradle/projects/publicationWithJavaGradlePlugin/build.gradle
@@ -0,0 +1,113 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        jcenter()
+    }
+
+    dependencies {
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2"
+    }
+}
+
+def rootProjectDir = projectDir
+def testsDir = new File(rootProjectDir.getParentFile().getParentFile(), 'buildFiles')
+def projectUrl = 'https://github.com/bintray/gradle-bintray-plugin'
+
+def getTestFile = { fileName ->
+    testsDir.toString() + '/' + fileName
+}
+
+allprojects {
+    apply plugin: 'idea'
+    apply plugin: 'java-gradle-plugin'
+
+    group = pkgName
+    version = versionName
+}
+
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'maven-publish'
+    apply plugin: 'com.jfrog.bintray'
+
+    sourceCompatibility = 1.7
+    targetCompatibility = 1.7
+
+    dependencies {
+        testCompile 'junit:junit:4.7'
+    }
+
+    // custom tasks for creating source/javadoc jars
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
+    }
+
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        classifier = 'javadoc'
+        from javadoc.destinationDir
+    }
+
+    // add javadoc/source jar tasks as artifacts
+    artifacts {
+        archives sourcesJar, javadocJar
+    }
+
+    repositories {
+        jcenter()
+    }
+
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                if (plugins.hasPlugin('war')) {
+                    from components.web
+                } else {
+                    from components.java
+                }
+
+                artifact sourcesJar {
+                    classifier "sources"
+                }
+
+                artifact javadocJar {
+                    classifier "javadoc"
+                }
+
+                pom.withXml {
+                    asNode().children().last() + {
+                        resolveStrategy = Closure.DELEGATE_FIRST
+                        name 'project-name'
+                        description 'description for project'
+                        url projectUrl
+                        scm {
+                            url projectUrl
+                            connection projectUrl
+                            developerConnection projectUrl
+                        }
+                        licenses {
+                            license {
+                                name 'The Apache Software License, Version 2.0'
+                                url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                                distribution 'repo'
+                            }
+                        }
+                        developers {
+                            developer {
+                                id 'JFrog'
+                                name 'JFrogDev'
+                                email 'jfrogdev@jfrog.com'
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    apply from: getTestFile("${testName}.gradle")
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '1.10'
+}
diff --git a/src/test/resources/gradle/projects/publicationWithJavaGradlePlugin/gradlew b/src/test/resources/gradle/projects/publicationWithJavaGradlePlugin/gradlew
diff --git a/src/test/resources/gradle/projects/publicationWithJavaGradlePlugin/gradlew.bat b/src/test/resources/gradle/projects/publicationWithJavaGradlePlugin/gradlew.bat
diff --git a/src/test/resources/gradle/projects/publicationWithJavaGradlePlugin/settings.gradle b/src/test/resources/gradle/projects/publicationWithJavaGradlePlugin/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`	`10`	`classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1"`
`11`		`- classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0"`
	`11`	`+ classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2"`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-currentVersion=1.8.1`
	`1`	`+currentVersion=1.8.2`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ class BintrayPlugin implements Plugin<Project> {`
`10`	`10`	`if (project.getTasks().findByName(BintrayUploadTask.TASK_NAME) == null) {`
`11`	`11`	`//Create and configure the task`
`12`	`12`	`BintrayUploadTask bintrayUpload = project.task(type: BintrayUploadTask, BintrayUploadTask.TASK_NAME)`
`13`		`- project.gradle.addListener(new ProjectsEvaluatedBuildListener(project, bintrayUpload))`
	`13`	`+ bintrayUpload.project = project`
	`14`	`+ project.gradle.addListener(new ProjectsEvaluatedBuildListener(bintrayUpload))`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`addBintrayUploadTask(project)`
`@@ -21,7 +22,8 @@ class BintrayPlugin implements Plugin<Project> {`
`21`	`22`	`// Reached this state means that the plugin is not enabled on the root project`
`22`	`23`	`BintrayUploadTask bintrayUploadRoot = project.getRootProject().task(type: BintrayUploadTask, BintrayUploadTask.TASK_NAME)`
`23`	`24`	`bintrayUploadRoot.setEnabled(false)`
`24`		`- project.getRootProject().gradle.addListener(new ProjectsEvaluatedBuildListener(project.getRootProject(), bintrayUploadRoot))`
	`25`	`+ bintrayUploadRoot.project = project.getRootProject()`
	`26`	`+ project.getRootProject().gradle.addListener(new ProjectsEvaluatedBuildListener(bintrayUploadRoot))`
`25`	`27`	`project.getRootProject().getPluginManager().apply(BintrayPlugin.class)`
`26`	`28`	`}`
`27`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`jcenter()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1"`
	`7`	`+ classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1"`
	`8`	`+ classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2"`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`