From a728fec7fd5b6eab60f06d66f74d82565731877e Mon Sep 17 00:00:00 2001 From: valentunn <70131744+valentunn@users.noreply.github.com> Date: Thu, 29 Sep 2022 14:21:39 +0700 Subject: [PATCH] Fix test release build (#467) --- app/build.gradle | 42 +++++++++++++++------------- app/src/release/google-services.json | 29 +++++++++++++++++++ 2 files changed, 52 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d9bc2c660c..f0ebc7cd61 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,8 +52,8 @@ android { matchingFallbacks = ['release'] signingConfig signingConfigs.debug - versionNameSuffix '-test' - applicationIdSuffix '.test' + versionNameSuffix '-releaseTest' + applicationIdSuffix '.releaseTest' } releaseMarket { initWith buildTypes.release @@ -98,6 +98,9 @@ android { releaseMarket { res.srcDirs = ['src/release/res'] } + releaseTest { + res.srcDirs = ['src/release/res'] + } } bundle { @@ -112,29 +115,30 @@ android { } kotlinOptions { - - jvmTarget = '1.8' } -} -task bindReleaseGithubGoogleServicesToRelease(type: Copy) { - description = 'Switches to RELEASE google-services.json for GitHub' - from "src/release" - include "google-services.json" - into "src/releaseGithub" + applicationVariants.all { variant -> + String name = variant.buildType.name + if (name != "release" && name.startsWith("release")) { + createBindReleaseFileTask(variant.buildType.name) + } + } } -task bindReleaseMarketGoogleServicesToRelease(type: Copy) { - description = 'Switches to RELEASE google-services.json for Market' - from "src/release" - include "google-services.json" - into "src/releaseMarket" -} +void createBindReleaseFileTask(String destination) { + String taskName = "bind${destination.capitalize()}GithubGoogleServicesToRelease" -afterEvaluate { - processReleaseGithubGoogleServices.dependsOn bindReleaseGithubGoogleServicesToRelease - processReleaseMarketGoogleServices.dependsOn bindReleaseMarketGoogleServicesToRelease + Task task = task(taskName, type: Copy) { + description = "Switches to RELEASE google-services.json for ${destination}" + from "src/release" + include "google-services.json" + into "src/${destination}" + } + + afterEvaluate { + tasks.getByName("process${destination.capitalize()}GoogleServices").dependsOn task + } } play { diff --git a/app/src/release/google-services.json b/app/src/release/google-services.json index 3c16544999..21883e1794 100644 --- a/app/src/release/google-services.json +++ b/app/src/release/google-services.json @@ -91,6 +91,35 @@ ] } } + }, + { + "client_info": { + "mobilesdk_app_id": "1:802342409053:android:67b2b7e7e96c0a76378eb4", + "android_client_info": { + "package_name": "io.novafoundation.nova.releaseTest" + } + }, + "oauth_client": [ + { + "client_id": "802342409053-rgoughr36c138jfjle5k8glafpkbagli.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDV0jNUiEGmb4tOn65m2EAyGV5eJpxhZY0" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "802342409053-rgoughr36c138jfjle5k8glafpkbagli.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } } ], "configuration_version": "1"