Merge pull request #115 from ibm-cloud-security/development

Rebrand Bluemix to IBM Cloud
ibm-cloud-security · Jun 14, 2018 · 0ef001a · 0ef001a
2 parents 63df63a + ef83732
commit 0ef001a
Show file tree

Hide file tree

Showing 75 changed files with 927 additions and 638 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # IBM Cloud App ID Android SDK
 
-[![Bluemix powered][img-bluemix-powered]][url-bluemix]
+[![IBM Cloud powered][img-ibmcloud-powered]][url-ibmcloud]
 [![Travis][img-travis-master]][url-travis-master]
 [![Coverage Status][img-coveralls-master]][url-coveralls-master]
 [![Codacy Badge][img-codacy]][url-codacy]
@@ -357,8 +357,8 @@ public void onFailure (Response response, Throwable t, JSONObject extendedInfo)
 ## License
 This package contains code licensed under the Apache License, Version 2.0 (the "License"). You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 and may also view the License in the LICENSE file within this package.
 
-[img-bluemix-powered]: https://img.shields.io/badge/bluemix-powered-blue.svg
-[url-bluemix]: http://bluemix.net
+[img-ibmcloud-powered]: https://img.shields.io/badge/ibm%20cloud-powered-blue.svg
+[url-ibmcloud]: https://www.ibm.com/cloud/
 [url-bintray]: https://bintray.com/ibmcloudsecurity/appid-clientsdk-android
 [img-license]: https://img.shields.io/github/license/ibm-cloud-security/appid-clientsdk-android.svg
 [img-version]: https://img.shields.io/bintray/v/ibmcloudsecurity/maven/appid-clientsdk-android.svg

diff --git a/app/build.gradle b/app/build.gradle
@@ -19,6 +19,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+    }
 }
 
 dependencies {

diff --git a/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java b/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
@@ -12,17 +12,17 @@
 import android.widget.RadioButton;
 import android.widget.TextView;
 
-import com.ibm.bluemix.appid.android.api.AppID;
-import com.ibm.bluemix.appid.android.api.AppIDAuthorizationManager;
-import com.ibm.bluemix.appid.android.api.AuthorizationException;
-import com.ibm.bluemix.appid.android.api.AuthorizationListener;
-import com.ibm.bluemix.appid.android.api.LoginWidget;
-import com.ibm.bluemix.appid.android.api.TokenResponseListener;
-import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
-import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
-import com.ibm.bluemix.appid.android.api.tokens.RefreshToken;
-import com.ibm.bluemix.appid.android.api.userprofile.UserProfileResponseListener;
-import com.ibm.bluemix.appid.android.api.userprofile.UserProfileException;
+import com.ibm.cloud.appid.android.api.AppID;
+import com.ibm.cloud.appid.android.api.AppIDAuthorizationManager;
+import com.ibm.cloud.appid.android.api.AuthorizationException;
+import com.ibm.cloud.appid.android.api.AuthorizationListener;
+import com.ibm.cloud.appid.android.api.LoginWidget;
+import com.ibm.cloud.appid.android.api.TokenResponseListener;
+import com.ibm.cloud.appid.android.api.tokens.AccessToken;
+import com.ibm.cloud.appid.android.api.tokens.IdentityToken;
+import com.ibm.cloud.appid.android.api.tokens.RefreshToken;
+import com.ibm.cloud.appid.android.api.userprofile.UserProfileResponseListener;
+import com.ibm.cloud.appid.android.api.userprofile.UserProfileException;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.BMSClient;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Request;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;

diff --git a/build.gradle b/build.gradle
@@ -22,16 +22,14 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         maven {
             url 'https://maven.google.com/'
             name 'Google'
         }
+        jcenter()
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -50,6 +50,7 @@ dependencies {
     api 'com.squareup.okhttp3:okhttp-urlconnection:3.9.0'
     api 'com.ibm.mobilefirstplatform.clientsdk.android:analyticsapi:[1.0.0,)'
     api 'com.ibm.mobilefirstplatform.clientsdk.android:core:3.1.3'
+    api 'io.jsonwebtoken:jjwt:0.9.0'
 
     api 'com.android.support:appcompat-v7:27.1.1'
     api 'com.android.support:customtabs:27.1.1'

diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
@@ -8,14 +8,14 @@
             android:allowBackup="true"
             android:supportsRtl="true">
 
-        <activity android:name="com.ibm.bluemix.appid.android.internal.authorizationmanager.ChromeTabActivity">
+        <activity android:name="com.ibm.cloud.appid.android.internal.authorizationmanager.ChromeTabActivity">
             <intent-filter>
                 <action android:name="${appIdRedirectScheme}.POST_AUTHORIZATION_INTENT" />
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
-        <activity android:name="com.ibm.bluemix.appid.android.internal.authorizationmanager.RedirectUriReceiverActivity">
+        <activity android:name="com.ibm.cloud.appid.android.internal.authorizationmanager.RedirectUriReceiverActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>

diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
diff --git a/.../ibm/bluemix/appid/android/api/AppID.java → ...om/ibm/cloud/appid/android/api/AppID.java b/.../ibm/bluemix/appid/android/api/AppID.java → ...om/ibm/cloud/appid/android/api/AppID.java
@@ -11,17 +11,17 @@
 	limitations under the License.
 */
 
-package com.ibm.bluemix.appid.android.api;
+package com.ibm.cloud.appid.android.api;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
 
-import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
-import com.ibm.bluemix.appid.android.api.tokens.RefreshToken;
-import com.ibm.bluemix.appid.android.api.userprofile.UserProfileManager;
-import com.ibm.bluemix.appid.android.internal.OAuthManager;
-import com.ibm.bluemix.appid.android.internal.loginwidget.LoginWidgetImpl;
-import com.ibm.bluemix.appid.android.internal.userprofilemanager.UserProfileManagerImpl;
+import com.ibm.cloud.appid.android.api.tokens.AccessToken;
+import com.ibm.cloud.appid.android.api.tokens.RefreshToken;
+import com.ibm.cloud.appid.android.api.userprofile.UserProfileManager;
+import com.ibm.cloud.appid.android.internal.OAuthManager;
+import com.ibm.cloud.appid.android.internal.loginwidget.LoginWidgetImpl;
+import com.ibm.cloud.appid.android.internal.userprofilemanager.UserProfileManagerImpl;
 
 import org.jetbrains.annotations.NotNull;