Merge pull request #405 from CAAPIM/develop

Merge the develop changes to Master branch for 2.2.0 Release

Author: ysd24

ChangeLog.md

@@ -1,3 +1,20 @@
+# Version 2.2.00
+
+### Bug fixes
+- Resolved an issue where the refresh token becomes null when network is lost. [DE469630]
+- Resolved SCIM calls visibility issue. [DE473035]
+- Resolved an issue where the cache is cleared when using a third-party app for authentication. [DE506139]
+- Resolved an issue where the user gets logged out if 500 error is returned from MAG Server during token refresh. [DE509848]
+- Android 10 and newer android.security.KeyStoreException: Incompatible padding mode [DE508974] 
+- Resolved an issue where MAS library fails to parse Ciphers if language is set to Turkish. [DE492305]
+- Resolved an issue where multipart requests get corrupted and have two boundaries. [DE485106]
+
+
+### New features
+- Support for disabling SSL Pinning. [F109516]
+- Support for Android 12. [F114300]
+- RSA-PSS support and TLS 1.3 support in SDK [DE505739]
+
 # Version 2.1.00
 
 ### Bug fixes

README.md

@@ -1,3 +1,8 @@
+[![Maintenance](https://img.shields.io/badge/Maintained%3F-no-red.svg)](https://bitbucket.org/lbesson/ansi-colors)
+
+⚠️ | Please note that this repo will be archived in the near future. Please do not submit any new changes as they are no longer being accepted. Please contact Broadcom support https://support.broadcom.com/ to report any defects or make a request for an update. Broadcom is continuing support for the SDK but will no longer maintain the public GitHub community.
+:---: | :---
+
 # Android™ Mobile SDK
 ## for CA Mobile API Gateway
 
@@ -36,11 +41,11 @@ For more information about our mobile products see the [developer website](http:
 Edit your build.gradle file and add below dependency:
 ```gradle
     dependencies {
-        implementation 'com.ca:mas-foundation:2.1.00'
+        implementation 'com.ca:mas-foundation:2.2.00'
 
-        implementation 'com.ca:mas-connecta:2.1.00' // (Optional) Only required when using mas connecta
-        implementation 'com.ca:mas-storage:2.1.00' // (Optional) Only required when using mas storage
-        implementation 'com.ca:masui:2.1.00' // (Optional) Only required when using MASUI Template. The MAS UI library provides sample user interfaces for Login, OTP, Social Login, and Enterprise Browser.
+        implementation 'com.ca:mas-connecta:2.2.00' // (Optional) Only required when using mas connecta
+        implementation 'com.ca:mas-storage:2.2.00' // (Optional) Only required when using mas storage
+        implementation 'com.ca:masui:2.2.00' // (Optional) Only required when using MASUI Template. The MAS UI library provides sample user interfaces for Login, OTP, Social Login, and Enterprise Browser.
 
         implementation 'org.bouncycastle:bcpkix-jdk15on:1.64' // (Optional) Only required when you want to support Android 4.1.x
     }
@@ -49,12 +54,21 @@ Edit your build.gradle file and add below dependency:
 The compiled release binaries can be found here: [Releases][Releases]
 
 ## Sample Apps
-**All sample apps have moved to GITHub as of 1.6.00 release. Links will redirect to the latest released versions.**
+**All sample apps have moved to GITHub as of 2.1.00 release. Links will redirect to the latest released versions.**
 
 - [Sample-App-MAS-Android-Access-API-Geolocation-And-OTP](https://github.com/CAAPIM/Sample-App-MAS-Android-Access-API-Geolocation-And-OTP)
 - [Sample-App-MAS-Android-Fingerprint-Sessions-Lock](https://github.com/CAAPIM/Sample-App-MAS-Android-Fingerprint-Sessions-Lock)
 - [Sample-App-MAS-Android-Login-User-Authentication-And-Authorization](https://github.com/CAAPIM/Sample-App-MAS-Android-Login-User-Authentication-And-Authorization)
 - [Sample-App-MAS-Android-Secure-Local-Storage](https://github.com/CAAPIM/Sample-App-MAS-Android-Secure-Local-Storage)
+- [Sample-App-MAS-Android-MagTraining-BulkUpload](https://github.com/CAAPIM/SampleApp-MagTraining-BulkUpload)
+- [Sample-App-MAS-Android-MagTraining-SessionTransfer-BLE](https://github.com/CAAPIM/SampleApp-MagTraining-SessionTransfer-BLE)
+- [Sample-App-MAS-Android-MagTraining-UserAuthentication](https://github.com/CAAPIM/SampleApp-MagTraining-UserAuthentication)
+- [Sample-App-MAS-Android-MagTraining-UnProtectedLogin](https://github.com/CAAPIM/SampleApp-MagTraining-UnProtectedLogin)
+- [Sample-App-MAS-Android-MagTraining-ProtectedAPI](https://github.com/CAAPIM/SampleApp-MagTraining-ProtectedAPI)
+- [Sample-App-MAS-Android-MagTraining-Setup](https://github.com/CAAPIM/SampleApp-MagTraining-Setup)
+- [Sample-App-MAS-Android-UploadMultipartSampleApp](https://github.com/CAAPIM/UploadMultipartSampleApp)
+- [Sample-App-MAS-Android-MagTraining-SessionTransfer-QRCode](https://github.com/CAAPIM/SampleApp-MagTraining-SessionTransfer-QRCode)
+- [Sample-App-MAS-Android-MagTraining-InterAppSSO](https://github.com/CAAPIM/SampleApp-MAGTraining-InterAppSSO)
 
 ## Communication
 - *Have general questions or need help?*, use [Stack Overflow][StackOverflow]. (Tag 'massdk')
@@ -74,10 +88,10 @@ The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 This software may be modified and distributed under the terms
 of the MIT license. See the [LICENSE][license-link] file for details.
 
-[docs]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-1.html
+[docs]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-2.html
 [StackOverflow]: http://stackoverflow.com/questions/tagged/massdk
 [issues]: https://github.com/CAAPIM/Android-MAS-SDK/issues
 [releases]: ../../releases
 [contributing]: /CONTRIBUTING.md
 [license-link]: /LICENSE
-[documentation]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-1.html
+[documentation]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-2.html

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()
 }