Release 2.0.00

Master develop merge

Author: manutripathi82

CONTRIBUTING.md

@@ -48,7 +48,7 @@ By contributing to the Android Mobile SDK, you agree that your contributions wil
 
 
 [guidelines]: /GUIDELINES.md
-[community]: https://communities.ca.com/community/ca-api-management-community/content?filterID=contentstatus%5Bpublished%5D~category%5Bca-mobile-api-gateway%5D
+[community]: https://community.broadcom.com/enterprisesoftware/communities/communityhomeblogs?CommunityKey=0f580f5f-30a4-41de-a75c-e5f433325a18
 [license-link]: /LICENSE
 [cla]: https://www.clahub.com/agreements/CAAPIM/Android-MAS-SDK
-[casupport]: https://support.ca.com/irj/portal/implsvcnewcase
+[casupport]: https://casupport.broadcom.com

ChangeLog.md

@@ -1,3 +1,11 @@
+# Version 2.0.00
+
+### Bug fixes
+- MAS library fails the authorization flow for Android P. [DE420805]
+
+### New features
+- Support for multipart/form-data post requests. Enables users to upload files and multipart forms. [US605853]
+
 # Version 1.9.10
 
 ### Bug fixes

LICENSE

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 CA. All rights reserved.
+Copyright (c) 2019 Broadcom. All Rights Reserved.
+The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -17,7 +17,7 @@ The Android Mobile SDK consists of these frameworks:
 - **MASStorage** - Storage services for private local and cloud storage.
 - **MASUI** - Resources to implement a user login dialog, Social Login, One-Time Password, and Proximity Login (QR code and BLE).
 
-For more information about our mobile products see the [developer website][mas.ca.com].
+For more information about our mobile products see the [developer website](http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-0.html).
 
 ## Features
 
@@ -40,14 +40,14 @@ For more information about our mobile products see the [developer website][mas.c
 Edit your build.gradle file and add below dependency:
 ```gradle
     dependencies {
-        implementation 'com.ca:mas-foundation:1.8.00'
+        implementation 'com.ca:mas-foundation:2.0.00'
 
-        implementation 'com.ca:mas-connecta:1.8.00' // (Optional) Only required when using mas connecta
-        implementation 'com.ca:mas-storage:1.8.00' // (Optional) Only required when using mas storage
-        implementation 'com.ca:mas-identity-management:1.8.00' // (Optional) Only required when using mas identity management
-        implementation 'com.ca:masui:1.8.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.0.00' // (Optional) Only required when using mas connecta
+        implementation 'com.ca:mas-storage:2.0.00' // (Optional) Only required when using mas storage
+        implementation 'com.ca:mas-identity-management:2.0.00' // (Optional) Only required when using mas identity management
+        implementation 'com.ca:masui:2.0.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.55' // (Optional) Only required when you want to support Android 4.1.x
+        implementation 'org.bouncycastle:bcpkix-jdk15on:1.59' // (Optional) Only required when you want to support Android 4.1.x
     }
 ```
 ## SDK Releases
@@ -75,20 +75,16 @@ Contributions are welcome and much appreciated. To learn more, see the [Contribu
 For more documentation including API references, go to our [main website][docs].
 
 ## License
-Copyright (c) 2017 CA. All rights reserved.
+Copyright (c) 2019 Broadcom. All Rights Reserved.
+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.
 
-[mag]: https://docops.ca.com/mag
-[mas.ca.com]: http://mas.ca.com/
-[docs]: http://mas.ca.com/docs/
-[blog]: http://mas.ca.com/blog/
-[get-started]: http://mas.ca.com/get-started
+[docs]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-0.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
-[video]: https://www.ca.com/us/developers/mas/videos.html
-[documentation]: https://www.ca.com/us/developers/mas/docs.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-0.html

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         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'
@@ -29,16 +29,16 @@ allprojects {
 }
 
 ext {
-    supportLibsVersion = '28.0.0-rc01'
+    supportLibsVersion = '28.0.0'
     appAuthVersion = '0.7.0'
-    buildToolsVersion = '28.0.0'
-    compileSdkVersion = 28
+    buildToolsVersion = '29.0.2'
+    compileSdkVersion = 29
     gcm = '12.0.1'
     minSdkVersion = 16
     nimbusJoseVersion = '6.0.2'
-    targetSdkVersion = 28
-    versionCode = 22
-    versionName = '1.9.10'
+    targetSdkVersion = 29
+    versionCode = 23
+    versionName = '2.0.00'
     zxingVersion = '3.3.0'
     testRunner = '1.0.1'
     testRules = '1.0.1'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Mar 22 16:31:09 PDT 2018
+#Tue Aug 27 09:33:28 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip

mas-connecta/build.gradle

@@ -20,6 +20,7 @@ android {
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
 
     lintOptions {
@@ -86,10 +87,10 @@ task jacocoTestReport(type: JacocoReport, dependsOn: "connectedDebugAndroidTest"
     }
     reports {
         xml.enabled = true
-        xml.destination = "${buildDir}/jacocoTestReport.xml"
+        xml.destination = file("${buildDir}/jacocoTestReport.xml")
         csv.enabled = false
         html.enabled = true
-        html.destination = "${buildDir}/reports/jacoco"
+        html.destination = file("${buildDir}/reports/jacoco")
     }
 }
 
@@ -184,6 +185,6 @@ artifacts {
     archives sourcesJar
 }
 
-task findConventions << {
+task findConventions doLast {
     println project.getConvention()
 }

mas-foundation/build.gradle

@@ -121,10 +121,10 @@ task jacocoTestReport(type: JacocoReport, dependsOn: "connectedDebugAndroidTest"
     }
     reports {
         xml.enabled = true
-        xml.destination = "${buildDir}/jacocoTestReport.xml"
+        xml.destination = file("${buildDir}/jacocoTestReport.xml")
         csv.enabled = false
         html.enabled = true
-        html.destination = "${buildDir}/reports/jacoco"
+        html.destination = file("${buildDir}/reports/jacoco")
     }
 }
 
@@ -206,6 +206,6 @@ artifacts {
     archives sourcesJar
 }
 
-task findConventions << {
+task findConventions doLast {
     println project.getConvention()
 }

mas-foundation/src/androidTest/java/com/ca/mas/foundation/MASAuthorizationCodeFlowTest.java

@@ -15,8 +15,6 @@
 import com.ca.mas.MASStartTestBase;
 import com.ca.mas.core.oauth.CodeVerifierCache;
 import com.ca.mas.foundation.auth.MASAuthenticationProviders;
-import com.squareup.okhttp.mockwebserver.RecordedRequest;
-
 import org.json.JSONObject;
 import org.junit.Test;
 
@@ -25,12 +23,12 @@
 import java.net.URISyntaxException;
 import java.util.concurrent.ExecutionException;
 
+import okhttp3.mockwebserver.RecordedRequest;
+
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
 
 public class MASAuthorizationCodeFlowTest extends MASStartTestBase {
 

mas-foundation/src/androidTest/java/com/ca/mas/foundation/MASClientCredentialTest.java

@@ -19,8 +19,6 @@
 import com.ca.mas.core.policy.exceptions.InvalidClientCredentialException;
 import com.ca.mas.core.registration.RegistrationServerException;
 import com.ca.mas.foundation.auth.MASAuthenticationProviders;
-import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.RecordedRequest;
 
 import junit.framework.Assert;
 
@@ -34,6 +32,9 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.RecordedRequest;
+
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;