Merge pull request #404 from CAAPIM/maven_publish_changes

Maven publish changes

Author: arindamhit

build.gradle

@@ -14,20 +14,24 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2'
         classpath 'com.google.gms:google-services:3.1.1'
     }
 }
 
+description = 'Android Mobile SDK Framework'
+
 allprojects {
     repositories {
         jcenter()
         google()
     }
 }
 
+
+
 ext {
     supportLibsVersion = '28.0.0'
     appAuthVersion = '0.7.0'

gradle.properties

@@ -28,10 +28,27 @@ org.gradle.jvmargs=-Xmx4096M
 bintray_user=
 bintray_api_key=
 mag_version=
-mas_version=
+masVersion=
 
 siteUrl = 'https://www.ca.com/us/developers/mas.html'
 gitUrl = 'https://github.com/CAAPIM/Android-MAS-SDK.git'
 issueUrl = 'https://github.com/CAAPIM/Android-MAS-SDK/issues'
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+
+# sonarqube (uses system properties)
+systemProp.sonar.host.url=https://sonarqube.broadcom.net/
+systemProp.sonar.login=
+
+# GPG signing
+# https://central.sonatype.org/pages/gradle.html
+# https://www.gnupg.org
+# https://gist.github.com/phit/bd3c6d156a2fa5f3b1bc15fa94b3256c
+signJar=false
+signing.keyId=
+signing.password=
+signing.secretKeyRingFile=
+
+# maven central account
+ossrhUsername=
+ossrhPassword=

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Aug 27 09:33:28 IST 2019
+#Mon Dec 20 16:22:05 IST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

mas-connecta/build.gradle

@@ -1,7 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
 apply plugin: 'jacoco'
+apply plugin: 'signing'
+apply plugin:'base'
 
 repositories {
     mavenCentral()
@@ -69,10 +70,10 @@ task jacocoTestReport(type: JacocoReport, dependsOn: "connectedDebugAndroidTest"
 
     def mainSrc = "${project.projectDir}/src/main/java"
 
-    sourceDirectories = files([mainSrc])
-    classDirectories = files([debugTree])
+    sourceDirectories.from = files([mainSrc])
+    classDirectories.from = files([debugTree])
 
-    executionData = fileTree(dir: project.projectDir, includes:
+    executionData.from = fileTree(dir: project.projectDir, includes:
             ['**/*.exec', '**/*.ec'])
 
     project.gradle.taskGraph.whenReady {
@@ -116,75 +117,101 @@ task javadoc(type: Javadoc) {
     include '**/*MAS*.java'
 }
 
-//jcenter integration
 group 'com.ca'
 
-project.version = mas_version
-bintray {
-    user = bintray_user
-    key = bintray_api_key
-
-    configurations = ['archives'] //When uploading configuration files
-    pkg {
-        repo = 'maven'
-        name = 'mas-connecta'
-        userOrg = 'caapim'
-
-        desc = 'MASConnecta is the core messaging framework of the Android Mobile SDK,' +
-                ' which is part of CA Mobile API Gateway. It gives developers the ability ' +
-                'to create social collaborative apps where users can message and send data to each other.'
-        websiteUrl = siteUrl
-        issueTrackerUrl = issueUrl
-        vcsUrl = gitUrl
-        licenses = ['MIT']
-        labels = ['aar', 'android', 'oauth', 'security']
-        publicDownloadNumbers = true
-
-        version {
-            name = project.version
-            desc = 'CA Mobile App Services'
-        }
-    }
-}
-
-install {
-    repositories.mavenInstaller {
-        pom {
-            project {
-                packaging 'aar'
-                name 'CA Mobile App Services'
-                url siteUrl
-                licenses {
-                    license {
-                        name 'MIT'
-                        url 'https://github.com/CAAPIM/Android-MAS-SDK/blob/develop/LICENSE'
-                    }
-                }
-                scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
-
-                }
-            }
-        }
-    }
-}
+project.version = masVersion
 
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
+    archiveClassifier.set("sources")
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set("javadoc")
     from javadoc.destinationDir
 }
 artifacts {
     archives javadocJar
     archives sourcesJar
 }
 
+afterEvaluate {
+    apply plugin: 'maven-publish'
+    publishing {
+        publications {
+            release(MavenPublication) {
+                groupId 'com.ca.apim'
+                artifactId 'mas-connecta'
+                version masVersion
+
+                // Two artifacts, the `aar` (or `jar`) and the sources
+                if (project.plugins.findPlugin("com.android.library")) {
+                    from components.release
+                } else {
+                    from components.java
+                }
+
+                artifact sourcesJar
+                artifact javadocJar
+
+                // Mostly self-explanatory metadata
+                pom {
+                    name = 'CA Mobile App Services'
+                    description = 'Android Mobile SDK Framework'
+                    url = siteUrl
+                    organization {
+                        name = 'CA API Management'
+                        url = 'https://github.com/CAAPIM'
+                    }
+                    licenses {
+                        license {
+                            name = 'MIT'
+                            url = 'https://github.com/CAAPIM/Android-MAS-SDK/blob/develop/LICENSE'
+                        }
+                    }
+
+                    scm {
+                        connection = gitUrl
+                        developerConnection = gitUrl
+                        url = siteUrl
+                    }
+                    issueManagement {
+                        system = 'github'
+                        url = issueUrl
+                    }
+                    developers {
+                        developer {
+                            id = 'apigatewayopensource'
+                            name = 'CA API Gateway Bot'
+                            email = '[email protected]'
+                            organization = 'CA API Gateway'
+                            organizationUrl = 'https://github.com/CAAPIM'
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    publishing.repositories {
+        maven {
+            def releaseRepo = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            def snapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
+            url = version.endsWith('SNAPSHOT') ? snapshotRepo : releaseRepo
+            credentials {
+                username = ossrhUsername
+                password = ossrhPassword
+            }
+        }
+    }
+
+    signing {
+        if (signJar == "true") {
+            sign publishing.publications
+        }
+    }
+}
+
 task findConventions doLast {
     println project.getConvention()
 }