Merge pull request #27 from getyoti/YM-26133_V2

[YM-26133] Update publication scripts

Author: mariasenosiain

.github/workflows/publish.yml

@@ -74,7 +74,7 @@ jobs:
         sonatypePassword: ${{ secrets.sonatypePassword }}
         signingKey: ${{ secrets.signingPrivateKey }}
         signingPassword: ${{ secrets.signingPrivateKeyPassword }}
-      run: ./gradlew publishAarReleasePublicationToMavenCentralRepository closeAndReleaseRepository -PsonatypeUsername="$sonatypeUsername" -PsonatypePassword="$sonatypePassword" -PinMemorySigningKey="$signingKey" -PinMemoryKeyPassword="$signingPassword" --no-daemon
+      run: ./gradlew publishAarReleasePublicationToSonatype closeAndReleaseRepository -PsonatypeUsername="$sonatypeUsername" -PsonatypePassword="$sonatypePassword" -PinMemorySigningKey="$signingKey" -PinMemoryKeyPassword="$signingPassword" --no-daemon
 
   tag:
     runs-on: ubuntu-latest

build.gradle

@@ -6,13 +6,14 @@ buildscript {
         jcenter()
         google()
         mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath "de.marcphilipp.gradle:nexus-publish-plugin:0.4.0"
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.20.0"
     }
 }
-
 apply plugin: 'io.codearte.nexus-staging'
 
 

gradle.properties

@@ -57,6 +57,7 @@ pomId=yoti-button-sdk
 pomGroup=com.yoti.mobile.android.sdk
 pomPackaging=aar
 pomVersion=1.3.3
+pomName=Yoti Button SDK
 pomDescription=Button SDK that allows 3rd party to trigger Yoti as support app
 currentVersionCode=000013
 

publish-aar.gradle

@@ -1,4 +1,4 @@
-//Version 2.1.1
+//Version 2.2.2
 buildscript {
     repositories {
         mavenCentral()
@@ -57,17 +57,24 @@ project.afterEvaluate {
 
             def allTaskNames
 
+            def includeDebug = project.hasProperty('publishReleaseOnly') ?
+                    !Boolean.valueOf(publishReleaseOnly) : true
+
             if (project.hasProperty('productFlavors')) {
                 def parts = productFlavors.split(",")
                 allTaskNames = new ArrayList<?>(parts.length * 2)
                 for (part in parts) {
-                    allTaskNames.add(tasksContainer.getByName("bundle${part.capitalize()}DebugAar"))
+                    if (includeDebug) {
+                        allTaskNames.add(tasksContainer.getByName("bundle${part.capitalize()}DebugAar"))
+                    }
                     allTaskNames.add(tasksContainer.getByName("bundle${part.capitalize()}ReleaseAar"))
                 }
             } else {
                 allTaskNames = new ArrayList<?>(2)
                 allTaskNames.add(tasksContainer.getByName("bundleReleaseAar"))
-                allTaskNames.add(tasksContainer.getByName("bundleDebugAar"))
+                if (includeDebug) {
+                    allTaskNames.add(tasksContainer.getByName("bundleDebugAar"))
+                }
             }
 
 
@@ -252,24 +259,21 @@ project.afterEvaluate {
 
                         def scopes = ["compile", "api", "implementation"]
                         for (scope in scopes) {
-                            for (conf in configurations) {
-                                def confName = conf.name.toLowerCase()
-
-                                if (confName.endsWith(scope) &&
-                                        !confName.contains("test") &&
-                                        !confName.contains("metadata") &&
-                                        !confName.contains("android") &&
-                                        !confName.contains("dependencies") && (
-
-                                        // Only consider the debug dependencies for debug publication
-                                        // equally release for release or normal (neither debug,
-                                        // nor release)
-                                        (buildTypeLower == "debug" && confName.contains('debug')) ||
-                                                (buildTypeLower == "release" && confName.contains('release')) ||
-                                                (!confName.contains('debug') && !confName.contains('release'))
-                                )
-                                ) {
-                                    conf.getDependencies().each { dep ->
+                            def scopeConfigurations = new ArrayList<String>(4)
+                            //api
+                            scopeConfigurations.add(scope)
+                            //debugApi
+                            scopeConfigurations.add(buildTypeLower + scope.capitalize())
+                            if (!productFlavorLower.empty) {
+                                //stagingApi
+                                scopeConfigurations.add(productFlavorLower + scope.capitalize())
+                                //stagingDebugApi
+                                scopeConfigurations.add(productFlavorLower + buildTypeLower.capitalize() + scope.capitalize())
+                            }
+
+                            for (confName in scopeConfigurations) {
+                                configurations.getByName(confName) {
+                                    getDependencies().each { dep ->
                                         //Ignore kotlin transitive dependencies as they will be applied
                                         // by the kotlin plugin
                                         if (!(dep.group == "org.jetbrains.kotlin" &&
@@ -398,8 +402,11 @@ class ArtefactFlavorConf {
 
     // Allow the definition to be only artefact name-based
     boolean isArtefact(PropertyDependency dependency) {
-        return (artefact == dependency || (artefact.isNameOnly() && artefact.name == dependency.name)) ||
-                isForAllArtefacts()
+        return (artefact == dependency || isNamedArtefact(dependency.name))
+    }
+
+    boolean isNamedArtefact(String name) {
+        return (artefact.isNameOnly() && artefact.name == name) || iusForAllArtefacts()
     }
 
     boolean hasFlavor(String flavorName) {
@@ -435,6 +442,21 @@ class ArtefactFlavorProperties {
         configuration = []
     }
 
+    boolean ignoreFlavorFor(ProjectDependency dependency, String flavor) {
+        if (flavor.empty) {
+            //No flavours in project, treat this as ignored
+            return true
+        }
+
+        for (ArtefactFlavorConf conf : configuration) {
+            if (conf.isNamedArtefact(dependency.name) && conf.hasFlavor(flavor)){
+                return true
+            }
+        }
+
+        return false
+    }
+
     boolean ignoreFlavorFor(PropertyDependency dependency, String flavor){
         if (flavor.empty) {
             //No flavours in project, treat this as ignored

publish-maven.gradle

@@ -1,34 +1,35 @@
-//Version 2.1.0
-apply from: "$rootDir/publish-aar.gradle"
+//Version 3.0.1
+if (project.hasProperty('publicationGradleFileUrl')) {
+    apply from: publicationGradleFileUrl
+} else {
+    apply from: "$rootDir/publish-aar.gradle"
+}
 
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
+apply plugin: 'de.marcphilipp.nexus-publish'
 
 nexusStaging {
     // this package group has to be this one so that all yoti publication there are under the same group
     packageGroup = "com.yoti"
 
     username = sonatypeUsername
     password = sonatypePassword
+
+    delayBetweenRetriesInMillis = 15000
 }
 
-project.afterEvaluate {
-    publishing {
-        repositories {
-            maven {
-                def repoUrl = project.hasProperty('ossrhRepository') ?
-                        ossrhRepository : "https://oss.sonatype.org/service/local/staging/deploy/maven2"
-
-                name = "mavenCentral"
-                url = repoUrl
-                credentials {
-                    username = sonatypeUsername
-                    password = sonatypePassword
-                }
-            }
-        }
+import java.time.Duration
+
+nexusPublishing {
+    repositories {
+        sonatype()
     }
+    connectTimeout = Duration.ofMinutes(5)
+    clientTimeout = Duration.ofMinutes(10)
+}
 
+project.afterEvaluate {
     signing {
         def performSigning = !(project.hasProperty('disableSigning') ?
                 Boolean.valueOf(disableSigning) : false)