From 6b2edbb381effde77afc9f270ba9471513dab415 Mon Sep 17 00:00:00 2001 From: Jonathan Chau Date: Fri, 14 Dec 2018 00:25:52 -0800 Subject: [PATCH 1/4] Changed browser to PhantomJS --- test/karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/karma.conf.js b/test/karma.conf.js index 22efcd1c8..c93f64aa9 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -79,7 +79,7 @@ module.exports = function(config) { // start these browsers // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['Chrome'], + browsers: ['PhantomJS'], // Continuous Integration mode From 043753373245c03a2f9b0aa071f526053398b4ad Mon Sep 17 00:00:00 2001 From: jchau207 Date: Tue, 18 Dec 2018 14:58:11 -0800 Subject: [PATCH 2/4] Add karma-phantomjs-launcher to dependency --- app-template/package-template.json | 1 + 1 file changed, 1 insertion(+) diff --git a/app-template/package-template.json b/app-template/package-template.json index d3fd9670d..72368c7fc 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -142,6 +142,7 @@ "jasmine-core": "^3.1.0", "karma": "^2.0.2", "karma-chrome-launcher": "^2.2.0", + "karma-phantomjs-launcher": "^1.0.0", "karma-jasmine": "^1.1.2", "trash-cli": "^1.4.0", "lodash": "^4.17.4", From 31b0605095a018546305a9b39385128d1bcfc92e Mon Sep 17 00:00:00 2001 From: jchau207 Date: Wed, 19 Dec 2018 02:44:54 -0800 Subject: [PATCH 3/4] Used a higher version for phantomjs dependency --- app-template/package-template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-template/package-template.json b/app-template/package-template.json index 72368c7fc..80bfdbb9e 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -142,7 +142,7 @@ "jasmine-core": "^3.1.0", "karma": "^2.0.2", "karma-chrome-launcher": "^2.2.0", - "karma-phantomjs-launcher": "^1.0.0", + "karma-phantomjs-launcher": "^1.0.4", "karma-jasmine": "^1.1.2", "trash-cli": "^1.4.0", "lodash": "^4.17.4", From fef5197d9880ec787a08921104f0290b6a4cd23d Mon Sep 17 00:00:00 2001 From: jchau207 Date: Tue, 8 Jan 2019 01:00:01 -0800 Subject: [PATCH 4/4] Added different google-services.json based on build type --- Gruntfile.js | 4 +- app-template/apply.js | 3 +- .../bitcoincom/google-services-debug.json | 55 +++++++++++++++++++ ...ices.json => google-services-release.json} | 0 src/android/build-extras.gradle | 4 ++ 5 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 app-template/bitcoincom/google-services-debug.json rename app-template/bitcoincom/{google-services.json => google-services-release.json} (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 6da3084d7..4a9575a39 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -15,10 +15,10 @@ module.exports = function(grunt) { command: ' open -a open -a /Applications/Android\\ Studio.app platforms/android', }, build_android_debug: { - command: 'cordova prepare android && cordova build android --debug', + command: 'cp google-services-debug.json google-services.json && cordova prepare android && cordova build android --debug', }, build_android_release: { - command: 'cordova prepare android && cordova build android --release', + command: 'cp google-services-release.json google-services.json && cordova prepare android && cordova build android --release', }, build_ios_debug: { command: 'cordova prepare ios && cordova build ios --debug --buildFlag="-UseModernBuildSystem=0"', diff --git a/app-template/apply.js b/app-template/apply.js index 143cf57a8..9a395ff8c 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -111,7 +111,8 @@ function copyDir(from, to) { // Push Notification fs.copySync(configDir + '/GoogleService-Info.plist', '../GoogleService-Info.plist'); -fs.copySync(configDir + '/google-services.json', '../google-services.json'); +fs.copySync(configDir + '/google-services-debug.json', '../google-services-debug.json'); +fs.copySync(configDir + '/google-services-release.json', '../google-services-release.json') copyDir(configDir + '/img', '../www/img/app'); copyDir(configDir + '/sass', '../src/sass/app'); diff --git a/app-template/bitcoincom/google-services-debug.json b/app-template/bitcoincom/google-services-debug.json new file mode 100644 index 000000000..150eeb88e --- /dev/null +++ b/app-template/bitcoincom/google-services-debug.json @@ -0,0 +1,55 @@ +{ + "project_info": { + "project_number": "432300239540", + "firebase_url": "https://bitcoin-com-wallet.firebaseio.com", + "project_id": "bitcoin-com-wallet", + "storage_bucket": "bitcoin-com-wallet.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:432300239540:android:e23224cd1aed3778", + "android_client_info": { + "package_name": "com.bitcoin.mwallet.debug" + } + }, + "oauth_client": [ + { + "client_id": "432300239540-tpp5t3pmftfvuedlphevullpentp5pbo.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.bitcoin.mwallet", + "certificate_hash": "2b6a5264cc4a58c711d09ce05273a057ed19aafd" + } + }, + { + "client_id": "432300239540-aeh6b8eebnkgq0e3tv0g0a0t1qhkhhcc.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDphC3flCVFFOENAy9tMgOUFxC6_H8JWMs" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "432300239540-aeh6b8eebnkgq0e3tv0g0a0t1qhkhhcc.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + } + ], + "configuration_version": "1" +} diff --git a/app-template/bitcoincom/google-services.json b/app-template/bitcoincom/google-services-release.json similarity index 100% rename from app-template/bitcoincom/google-services.json rename to app-template/bitcoincom/google-services-release.json diff --git a/src/android/build-extras.gradle b/src/android/build-extras.gradle index c90145418..b257159e9 100644 --- a/src/android/build-extras.gradle +++ b/src/android/build-extras.gradle @@ -3,6 +3,10 @@ ext { ANDROID_SUPPORT_ANNOTATIONS_VERSION = '26.1.0' } +ext.postBuildExtras = { + android.buildTypes.debug.applicationIdSuffix = '.debug' +} + configurations.all { resolutionStrategy { force "com.android.support:support-v4:26.1.0"