Merge pull request #2169 from hussainmohd-a/v055n

v055u

Author: hussainmohd-a

.gitignore

@@ -27,3 +27,4 @@ app/src/headless/assets
 /platforms
 /tools
 /.kotlin/sessions
+app/google-services.json

app/build.gradle

@@ -4,6 +4,24 @@ plugins {
     id 'kotlin-android'
 }
 
+// apply Google Services and Firebase Crashlytics plugins conditionally
+// strategy: For command-line builds, check task names. For IDE, always apply plugins
+// but they'll only process play/website variants (Firebase deps are scoped to those variants)
+def taskNames = gradle.startParameter.taskNames.join(',').toLowerCase()
+def isFdroidBuild = taskNames.contains("fdroid")
+
+println("app-task names: '$taskNames'")
+println("app; is fdroid build? $isFdroidBuild")
+
+// don't apply firebase plugins for fdroid CLI builds
+if (!isFdroidBuild) {
+    apply plugin: 'com.google.gms.google-services'
+    apply plugin: 'com.google.firebase.crashlytics'
+    println("app firebase plugins applied")
+} else {
+    println("app firebase plugins SKIPPED")
+}
+
 def keystorePropertiesFile = rootProject.file("keystore.properties")
 def keystoreProperties = new Properties()
 
