Merge pull request #125 from prokod/release/0.14.1

Release/0.14.1

Author: prokod

README.md

@@ -25,7 +25,7 @@
 
 ```groovy
 plugins {
-    id "com.github.prokod.gradle-crossbuild-scala" version "0.14.0"
+    id "com.github.prokod.gradle-crossbuild-scala" version "0.14.1"
 }
 ```
 
@@ -34,7 +34,7 @@ plugins {
 ```groovy
 buildscript {
     dependencies {
-        classpath("com.github.prokod:gradle-crossbuild-scala:0.14.0")
+        classpath("com.github.prokod:gradle-crossbuild-scala:0.14.1")
     }
 }
 ```
@@ -64,10 +64,13 @@ This is especially true for multi module projects but not just.<br/>
 
   > **NOTE:** cross build artifact naming is governed by `archive.appendixPattern` which by default is `_?` meaning for example, that module `lib` will be resolved to `lib_2.11`/`_2.12`/`...` according to the correlating `crossBuild {}` plugin dsl block
 
-- To test that everything works as expected, both `gradle build` (which also runs the tests) and `gradle publishToMavenLocal` (which goes from cross building, artifact creation and publishing) should succeed.
-
-  > **NOTE:** Look under ~/.m2/repository/... to assert the end result is the one you have wished for.<br/>
+- To test that everything works as expected:
+  1. `gradle build` - which runs build and tests for a single Scala version - default one.
+  1. `gradle crossBuildAssemble` - which builds ans assembles **all** cross build into respective artifacts.
+  1. `gradle publishToMavenLocal` - which goes from cross building, artifact creation (as above) and then publishing to local maven.
 
+  > **NOTE:** Look under `build/libs` , `~/.m2/repository/...` respectively, to assert the end result is the one you have wished for.  `crossBuildAssemble` task is available from version **`0.14.1`**
+  
 ### Multi-module projects and applying cross build plugin only for some
 
 From version **`0.11.x`** the plugin supports multi-module projects where **only** some modules have cross build plugin applied to.<br/>
@@ -379,7 +382,7 @@ dependencies {
 
 - **Cross building DSL programmatically** - In the next code snippet you can observe how programmatically we are generating cross builds using the plugin DSL.
 - **Extra properties per cross build** - Not only the cross building is described in a programmatic manner, you can also observe that specific unique meta data for each cross build permutation is generated using the plugin's `ext` entry
-  > **NOTE:** Supported in the plugin from version `0.14.x` onwards
+  > **NOTE:** The plugin injects a default extra property that holds the value of the respective Scala Compiler Version, named `scalaCompilerVersion`. This feature is supported in the plugin from version `0.14.x` onwards.
   
 ```groovy
 ...
@@ -567,7 +570,7 @@ apply plugin: 'com.github.prokod.gradle-crossbuild-scala'
 
 ```groovy
 plugins {
-    id "com.github.prokod.gradle-crossbuild-scala" version '0.14.0' apply false
+    id "com.github.prokod.gradle-crossbuild-scala" version '0.14.1' apply false
 }
 
 allprojects {

build.gradle

@@ -5,44 +5,34 @@ plugins {
 
 apply plugin: 'groovy'
 apply plugin: 'java-gradle-plugin'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply plugin: 'signing'
 apply plugin: 'codenarc'
 
 group = 'com.github.prokod'
-version = '0.14.0'
+version = '0.14.1'
 
 repositories {
     jcenter()
 }
 
-task javadocJar(type: Jar) {
-    classifier = 'javadoc'
-    from javadoc
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allSource
+    archiveClassifier = 'sources'
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
+task javadocJar(type: Jar) {
+    from javadoc
+    archiveClassifier = 'javadoc'
 }
 
 apply from: 'codecov.gradle'
 
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
-
 //Conditional Signing
 ext {
     isReleaseVersion = !version.endsWith("SNAPSHOT")
 }
 
-signing {
-    required { isReleaseVersion  && gradle.taskGraph.hasTask("uploadArchives") }
-    sign configurations.archives
-}
-
 dependencies {
     implementation gradleApi()
     implementation localGroovy()
@@ -84,46 +74,73 @@ pluginBundle {
     }
 }
 
-uploadArchives.repositories.mavenDeployer {
-    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-    snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-        authentication(userName: ossrhUsername, password: ossrhPassword)
-    }
-
-    repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-        authentication(userName: ossrhUsername, password: ossrhPassword)
-    }
-
-    pom.project {
-        name 'Gradle cross build (Scala) plugin'
-        packaging 'jar'
-        description 'Gradle cross build (Scala) plugin.'
-        url 'https://github.com/prokod/gradle-crossbuild-scala'
-        inceptionYear '2016'
-
-        scm {
-            developerConnection '[email protected]:prokod/gradle-crossbuild-scala.git'
-            connection 'git://github.com/prokod/gradle-crossbuild-scala.git'
-            url 'https://github.com/prokod/gradle-crossbuild-scala'
-        }
-
-        licenses {
-            license {
-                name 'Apache License 2.0'
-                url 'https://www.apache.org/licenses/LICENSE-2.0'
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifact sourcesJar {
+                classifier 'sources'
+            }
+            artifact javadocJar {
+                classifier 'javadoc'
+            }
+            versionMapping {
+                usage('java-api') {
+                    fromResolutionOf('runtimeClasspath')
+                }
+                usage('java-runtime') {
+                    fromResolutionResult()
+                }
+            }
+            pom {
+                name = 'Gradle cross build (Scala) plugin'
+                description = 'Gradle cross build (Scala) plugin.'
+                url = 'https://github.com/prokod/gradle-crossbuild-scala'
+                inceptionYear = '2016'
+                packaging = 'jar'
+
+                licenses {
+                    license {
+                        name = 'Apache License 2.0'
+                        url = 'https://www.apache.org/licenses/LICENSE-2.0'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'noamasor'
+                        name = 'Noam Asor'
+                        email = '[email protected]'
+                    }
+                }
+                scm {
+                    developerConnection = '[email protected]:prokod/gradle-crossbuild-scala.git'
+                    connection = 'git://github.com/prokod/gradle-crossbuild-scala.git'
+                    url = 'https://github.com/prokod/gradle-crossbuild-scala'
+                }
             }
         }
-        developers {
-            developer {
-                id 'noamasor'
-                name 'Noam Asor'
-                email '[email protected]'
+    }
+    repositories {
+        maven {
+            credentials {
+                username ossrhUsername
+                password ossrhPassword
             }
+            // change URLs to point to your repos, e.g. http://my.org/repo
+            def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
         }
     }
 }
 
+signing {
+    def required = { isReleaseVersion && gradle.taskGraph.hasTask("publish") }
+    if (required) {
+        sign publishing.publications.mavenJava
+    }
+}
+
 codenarc {
     toolVersion = "1.1"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

src/main/groovy/com/github/prokod/gradle/crossbuild/CrossBuildExtension.groovy

@@ -22,6 +22,7 @@ import com.github.prokod.gradle.crossbuild.model.BuildUpdateEventStore
 import com.github.prokod.gradle.crossbuild.model.DependencyLimitedInsight
 import com.github.prokod.gradle.crossbuild.model.EventType
 import com.github.prokod.gradle.crossbuild.model.ResolvedBuildAfterEvalLifeCycle
+import com.github.prokod.gradle.crossbuild.tasks.AbstractCrossBuildsReportTask
 import com.github.prokod.gradle.crossbuild.utils.LoggerUtils
 import org.gradle.api.Action
 import org.gradle.api.JavaVersion
@@ -148,7 +149,10 @@ class CrossBuildExtension {
             def (String sourceSetId, SourceSet sourceSet) =
                                     crossBuildSourceSets.findByName(rb.name)
 
+            def assembleTask = project.tasks.findByName("${AbstractCrossBuildsReportTask.BASE_TASK_NAME}Assemble")
             def scalaJar = createArtifact(sourceSet, rb)
+            assembleTask.dependsOn(scalaJar)
+
             // Runtime
             def outgoingConfigurationRuntime =
                     configureOutgoingConfiguration(sourceSet.getRuntimeElementsConfigurationName(),
@@ -183,8 +187,8 @@ class CrossBuildExtension {
     Jar createArtifact(SourceSet sourceSet, ResolvedBuildAfterEvalLifeCycle rb) {
         def scalaJar = project.tasks.create(sourceSet.getJarTaskName(), Jar) { Jar jar ->
             jar.group = BasePlugin.BUILD_GROUP
-            jar.description = 'Assembles a jar archive containing ' +
-                    "${rb.scalaVersionInsights.strippedArtifactInlinedVersion} classes"
+            jar.description = 'Assembles a jar archive containing the ' +
+                    "${sourceSet.name} classes"
             jar.archiveBaseName.set(archiveBaseName.get() + rb.archive.appendix)
             jar.from sourceSet.output
         }

src/main/groovy/com/github/prokod/gradle/crossbuild/CrossBuildPlugin.groovy

@@ -27,6 +27,7 @@ import com.github.prokod.gradle.crossbuild.utils.LoggerUtils
 import com.github.prokod.gradle.crossbuild.utils.SourceSetInsights
 import com.github.prokod.gradle.crossbuild.utils.ViewType
 import com.github.prokod.gradle.crossbuild.utils.UniSourceSetInsights
+import org.gradle.api.DefaultTask
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.publish.maven.tasks.GenerateMavenPom
 
@@ -72,6 +73,13 @@ class CrossBuildPlugin implements Plugin<Project> {
             t.description = 'Summary report for cross building resolved Configurations'
         }
 
+        project.task(type:DefaultTask,
+                "${AbstractCrossBuildsReportTask.BASE_TASK_NAME}Assemble") { DefaultTask t ->
+            t.description = 'Assembles all the ' +
+                    AbstractCrossBuildsReportTask.BASE_TASK_NAME + ' outputs of this project'
+            t.group = AbstractCrossBuildsReportTask.TASK_GROUP
+        }
+
         project.afterEvaluate {
             updateSourceBuildSourceSets(extension)
 

src/main/groovy/com/github/prokod/gradle/crossbuild/model/ExtUpdateEvent.groovy

@@ -26,7 +26,21 @@ class ExtUpdateEvent {
     final EventType eventType
 
     ExtUpdateEvent(Map<String, Object> source) {
-        this.source = source == null ? [:] : source.clone()
+        def clone = { Map<String, Object> orig ->
+            def cloneObject = { Object origObj ->
+                def bos = new ByteArrayOutputStream()
+                def oos = new ObjectOutputStream(bos)
+                oos.writeObject(origObj)
+                oos.flush()
+                def bin = new ByteArrayInputStream(bos.toByteArray())
+                def ois = new ObjectInputStream(bin)
+                ois.readObject()
+            }
+
+            orig.collect { new Tuple2<String, Object>(new String(it.key), cloneObject(it.value)) }.collectEntries()
+        }
+
+        this.source = source == null ? [:] : clone(source)
         this.eventType = EventType.EXT_UPDATE
     }
 }

src/test/groovy/com/github/prokod/gradle/crossbuild/CrossBuildPluginTest.groovy

@@ -63,6 +63,7 @@ crossBuild {
         result.output.contains("""
 Crossbuilding tasks
 -------------------
+crossBuildAssemble - Assembles all the crossBuild outputs of this project
 crossBuildResolvedConfigs - Summary report for cross building resolved Configurations
 crossBuildResolvedDsl - Summary report for cross building resolved Dsl
 """)
@@ -435,21 +436,21 @@ crossBuild {
         then:
         result.output.contains("""
 crossBuildSpark24_211Classes - Assembles cross build spark24 211 classes.
-crossBuildSpark24_211Jar - Assembles a jar archive containing 211 classes
+crossBuildSpark24_211Jar - Assembles a jar archive containing the crossBuildSpark24_211 classes
 crossBuildSpark24_212Classes - Assembles cross build spark24 212 classes.
-crossBuildSpark24_212Jar - Assembles a jar archive containing 212 classes
+crossBuildSpark24_212Jar - Assembles a jar archive containing the crossBuildSpark24_212 classes
 crossBuildV210Classes - Assembles cross build v210 classes.
-crossBuildV210Jar - Assembles a jar archive containing 210 classes
+crossBuildV210Jar - Assembles a jar archive containing the crossBuildV210 classes
 crossBuildV211_211Classes - Assembles cross build v211 211 classes.
-crossBuildV211_211Jar - Assembles a jar archive containing 211 classes
+crossBuildV211_211Jar - Assembles a jar archive containing the crossBuildV211_211 classes
 crossBuildV211_212Classes - Assembles cross build v211 212 classes.
-crossBuildV211_212Jar - Assembles a jar archive containing 212 classes
+crossBuildV211_212Jar - Assembles a jar archive containing the crossBuildV211_212 classes
 crossBuildV211_A_211Classes - Assembles cross build v211 a 211 classes.
-crossBuildV211_A_211Jar - Assembles a jar archive containing 211 classes
+crossBuildV211_A_211Jar - Assembles a jar archive containing the crossBuildV211_A_211 classes
 crossBuildV212_213Classes - Assembles cross build v212 213 classes.
-crossBuildV212_213Jar - Assembles a jar archive containing 213 classes
+crossBuildV212_213Jar - Assembles a jar archive containing the crossBuildV212_213 classes
 crossBuildV213Classes - Assembles cross build v213 classes.
-crossBuildV213Jar - Assembles a jar archive containing 213 classes
+crossBuildV213Jar - Assembles a jar archive containing the crossBuildV213 classes
 """)
         result.task(":tasks").outcome == SUCCESS