From 78df0ccec708e89b3609b20d3cfd4b1bdd5902bb Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Wed, 14 Jun 2023 15:12:27 +0530 Subject: [PATCH] TP-31433 | Remove mockServer Product-Flavor (#6873) --- app/build.gradle | 25 +----------- app/src/mockServerDebug/google-services.json | 40 ------------------- .../res/values/network_strings.xml | 13 ------ gradle.properties | 2 - navi-insurance/build.gradle | 6 --- navi_pl_dynamic/build.gradle | 3 -- 6 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 app/src/mockServerDebug/google-services.json delete mode 100644 app/src/mockServerDebug/res/values/network_strings.xml diff --git a/app/build.gradle b/app/build.gradle index 7dc2864d56..8635d71505 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,7 +69,7 @@ android { sourceSets { dev { androidTest { - java.srcDirs = ['src/androidTestDev/java', 'src/androidTestMockServer/java', 'src/androidTestLibrary/java'] + java.srcDirs = ['src/androidTestDev/java', 'src/androidTestLibrary/java'] } test { java.srcDirs = ['src/test/java'] @@ -176,35 +176,12 @@ android { buildConfigField 'String', 'GI_RAZORPAY_KEY', formatString("$GI_RAZORPAY_KEY") } } - mockServer { - applicationId "com.naviapp.test" - dimension "app" - buildConfigField 'String', 'BASE_URL', formatString('http://localhost:7000/') - buildConfigField "String", "MOENGAGE_KEY", formatString('2PDJ4M6TDY7ADQ5N5LU48H9Y') - buildConfigField "String", "APPSFLYER_KEY", formatString('ua6cppJ9oQx7aPQPNyHrHA') - buildConfigField 'String', 'HYPERVERGE_APP_KEY', formatString('c9b1e034f7c8961a3f5b') - buildConfigField 'String', 'HYPERVERGE_APP_ID', formatString('2c007b') - buildConfigField 'String', 'XIAOMI_PUSH_APP_ID', formatString('2882303761520048763') - buildConfigField 'String', 'XIAOMI_PUSH_APP_KEY', formatString('5712004833763') - manifestPlaceholders = [TRUECALLER_KEY: "6E6TX0cd28bada2b14cf28534dfce68c6a245", FACEBOOK_APP_ID: "0"] - buildConfigField 'String', 'GI_SECRET_KEY', formatString('navi-gi') - buildConfigField 'String', 'YOUTUBE_KEY', formatString('AIzaSyDlbxag2dCc-a9ac8JTfH3nnVw41pdI-1U') - buildConfigField 'String', 'GOOGLE_MAPS_KEY', formatString("AIzaSyD-7-YhOAzX4VJfVLsHUz8KEn-1MGJq46o") - } } packagingOptions { resources { excludes += ['META-INF'] } } - - variantFilter { variant -> - def names = variant.flavors*.name - if (variant.buildType.name == 'release' && names.contains('mockServer')) { - println(names) - setIgnore(true) - } - } repositories { flatDir { dirs 'libs' diff --git a/app/src/mockServerDebug/google-services.json b/app/src/mockServerDebug/google-services.json deleted file mode 100644 index 48bd62d5db..0000000000 --- a/app/src/mockServerDebug/google-services.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "project_info": { - "project_number": "376192219555", - "firebase_url": "https://navi-test-58d56.firebaseio.com", - "project_id": "navi-test-58d56", - "storage_bucket": "navi-test-58d56.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:376192219555:android:2c8e7e2fb17427f1834216", - "android_client_info": { - "package_name": "com.naviapp.test" - } - }, - "oauth_client": [ - { - "client_id": "376192219555-47f7g6aeholrpk7os8o1ekmh3050c6b3.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyDknqwEViYIpQuon2eZx27W_WeOSVVKIY4" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "376192219555-47f7g6aeholrpk7os8o1ekmh3050c6b3.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/app/src/mockServerDebug/res/values/network_strings.xml b/app/src/mockServerDebug/res/values/network_strings.xml deleted file mode 100644 index 6d86af41c3..0000000000 --- a/app/src/mockServerDebug/res/values/network_strings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - http://www.navi.com - http://www.navi.com - - \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 58016b6b4d..87bd405c95 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,8 +27,6 @@ android.disableAutomaticComponentCreation=true testType="" devDebugApk=build/outputs/apk/dev/debug/app-dev-debug.apk devTestApk=build/outputs/apk/androidTest/dev/debug/app-dev-debug-androidTest.apk -mockServerDebugApk=build/outputs/apk/mockServer/debug/app-mockServer-debug.apk -mockServerTestApk=build/outputs/apk/androidTest/mockServer/debug/app-mockServer-debug-androidTest.apk bsAuth="sudarshangs1:oaYqM81qEjMTwpAaipiQ" bsBuilds="https://api-cloud.browserstack.com/app-automate/espresso/builds/" bsAppUpload="https://api-cloud.browserstack.com/app-automate/upload" diff --git a/navi-insurance/build.gradle b/navi-insurance/build.gradle index cdd1102e48..13861eb0bd 100644 --- a/navi-insurance/build.gradle +++ b/navi-insurance/build.gradle @@ -62,12 +62,6 @@ android { buildConfigField 'String', 'GOOGLE_MAPS_KEY', formatString("$GOOGLE_MAPS_KEY") } } - mockServer { - dimension "app" - buildConfigField 'String', 'GI_RAZORPAY_KEY', formatString('rzp_test_vBmFshr0H06Hoe') - manifestPlaceholders = [GOOGLE_MAPS_KEY: "AIzaSyD-7-YhOAzX4VJfVLsHUz8KEn-1MGJq46o"] - buildConfigField 'String', 'GOOGLE_MAPS_KEY', formatString("AIzaSyD-7-YhOAzX4VJfVLsHUz8KEn-1MGJq46o") - } } } diff --git a/navi_pl_dynamic/build.gradle b/navi_pl_dynamic/build.gradle index 1d3ac6765f..4bc936b2e3 100644 --- a/navi_pl_dynamic/build.gradle +++ b/navi_pl_dynamic/build.gradle @@ -49,9 +49,6 @@ android { prod { dimension "app" } - mockServer { - dimension "app" - } } }