@@ -44,13 +62,13 @@ try {
 }
 
 android {
-    compileSdk 35
+    compileSdkVersion(36)
     // https://developer.android.com/studio/build/configure-app-module
     namespace 'com.celzero.bravedns'
 
     defaultConfig {
         applicationId "com.celzero.bravedns"
-        minSdkVersion 23
+        minSdkVersion(23)
         targetSdkVersion 35
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -120,6 +138,19 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk {
+                // Use SYMBOL_TABLE to reduce symbol file size significantly
+                debugSymbolLevel 'SYMBOL_TABLE'
+                // Only process symbols for the most common ABIs to avoid Crashlytics index errors
+                // This reduces the total symbol data Crashlytics needs to process
+                abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
+            }
+            if (!isFdroidBuild) {
+                firebaseCrashlytics {
+                    // Enable processing and uploading of native symbols to Firebase servers.
+                    nativeSymbolUploadEnabled true
+                }
+            }
         }
         leakCanary {
             matchingFallbacks = ['debug']
@@ -135,6 +166,28 @@ android {
         }
     }
 
+    // fix: injectCrashlyticsBuildIds task has a buffer overflow bug
+    // apply crashlytics configuration to firebase builds only
+    if (!isFdroidBuild) {
+        // workaround for crashlytics gradle plugin bug with large native symbols
+        afterEvaluate {
+            tasks.configureEach { task ->
+                if (task.name.contains("injectCrashlyticsBuildIds")) {
+                    // disable the problematic task - symbols will still be uploaded via uploadCrashlyticsSymbolFile
+                    task.enabled = false
+                    logger.warn("disabled build id injection for: ${task.name} (workaround for IndexOutOfBoundsException)")
+                    logger.warn("native symbols will still be uploaded via uploadCrashlyticsSymbolFile task")
+                }
+
+                if (task.name.contains("uploadCrashlyticsSymbolFile")) {
+                    task.doFirst {
+                        logger.info("uploading crashlytics symbols: ${task.name}")
+                    }
+                }
+            }
+        }
+    }
+
     buildFeatures {
         viewBinding true
         buildConfig true
@@ -187,12 +240,12 @@ configurations {
 def firestackRepo = project.findProperty("firestackRepo") ?: "github"
 def firestackCommit = project.findProperty("firestackCommit") ?: "main"
 
-def firestackDependency = { suffix = "" ->
+def firestackDependency = { suffix = ":debug" ->
     switch (firestackRepo) {
         case "jitpack":
             return "com.github.celzero:firestack:$firestackCommit${suffix}@aar"
         case "github":
-            return "com.github.celzero:firestack:$firestackCommit${suffix}"
+            return "com.github.celzero:firestack:$firestackCommit${suffix}@aar"
         case "ossrh":
             return "com.celzero:firestack:$firestackCommit${suffix}@aar"
         default:
@@ -201,18 +254,18 @@ def firestackDependency = { suffix = "" ->
 }
 
 dependencies {
-    def room_version = "2.7.2"
+    def room_version = "2.8.1"
     def paging_version = "3.3.6"
 
-    implementation 'com.google.guava:guava:33.4.8-android'
+    implementation 'com.google.guava:guava:33.5.0-android'
 
     // https://developer.android.com/studio/write/java8-support
     // included to fix issues with Android 6 support, issue#563
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
 
     fullImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20'
     fullImplementation 'androidx.appcompat:appcompat:1.7.1'
-    fullImplementation 'androidx.core:core-ktx:1.17.0'
+    fullImplementation 'androidx.core:core-ktx:1.16.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     fullImplementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     fullImplementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
@@ -221,51 +274,51 @@ dependencies {
     fullImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2'
 
     // LiveData
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.2'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.4'
 
-    implementation 'com.google.code.gson:gson:2.13.1'
+    implementation 'com.google.code.gson:gson:2.13.2'
 
     implementation "androidx.room:room-runtime:$room_version"
     ksp "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
     implementation "androidx.room:room-paging:$room_version"
 
-    fullImplementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2'
-    fullImplementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.2'
+    fullImplementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4'
+    fullImplementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.4'
 
     // Pagers Views
     implementation "androidx.paging:paging-runtime-ktx:$paging_version"
     fullImplementation 'androidx.fragment:fragment-ktx:1.8.9'
-    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'com.google.android.material:material:1.13.0'
     fullImplementation 'androidx.viewpager2:viewpager2:1.1.0'
 
-    fullImplementation 'com.squareup.okhttp3:okhttp:5.1.0'
-    fullImplementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:5.1.0'
+    fullImplementation 'com.squareup.okhttp3:okhttp:5.2.1'
+    fullImplementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:5.2.1'
 
     fullImplementation 'com.squareup.retrofit2:retrofit:3.0.0'
     fullImplementation 'com.squareup.retrofit2:converter-gson:3.0.0'
 
-    implementation 'com.squareup.okio:okio-jvm:3.16.0'
+    implementation 'com.squareup.okio:okio-jvm:3.16.2'
     // Glide
-    fullImplementation('com.github.bumptech.glide:glide:4.16.0') {
+    fullImplementation('com.github.bumptech.glide:glide:5.0.5') {
         exclude group: 'glide-parent'
     }
-    fullImplementation('com.github.bumptech.glide:okhttp3-integration:4.16.0') {
+    fullImplementation('com.github.bumptech.glide:okhttp3-integration:5.0.5') {
         exclude group: 'glide-parent'
     }
 
     // Ref: https://stackoverflow.com/a/46638213
-    kspFull 'com.github.bumptech.glide:compiler:4.16.0'
+    kspFull 'com.github.bumptech.glide:compiler:5.0.5'
 
     // Swipe button animation
     fullImplementation 'com.facebook.shimmer:shimmer:0.5.0'
 
     // Koin core
-    download 'io.insert-koin:koin-core:4.1.0'
-    implementation 'io.insert-koin:koin-core:4.1.0'
+    download 'io.insert-koin:koin-core:4.1.1'
+    implementation 'io.insert-koin:koin-core:4.1.1'
     // Koin main (Scope, ViewModel ...)
-    download 'io.insert-koin:koin-android:4.1.0'
-    implementation 'io.insert-koin:koin-android:4.1.0'
+    download 'io.insert-koin:koin-android:4.1.1'
+    implementation 'io.insert-koin:koin-android:4.1.1'
 
     download 'hu.autsoft:krate:2.0.0'
     implementation 'hu.autsoft:krate:2.0.0'
@@ -281,7 +334,7 @@ dependencies {
     playImplementation firestackDependency()
 
     // Work manager
-    implementation('androidx.work:work-runtime-ktx:2.10.3') {
+    implementation('androidx.work:work-runtime-ktx:2.10.5') {
         modules {
             module("com.google.guava:listenablefuture") {
                 replacedBy("com.google.guava:guava", "listenablefuture is part of guava")
@@ -298,11 +351,23 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
     androidTestImplementation 'androidx.test:rules:1.7.0'
+    testImplementation 'org.robolectric:robolectric:4.16'
+    testImplementation 'androidx.test:core:1.7.0'
+    testImplementation 'androidx.test.ext:junit:1.3.0'
+    testImplementation 'org.mockito:mockito-core:5.20.0'
+    // Added test dependencies for comprehensive testing
+    testImplementation 'io.mockk:mockk:1.14.6'
+    testImplementation 'io.mockk:mockk-android:1.14.6'
+    testImplementation 'androidx.arch.core:core-testing:2.2.0'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2'
+    testImplementation 'io.insert-koin:koin-test:4.1.1'
+    testImplementation 'io.insert-koin:koin-test-junit4:4.1.1'
+    androidTestImplementation 'io.mockk:mockk-android:1.14.6'
 
     leakCanaryImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
 
-    fullImplementation 'androidx.navigation:navigation-fragment-ktx:2.9.3'
-    fullImplementation 'androidx.navigation:navigation-ui-ktx:2.9.3'
+    fullImplementation 'androidx.navigation:navigation-fragment-ktx:2.9.5'
+    fullImplementation 'androidx.navigation:navigation-ui-ktx:2.9.5'
 
     fullImplementation 'androidx.biometric:biometric:1.1.0'
 
@@ -328,4 +393,21 @@ dependencies {
     //fdroidImplementation 'com.stripe:stripe-android:21.21.0'
 
     lintChecks 'com.android.security.lint:lint:1.0.3'
+
+    // battery optimization permission helper
+    implementation 'com.waseemsabir:betterypermissionhelper:1.0.3'
+
+    // Facebook battery metrics
+    implementation 'com.facebook.battery:metrics:1.0.0'
+    implementation 'com.facebook.battery:reporters:1.0.0'
+    implementation 'com.facebook.battery:serializers:1.0.0'
+
+    // Firebase dependencies for error reporting (website and play variants only)
+    websiteImplementation platform('com.google.firebase:firebase-bom:34.4.0')
+    websiteImplementation 'com.google.firebase:firebase-crashlytics'
+    websiteImplementation 'com.google.firebase:firebase-crashlytics-ndk'
+
+    playImplementation platform('com.google.firebase:firebase-bom:34.4.0')
+    playImplementation 'com.google.firebase:firebase-crashlytics'
+    playImplementation 'com.google.firebase:firebase-crashlytics-ndk'
 }