From a4ac17143f4474d2db2d71df7c4114b0d59b6afc Mon Sep 17 00:00:00 2001 From: sadorowo Date: Sun, 16 Jun 2024 11:38:47 +0200 Subject: [PATCH] set separate app ID & icon for debug version --- app/build.gradle | 30 +++++++++++++---- app/google-services.json | 31 ++++++++++++++++++ .../ic_launcher_monochrome_foreground.png | Bin 0 -> 1758 bytes .../ic_launcher_monochrome_foreground.png | Bin 0 -> 1212 bytes .../ic_launcher_monochrome_foreground.png | Bin 0 -> 2068 bytes .../ic_launcher_monochrome_foreground.png | Bin 0 -> 2962 bytes .../ic_launcher_monochrome_foreground.png | Bin 0 -> 10089 bytes .../res/values/ic_launcher_background.xml | 8 +++++ app/src/main/AndroidManifest.xml | 3 -- 9 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome_foreground.png create mode 100644 app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome_foreground.png create mode 100644 app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome_foreground.png create mode 100644 app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome_foreground.png create mode 100644 app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome_foreground.png create mode 100644 app/src/debug/res/values/ic_launcher_background.xml diff --git a/app/build.gradle b/app/build.gradle index 4f02fb91..4ec9bd31 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,5 @@ +import android.annotation.SuppressLint + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' @@ -20,8 +22,9 @@ android { buildConfigField "java.util.Map", "GIT_INFO", gitInfoMap buildConfigField "String", "VERSION_BASE", "\"${release.versionName}\"" + manifestPlaceholders = [ - buildTimestamp: String.valueOf(System.currentTimeMillis()) + buildTimestamp: String.valueOf(System.currentTimeMillis()) ] multiDexEnabled = true @@ -36,8 +39,8 @@ android { arguments { arg("room.schemaLocation", "$projectDir/schemas") } - correctErrorTypes true + correctErrorTypes true } } @@ -45,10 +48,12 @@ android { debug { getIsDefault().set(true) minifyEnabled = false + applicationIdSuffix ".debug" manifestPlaceholders = [ - buildTimestamp: 0 + buildTimestamp: 0 ] } + release { minifyEnabled = true shrinkResources = true @@ -56,28 +61,35 @@ android { proguardFiles fileTree('proguard').asList().toArray() } } - flavorDimensions "platform" + + flavorDimensions += "platform" + productFlavors { unofficial { getIsDefault().set(true) versionName "${release.versionName}-${gitInfo.versionSuffix}" } + official {} play {} } + variantFilter { variant -> def flavors = variant.flavors*.name setIgnore(variant.buildType.name == "debug" && !flavors.contains("unofficial") || flavors.contains("main")) } + sourceSets { unofficial { java.srcDirs = ["src/main/java", "src/play-not/java"] manifest.srcFile("src/play-not/AndroidManifest.xml") } + official { java.srcDirs = ["src/main/java", "src/play-not/java"] manifest.srcFile("src/play-not/AndroidManifest.xml") } + play { java.srcDirs = ["src/main/java", "src/play/java"] } @@ -86,35 +98,41 @@ android { defaultConfig { vectorDrawables.useSupportLibrary = true } + buildFeatures { dataBinding = true viewBinding = true - buildConfig true + buildConfig = true } + compileOptions { coreLibraryDesugaringEnabled = true sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } + kotlinOptions { jvmTarget = "1.8" } + packagingOptions { resources { excludes += ['META-INF/library-core_release.kotlin_module'] } } + externalNativeBuild { cmake { path "src/main/cpp/CMakeLists.txt" version "3.10.2" } } + lint { checkReleaseBuilds false } - namespace 'pl.szczodrzynski.edziennik' + namespace 'pl.szczodrzynski.edziennik' } tasks.whenTaskAdded { task -> diff --git a/app/google-services.json b/app/google-services.json index 247bf747..8412fad0 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -36,6 +36,37 @@ "status": 2 } } + }, + { + "client_info": { + "mobilesdk_app_id": "1:640759989760:android:4aa71407b25cdc8d", + "android_client_info": { + "package_name": "pl.szczodrzynski.edziennik.debug" + } + }, + "oauth_client": [ + { + "client_id": "640759989760-6f8q00u864lnuh3gh36e8g4cer9lv8pv.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyAvq9HMPxulz9ntdAHZ0eZuPf2YQs4nDSU" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 1, + "other_platform_oauth_client": [] + }, + "ads_service": { + "status": 2 + } + } } ], "configuration_version": "1" diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome_foreground.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..c9d04eb58bbdad7e19dfa58cfad9d692a16055dd GIT binary patch literal 1758 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 C6_i&1 literal 0 HcmV?d00001 diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome_foreground.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..88b09b03d836ef5d3f9c192c7a8a62d54416a5f7 GIT binary patch literal 2962 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 Qcz} + + + + #FF7D54 + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c7f3d68c..c5335573 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,7 +41,6 @@ |___/ --> @@ -134,7 +133,6 @@ android:theme="@style/DeadTheme" />