From 4dd181a2b94b05b604ac511ca1d7bf0749b0e460 Mon Sep 17 00:00:00 2001 From: greextnb Date: Thu, 22 Oct 2026 14:27:30 +0200 Subject: [PATCH 1/8] Minor upgrade. --- app/build.gradle | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5880e2d..7bdbd49 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.0' + classpath 'com.android.tools.build:gradle:8.13.2' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:4.0.0' } } diff --git a/build.gradle b/build.gradle index 041da73..f02d4e8 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url 'https://maven.google.com' } } dependencies { - classpath 'com.android.tools.build:gradle:8.9.2' + classpath 'com.android.tools.build:gradle:8.13.2' classpath 'com.google.gms:google-services:4.3.14' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From a81f40b09ea1d17e5b3936b957105eae862a2cb4 Mon Sep 17 00:00:00 2001 From: greextnb Date: Thu, 22 Oct 2026 15:06:22 +0200 Subject: [PATCH 2/8] Major upgrade. --- app/build.gradle | 12 +++++++++--- build.gradle | 2 +- gradle.properties | 11 ++++++++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7bdbd49..c105dad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.2' + classpath 'com.android.tools.build:gradle:9.4.1' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:4.0.0' } } @@ -25,6 +25,10 @@ apply plugin: 'com.google.firebase.crashlytics' android { compileSdk 35 + buildFeatures { + buildConfig = true + } + defaultConfig { applicationId "com.ayuget.redface" minSdkVersion 16 @@ -48,14 +52,16 @@ android { debuggable false minifyEnabled true shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + buildConfigField("boolean", "DEBUG", "true") } release { debuggable false minifyEnabled true shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + buildConfigField("boolean", "DEBUG", "false") } } lint { diff --git a/build.gradle b/build.gradle index f02d4e8..21c04cb 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url 'https://maven.google.com' } } dependencies { - classpath 'com.android.tools.build:gradle:8.13.2' + classpath 'com.android.tools.build:gradle:9.4.1' classpath 'com.google.gms:google-services:4.3.14' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' } diff --git a/gradle.properties b/gradle.properties index ee79655..2cab40e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,15 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro android.enableJetifier=true android.useAndroidX=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false +android.defaults.buildfeatures.resvalues=true +android.sdk.defaultTargetSdkToCompileSdkIfUnset=false +android.enableAppCompileTimeRClass=false +android.usesSdkInManifest.disallowed=false +android.uniquePackageNames=false +android.dependency.useConstraints=true +android.r8.strictFullModeForKeepRules=false +android.r8.optimizedResourceShrinking=false +android.builtInKotlin=false +android.newDsl=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..7e7d24f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 71855d9d76c851766fffe1395815b0a9a8e39681 Mon Sep 17 00:00:00 2001 From: greextnb Date: Fri, 23 Oct 2026 09:37:42 +0200 Subject: [PATCH 3/8] Remove warnings. --- gradle.properties | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2cab40e..acf7c3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,13 +11,7 @@ android.enableJetifier=true android.useAndroidX=true android.nonTransitiveRClass=false android.nonFinalResIds=false -android.defaults.buildfeatures.resvalues=true -android.sdk.defaultTargetSdkToCompileSdkIfUnset=false android.enableAppCompileTimeRClass=false -android.usesSdkInManifest.disallowed=false android.uniquePackageNames=false android.dependency.useConstraints=true -android.r8.strictFullModeForKeepRules=false -android.r8.optimizedResourceShrinking=false -android.builtInKotlin=false android.newDsl=false From 70cb3233068f9772e90246119c4e21e2990656f7 Mon Sep 17 00:00:00 2001 From: nbonnec Date: Fri, 23 Oct 2026 17:40:01 +0200 Subject: [PATCH 4/8] Retry. --- gradle.properties | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gradle.properties b/gradle.properties index acf7c3e..2cab40e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,13 @@ android.enableJetifier=true android.useAndroidX=true android.nonTransitiveRClass=false android.nonFinalResIds=false +android.defaults.buildfeatures.resvalues=true +android.sdk.defaultTargetSdkToCompileSdkIfUnset=false android.enableAppCompileTimeRClass=false +android.usesSdkInManifest.disallowed=false android.uniquePackageNames=false android.dependency.useConstraints=true +android.r8.strictFullModeForKeepRules=false +android.r8.optimizedResourceShrinking=false +android.builtInKotlin=false android.newDsl=false From 8ef91602603e435593107a51aa36c7311f1cba5d Mon Sep 17 00:00:00 2001 From: nbonnec Date: Fri, 23 Oct 2026 18:01:53 +0200 Subject: [PATCH 5/8] Fix crashlytics. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 21c04cb..3691de6 100644 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,8 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:9.4.1' - classpath 'com.google.gms:google-services:4.3.14' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' + classpath 'com.google.gms:google-services:4.4.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.8' } } From fb507929a81f45b91399f4c6f46fcf0262298e81 Mon Sep 17 00:00:00 2001 From: nbonnec Date: Fri, 23 Oct 2026 18:03:17 +0200 Subject: [PATCH 6/8] Revert "Retry." This reverts commit 70cb3233068f9772e90246119c4e21e2990656f7. --- gradle.properties | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2cab40e..acf7c3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,13 +11,7 @@ android.enableJetifier=true android.useAndroidX=true android.nonTransitiveRClass=false android.nonFinalResIds=false -android.defaults.buildfeatures.resvalues=true -android.sdk.defaultTargetSdkToCompileSdkIfUnset=false android.enableAppCompileTimeRClass=false -android.usesSdkInManifest.disallowed=false android.uniquePackageNames=false android.dependency.useConstraints=true -android.r8.strictFullModeForKeepRules=false -android.r8.optimizedResourceShrinking=false -android.builtInKotlin=false android.newDsl=false From 175fe3cb6c159a0479e51a6be2946aebc2dd2131 Mon Sep 17 00:00:00 2001 From: nbonnec Date: Fri, 23 Oct 2026 18:07:25 +0200 Subject: [PATCH 7/8] No shrinking for now. --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index acf7c3e..468dd03 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,5 +13,6 @@ android.nonTransitiveRClass=false android.nonFinalResIds=false android.enableAppCompileTimeRClass=false android.uniquePackageNames=false +android.r8.optimizedResourceShrinking=false android.dependency.useConstraints=true android.newDsl=false From c4527bbc0fc21abcf141583904902c2e881e7c4a Mon Sep 17 00:00:00 2001 From: Nicolas Bonnec Date: Fri, 23 Oct 2026 18:33:24 +0200 Subject: [PATCH 8/8] Bump gms reading this : https://github.com/firebase/firebase-android-sdk/issues/5962. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3691de6..9ebd877 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:9.4.1' - classpath 'com.google.gms:google-services:4.4.1' + classpath 'com.google.gms:google-services:4.4.2' classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.8' } }