From 1eaf46efc579490ee26e825f2324b6a26d8d32d2 Mon Sep 17 00:00:00 2001 From: diegolmello Date: Thu, 30 May 2019 17:42:09 -0300 Subject: [PATCH 1/3] Split android --- android/app/google-services.json | 207 +---------------------- android/app/google-services.prod.json | 231 ++++++++++++++++++++++++++ 2 files changed, 239 insertions(+), 199 deletions(-) create mode 100644 android/app/google-services.prod.json diff --git a/android/app/google-services.json b/android/app/google-services.json index f6e7e6b9a75..4b3f409be41 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -1,226 +1,35 @@ { "project_info": { - "project_number": "673693445664", - "firebase_url": "https://rocketchat-9e9be.firebaseio.com", - "project_id": "rocketchat-9e9be", - "storage_bucket": "rocketchat-9e9be.appspot.com" + "project_number": "115198584049", + "firebase_url": "https://rocketchat-reactnative-test.firebaseio.com", + "project_id": "rocketchat-reactnative-test", + "storage_bucket": "rocketchat-reactnative-test.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:673693445664:android:6ef4638e500ec958", - "android_client_info": { - "package_name": "RocketChat" - } - }, - "oauth_client": [ - { - "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", - "client_type": 3 - }, - { - "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com", - "client_type": 2, - "ios_info": { - "bundle_id": "chat.rocket.reactnative" - } - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:673693445664:android:16da2e50aff9f0c9", - "android_client_info": { - "package_name": "chat.rocket.android" - } - }, - "oauth_client": [ - { - "client_id": "673693445664-k0mvosdjoe5dbvqce3b377ckabb5dgu8.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "chat.rocket.android", - "certificate_hash": "33fa8582794176014a59054192e261bfad0e5273" - } - }, - { - "client_id": "673693445664-hrjftksij02vqtd467ln2cubvu48ft5j.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "chat.rocket.android", - "certificate_hash": "41cf750df786a6d9da712a98a629d0c8391876d6" - } - }, - { - "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", - "client_type": 3 - }, - { - "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com", - "client_type": 2, - "ios_info": { - "bundle_id": "chat.rocket.reactnative" - } - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:673693445664:android:1551054db195f705", - "android_client_info": { - "package_name": "chat.rocket.android.dev" - } - }, - "oauth_client": [ - { - "client_id": "673693445664-t5aeku0oie010npd40a0tgn27c418vk7.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "chat.rocket.android.dev", - "certificate_hash": "41cf750df786a6d9da712a98a629d0c8391876d6" - } - }, - { - "client_id": "673693445664-iml14ln4vccuu7liclrpt2k671fkjs38.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "chat.rocket.android.dev", - "certificate_hash": "33fa8582794176014a59054192e261bfad0e5273" - } - }, - { - "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", - "client_type": 3 - }, - { - "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com", - "client_type": 2, - "ios_info": { - "bundle_id": "chat.rocket.reactnative" - } - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:673693445664:android:8be27b1f7c42a2ed", + "mobilesdk_app_id": "1:115198584049:android:8be27b1f7c42a2ed", "android_client_info": { "package_name": "chat.rocket.reactnative" } }, "oauth_client": [ { - "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_id": "115198584049-ack609b1338b827fta26s9rd2ab1aad5.apps.googleusercontent.com", "client_type": 3 } ], "api_key": [ { - "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg" + "current_key": "AIzaSyAWwowhAfACHBw3YxmDOXY3QyakgjhJLqc" } ], "services": { "appinvite_service": { "other_platform_oauth_client": [ { - "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_id": "115198584049-ack609b1338b827fta26s9rd2ab1aad5.apps.googleusercontent.com", "client_type": 3 - }, - { - "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com", - "client_type": 2, - "ios_info": { - "bundle_id": "chat.rocket.reactnative" - } - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:673693445664:android:64932c99863e2838", - "android_client_info": { - "package_name": "com.konecty.rocket.chat" - } - }, - "oauth_client": [ - { - "client_id": "673693445664-3ajben08beuco6eout3kpod2gbbm8fij.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.konecty.rocket.chat", - "certificate_hash": "cd5806ba3f0141d0f2e47acfe64a485f575108ab" - } - }, - { - "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", - "client_type": 3 - }, - { - "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com", - "client_type": 2, - "ios_info": { - "bundle_id": "chat.rocket.reactnative" - } } ] } diff --git a/android/app/google-services.prod.json b/android/app/google-services.prod.json new file mode 100644 index 00000000000..f6e7e6b9a75 --- /dev/null +++ b/android/app/google-services.prod.json @@ -0,0 +1,231 @@ +{ + "project_info": { + "project_number": "673693445664", + "firebase_url": "https://rocketchat-9e9be.firebaseio.com", + "project_id": "rocketchat-9e9be", + "storage_bucket": "rocketchat-9e9be.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:673693445664:android:6ef4638e500ec958", + "android_client_info": { + "package_name": "RocketChat" + } + }, + "oauth_client": [ + { + "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "chat.rocket.reactnative" + } + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:673693445664:android:16da2e50aff9f0c9", + "android_client_info": { + "package_name": "chat.rocket.android" + } + }, + "oauth_client": [ + { + "client_id": "673693445664-k0mvosdjoe5dbvqce3b377ckabb5dgu8.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "chat.rocket.android", + "certificate_hash": "33fa8582794176014a59054192e261bfad0e5273" + } + }, + { + "client_id": "673693445664-hrjftksij02vqtd467ln2cubvu48ft5j.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "chat.rocket.android", + "certificate_hash": "41cf750df786a6d9da712a98a629d0c8391876d6" + } + }, + { + "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "chat.rocket.reactnative" + } + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:673693445664:android:1551054db195f705", + "android_client_info": { + "package_name": "chat.rocket.android.dev" + } + }, + "oauth_client": [ + { + "client_id": "673693445664-t5aeku0oie010npd40a0tgn27c418vk7.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "chat.rocket.android.dev", + "certificate_hash": "41cf750df786a6d9da712a98a629d0c8391876d6" + } + }, + { + "client_id": "673693445664-iml14ln4vccuu7liclrpt2k671fkjs38.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "chat.rocket.android.dev", + "certificate_hash": "33fa8582794176014a59054192e261bfad0e5273" + } + }, + { + "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "chat.rocket.reactnative" + } + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:673693445664:android:8be27b1f7c42a2ed", + "android_client_info": { + "package_name": "chat.rocket.reactnative" + } + }, + "oauth_client": [ + { + "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "chat.rocket.reactnative" + } + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:673693445664:android:64932c99863e2838", + "android_client_info": { + "package_name": "com.konecty.rocket.chat" + } + }, + "oauth_client": [ + { + "client_id": "673693445664-3ajben08beuco6eout3kpod2gbbm8fij.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.konecty.rocket.chat", + "certificate_hash": "cd5806ba3f0141d0f2e47acfe64a485f575108ab" + } + }, + { + "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDIkZj1TRz8TmhnMswDwVY5OnWuzFK3rxg" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "673693445664-97s9t777ful7mn2510vuhb48958qd9tb.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "chat.rocket.reactnative" + } + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file From e0211d1badacca8772c38dfd5374772c37b7824c Mon Sep 17 00:00:00 2001 From: diegolmello Date: Thu, 30 May 2019 17:58:58 -0300 Subject: [PATCH 2/3] Split iOS --- ios/GoogleService-Info.plist | 18 +++++++-------- ios/GoogleService-Info.prod.plist | 38 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 ios/GoogleService-Info.prod.plist diff --git a/ios/GoogleService-Info.plist b/ios/GoogleService-Info.plist index 11d81294f4f..8560c91e6e1 100644 --- a/ios/GoogleService-Info.plist +++ b/ios/GoogleService-Info.plist @@ -3,23 +3,21 @@ CLIENT_ID - 673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com + 115198584049-0efgfvm0oh9ap55g7epmqnjm27mq3j4e.apps.googleusercontent.com REVERSED_CLIENT_ID - com.googleusercontent.apps.673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv - ANDROID_CLIENT_ID - 673693445664-k0mvosdjoe5dbvqce3b377ckabb5dgu8.apps.googleusercontent.com + com.googleusercontent.apps.115198584049-0efgfvm0oh9ap55g7epmqnjm27mq3j4e API_KEY - AIzaSyDL4sXxk8DeGYzacSib0GDQ3BoGACP0VDM + AIzaSyDEMLMz0En0vwFBlLSQkQ9oyhmCMPcpZxc GCM_SENDER_ID - 673693445664 + 115198584049 PLIST_VERSION 1 BUNDLE_ID chat.rocket.reactnative PROJECT_ID - rocketchat-9e9be + rocketchat-reactnative-test STORAGE_BUCKET - rocketchat-9e9be.appspot.com + rocketchat-reactnative-test.appspot.com IS_ADS_ENABLED IS_ANALYTICS_ENABLED @@ -31,8 +29,8 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:673693445664:ios:8be27b1f7c42a2ed + 1:115198584049:ios:8be27b1f7c42a2ed DATABASE_URL - https://rocketchat-9e9be.firebaseio.com + https://rocketchat-reactnative-test.firebaseio.com \ No newline at end of file diff --git a/ios/GoogleService-Info.prod.plist b/ios/GoogleService-Info.prod.plist new file mode 100644 index 00000000000..11d81294f4f --- /dev/null +++ b/ios/GoogleService-Info.prod.plist @@ -0,0 +1,38 @@ + + + + + CLIENT_ID + 673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.673693445664-jbf9m30ta163gobjfp0v7j1v7kpo7kmv + ANDROID_CLIENT_ID + 673693445664-k0mvosdjoe5dbvqce3b377ckabb5dgu8.apps.googleusercontent.com + API_KEY + AIzaSyDL4sXxk8DeGYzacSib0GDQ3BoGACP0VDM + GCM_SENDER_ID + 673693445664 + PLIST_VERSION + 1 + BUNDLE_ID + chat.rocket.reactnative + PROJECT_ID + rocketchat-9e9be + STORAGE_BUCKET + rocketchat-9e9be.appspot.com + IS_ADS_ENABLED + + IS_ANALYTICS_ENABLED + + IS_APPINVITE_ENABLED + + IS_GCM_ENABLED + + IS_SIGNIN_ENABLED + + GOOGLE_APP_ID + 1:673693445664:ios:8be27b1f7c42a2ed + DATABASE_URL + https://rocketchat-9e9be.firebaseio.com + + \ No newline at end of file From 3ac2044ec4e172685e1a88b0efef6e5adb887edd Mon Sep 17 00:00:00 2001 From: diegolmello Date: Thu, 30 May 2019 18:03:16 -0300 Subject: [PATCH 3/3] Update CI --- .circleci/config.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index bd1838d082f..5d6138c7263 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -131,6 +131,12 @@ jobs: echo -e "VERSIONCODE=$CIRCLE_BUILD_NUM" >> ./gradle.properties + - run: + name: Set Google Services + command: | + cd android/app + cp google-services.prod.json google-services.json + - run: name: Build Android App command: | @@ -189,6 +195,12 @@ jobs: command: | yarn + - run: + name: Set Google Services + command: | + cd ios + cp GoogleService-Info.prod.plist GoogleService-Info.plist + - run: name: Fastlane Build no_output_timeout: 1200