From 85b7f3703fa5eed6ff5c8df90f4c72eba7950884 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 19 Jul 2017 17:13:35 -0400 Subject: [PATCH] Make release 1.0.1 to use com.mattermost.rnbeta --- android/app/BUCK | 4 +- android/app/build.gradle | 2 +- android/app/google-services.json | 62 +++++++++++++++++++ android/app/src/main/AndroidManifest.xml | 2 +- .../{ => rnbeta}/CustomPushNotification.java | 2 +- .../mattermost/{ => rnbeta}/MainActivity.java | 2 +- .../{ => rnbeta}/MainApplication.java | 2 +- .../NotificationsLifecycleFacade.java | 2 +- android/app/src/main/res/values/strings.xml | 3 +- android/build.gradle | 2 +- ios/Mattermost.xcodeproj/project.pbxproj | 4 +- ios/Mattermost/Info.plist | 2 + 12 files changed, 77 insertions(+), 12 deletions(-) rename android/app/src/main/java/com/mattermost/{ => rnbeta}/CustomPushNotification.java (99%) rename android/app/src/main/java/com/mattermost/{ => rnbeta}/MainActivity.java (98%) rename android/app/src/main/java/com/mattermost/{ => rnbeta}/MainApplication.java (98%) rename android/app/src/main/java/com/mattermost/{ => rnbeta}/NotificationsLifecycleFacade.java (98%) diff --git a/android/app/BUCK b/android/app/BUCK index a6c817857..6ec4e7437 100644 --- a/android/app/BUCK +++ b/android/app/BUCK @@ -46,13 +46,13 @@ android_library( android_build_config( name = 'build_config', - package = 'com.mattermost', + package = 'com.mattermost.rnbeta', ) android_resource( name = 'res', res = 'src/main/res', - package = 'com.mattermost', + package = 'com.mattermost.rnbeta', ) android_binary( diff --git a/android/app/build.gradle b/android/app/build.gradle index 2f648d059..907feef9e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -88,7 +88,7 @@ android { buildToolsVersion "25.0.1" defaultConfig { - applicationId "com.mattermost.react.native" + applicationId "com.mattermost.rnbeta" minSdkVersion 16 targetSdkVersion 23 versionCode 40 diff --git a/android/app/google-services.json b/android/app/google-services.json index 775b64e25..9f083952d 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -36,6 +36,68 @@ "status": 2 } } + }, + { + "client_info": { + "mobilesdk_app_id": "1:184930218130:android:c7debfa7ea3f75a7", + "android_client_info": { + "package_name": "com.mattermost.rnbeta" + } + }, + "oauth_client": [ + { + "client_id": "184930218130-8nahrspll1opff0uogtkh2qsv8coqngo.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyCkZkU2ECVg-mmdCG5OoHHQXtKiENuvWPE" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 1, + "other_platform_oauth_client": [] + }, + "ads_service": { + "status": 2 + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:184930218130:android:2db4058a5b5d6506", + "android_client_info": { + "package_name": "com.mattermost.rn" + } + }, + "oauth_client": [ + { + "client_id": "184930218130-8nahrspll1opff0uogtkh2qsv8coqngo.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyCkZkU2ECVg-mmdCG5OoHHQXtKiENuvWPE" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 1, + "other_platform_oauth_client": [] + }, + "ads_service": { + "status": 2 + } + } } ], "configuration_version": "1" diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 63c94bf54..013facf04 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ diff --git a/android/app/src/main/java/com/mattermost/CustomPushNotification.java b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java similarity index 99% rename from android/app/src/main/java/com/mattermost/CustomPushNotification.java rename to android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java index a92fbe716..b56ef87b2 100644 --- a/android/app/src/main/java/com/mattermost/CustomPushNotification.java +++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java @@ -1,4 +1,4 @@ -package com.mattermost; +package com.mattermost.rnbeta; import android.app.PendingIntent; import android.content.Context; diff --git a/android/app/src/main/java/com/mattermost/MainActivity.java b/android/app/src/main/java/com/mattermost/rnbeta/MainActivity.java similarity index 98% rename from android/app/src/main/java/com/mattermost/MainActivity.java rename to android/app/src/main/java/com/mattermost/rnbeta/MainActivity.java index 2bb98165f..2c1c60a84 100644 --- a/android/app/src/main/java/com/mattermost/MainActivity.java +++ b/android/app/src/main/java/com/mattermost/rnbeta/MainActivity.java @@ -1,4 +1,4 @@ -package com.mattermost; +package com.mattermost.rnbeta; import com.github.yamill.orientation.OrientationPackage; import com.psykar.cookiemanager.CookieManagerPackage; diff --git a/android/app/src/main/java/com/mattermost/MainApplication.java b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java similarity index 98% rename from android/app/src/main/java/com/mattermost/MainApplication.java rename to android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java index 5d12ea907..7b8a04ab0 100644 --- a/android/app/src/main/java/com/mattermost/MainApplication.java +++ b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java @@ -1,4 +1,4 @@ -package com.mattermost; +package com.mattermost.rnbeta; import android.app.Application; import android.util.Log; diff --git a/android/app/src/main/java/com/mattermost/NotificationsLifecycleFacade.java b/android/app/src/main/java/com/mattermost/rnbeta/NotificationsLifecycleFacade.java similarity index 98% rename from android/app/src/main/java/com/mattermost/NotificationsLifecycleFacade.java rename to android/app/src/main/java/com/mattermost/rnbeta/NotificationsLifecycleFacade.java index 2fd8ad9e4..a34e975df 100644 --- a/android/app/src/main/java/com/mattermost/NotificationsLifecycleFacade.java +++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationsLifecycleFacade.java @@ -1,4 +1,4 @@ -package com.mattermost; +package com.mattermost.rnbeta; import android.app.Activity; import android.util.Log; diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index ca34c2ca4..840999c66 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,5 +1,6 @@ + - Mattermost + Mattermost Beta diff --git a/android/build.gradle b/android/build.gradle index 238f98527..ef0e6d195 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.2.+' - classpath 'com.google.gms:google-services:3.0.0' + classpath 'com.google.gms:google-services:3.1.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index d5296fb42..b0010a3e2 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -1338,7 +1338,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.react.native; + PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.rnbeta; PRODUCT_NAME = Mattermost; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1371,7 +1371,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.react.native; + PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.rnbeta; PRODUCT_NAME = Mattermost; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index fac8d55b8..0632fda9e 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -4,6 +4,8 @@ CFBundleDevelopmentRegion en + CFBundleDisplayName + Mattermost Beta CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier