Merge pull request #1581 from hussainmohd-a/v055n

v055o

Author: hussainmohd-a

.gitignore

@@ -25,4 +25,5 @@ app/src/headless/assets
 /patcher
 /platform-tools
 /platforms
-/tools
+/tools
+/.kotlin/sessions

app/build.gradle

@@ -1,11 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'com.google.devtools.ksp'
-    // to download blocklists for the headless variant
-    id "de.undercouch.download" version "5.3.0"
     id 'kotlin-android'
-    id 'com.google.gms.google-services'
-    id 'com.google.firebase.crashlytics'
 }
 
 def keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -48,14 +44,14 @@ try {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
     // https://developer.android.com/studio/build/configure-app-module
     namespace 'com.celzero.bravedns'
 
     defaultConfig {
         applicationId "com.celzero.bravedns"
         minSdkVersion 23
-        targetSdkVersion 34
+        targetSdkVersion 35
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -76,6 +72,47 @@ android {
         }
     }
 
+    // https://developer.android.com/studio/build/configure-apk-splits
+    splits.abi {
+        println('Create separate apks')
+        // generates multiple APKs based on the ABIs you define
+        enable true
+        reset()
+        // comma-separated list of ABIs that you want Gradle to generate APKs for
+        include 'x86', 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64'
+        // generates a universal APK in addition to per-ABI APKs
+        universalApk true
+    }
+    // version codes for each ABI variant
+    project.ext.versionCodes = [
+            'armeabi'    : 1,
+            'armeabi-v7a': 2,
+            'arm64-v8a'  : 3,
+            'x86'        : 8,
+            'x86_64'     : 9
+    ]
+    android.applicationVariants.configureEach { variant ->
+        println("variant name: ${variant.name}")
+        variant.outputs.configureEach { output ->
+            // def abi = output.filters.find { it.filterType.name == "ABI" }?.identifier
+            def abi = variant.outputs.first().getFilter(com.android.build.OutputFile.ABI)
+            def baseAbiVersionCode = project.ext.versionCodes.get(abi)
+            println("base version code: $baseAbiVersionCode")
+            if (abi != null) {
+                println("variant name: ${variant.name}, abi: $abi")
+                // assign different version code for each output
+                // eg for arm64-v8a, version code will be 30000000 + variant.versionCode
+                def v = baseAbiVersionCode * 10000000 + variant.versionCode
+                // API 'ApkVariantOutput.getVersionCodeOverride()' is obsolete and has been replaced
+                // with 'VariantOutput.versionCode()'
+                output.versionCodeOverride = v
+                println("version code override: $v")
+            } else {
+                println("no ABI filter applied for variant: ${variant.name}")
+            }
+        }
+    }
+
     buildTypes {
         release {
             // modified as part of #352, now webview is removed from app, flipping back
@@ -115,15 +152,6 @@ android {
         }
     }
 
-    variantFilter { variant ->
-        def releaseChannel = variant.getFlavors().get(0).name
-        def releaseType = variant.getFlavors().get(1).name
-
-        if (releaseType == 'headless' && releaseChannel != 'fdroid') {
-            variant.setIgnore(true)
-        }
-    }
-
     flavorDimensions = ["releaseChannel", "releaseType"]
     productFlavors {
         play {
@@ -135,35 +163,19 @@ android {
         website {
             dimension "releaseChannel"
         }
-        headless {
-            dimension "releaseType"
-            minSdkVersion 31
-            // stackoverflow.com/a/60560178
-            // buildConfigField 'string', 'timestamp', '1662384683026'
-        }
         full {
             dimension "releaseType"
             // getPackageInfo().versionCode not returning the correct value (in prod builds) when
             // value is set in AndroidManifest.xml so setting it here
-            // for buildtype alpha, versionCode is set in env overriding gradle.properties
+            // for build type alpha, versionCode is set in env overriding gradle.properties
             versionCode = getVersionCode()
             versionName = gitVersion
             vectorDrawables.useSupportLibrary = true
         }
     }
     lint {
-        abortOnError false
-    }
-
-    tasks.configureEach { task ->
-        if (task.name.toLowerCase().contains('headless')) {
-            task.dependsOn downloadBlocklists
-            if (task.name.endsWith("BuildConfig")) {
-                task.enabled false
-            }
-        }
+        abortOnError true
     }
-
 }
 
 configurations {
@@ -172,54 +184,69 @@ configurations {
     }
 }
 
+def firestackRepo = project.findProperty("firestackRepo") ?: "github"
+def firestackCommit = project.findProperty("firestackCommit") ?: "main"
+
+def firestackDependency = { suffix = "" ->
+    switch (firestackRepo) {
+        case "jitpack":
+            return "com.github.celzero:firestack:$firestackCommit${suffix}@aar"
+        case "github":
+            return "com.github.celzero:firestack:$firestackCommit${suffix}"
+        case "ossrh":
+            return "com.celzero:firestack:$firestackCommit${suffix}@aar"
+        default:
+            throw new GradleException("Unknown firestackRepo: $firestackRepo")
+    }
+}
+
 dependencies {
-    androidTestImplementation 'androidx.test:rules:1.5.0'
     def room_version = "2.6.1"
-    def paging_version = "3.2.1"
+    def paging_version = "3.3.6"
 
-    implementation 'com.google.guava:guava:32.1.1-android'
+    implementation 'com.google.guava:guava:33.4.8-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.0.4")
 
-    fullImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21'
-    fullImplementation 'androidx.appcompat:appcompat:1.6.1'
-    fullImplementation 'androidx.core:core-ktx:1.12.0'
+    fullImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0'
+    fullImplementation 'androidx.appcompat:appcompat:1.7.1'
+    fullImplementation 'androidx.core:core-ktx:1.16.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    fullImplementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    fullImplementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     fullImplementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
-    fullImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
-    fullImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    fullImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2'
+    fullImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2'
 
     // LiveData
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.1'
 
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.google.code.gson:gson:2.13.1'
 
     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-extensions:2.2.0'
-    fullImplementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
-    fullImplementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+    fullImplementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1'
+    fullImplementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.1'
 
     // Pagers Views
     implementation "androidx.paging:paging-runtime-ktx:$paging_version"
-    fullImplementation 'androidx.fragment:fragment-ktx:1.6.2'
-    implementation 'com.google.android.material:material:1.11.0'
-    fullImplementation 'androidx.viewpager2:viewpager2:1.0.0'
+    fullImplementation 'androidx.fragment:fragment-ktx:1.8.8'
+    implementation 'com.google.android.material:material:1.12.0'
+    fullImplementation 'androidx.viewpager2:viewpager2:1.1.0'
 
-    fullImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
-    fullImplementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'
+    fullImplementation 'com.squareup.okhttp3:okhttp:5.1.0'
+    fullImplementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:5.1.0'
 
-    fullImplementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    fullImplementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    fullImplementation 'com.squareup.retrofit2:retrofit:3.0.0'
+    fullImplementation 'com.squareup.retrofit2:converter-gson:3.0.0'
 
-    implementation 'com.squareup.okio:okio-jvm:3.9.0'
+    implementation 'com.squareup.okio:okio-jvm:3.15.0'
     // Glide
     fullImplementation('com.github.bumptech.glide:glide:4.16.0') {
         exclude group: 'glide-parent'
@@ -235,11 +262,11 @@ dependencies {
     fullImplementation 'com.facebook.shimmer:shimmer:0.5.0'
 
     // Koin core
-    download 'io.insert-koin:koin-core:3.5.6'
-    implementation 'io.insert-koin:koin-core:3.5.6'
+    download 'io.insert-koin:koin-core:4.1.0'
+    implementation 'io.insert-koin:koin-core:4.1.0'
     // Koin main (Scope, ViewModel ...)
-    download 'io.insert-koin:koin-android:3.5.6'
-    implementation 'io.insert-koin:koin-android:3.5.6'
+    download 'io.insert-koin:koin-android:4.1.0'
+    implementation 'io.insert-koin:koin-android:4.1.0'
 
     download 'hu.autsoft:krate:2.0.0'
     implementation 'hu.autsoft:krate:2.0.0'
@@ -248,15 +275,14 @@ dependencies {
     fullImplementation 'com.github.kirich1409:viewbindingpropertydelegate:1.5.9'
     fullImplementation 'com.github.kirich1409:viewbindingpropertydelegate-noreflection:1.5.9'
 
-    // from: https://jitpack.io/#celzero/firestack
-    download 'com.github.celzero:firestack:ee0a5ac71f@aar'
-    websiteImplementation 'com.github.celzero:firestack:ee0a5ac71f@aar'
-    fdroidImplementation 'com.github.celzero:firestack:ee0a5ac71f@aar'
-    // debug symbols for crashlytics
-    playImplementation 'com.github.celzero:firestack:ee0a5ac71f:debug@aar'
+    // add ":debug" suffix to the dependency to include debug symbols
+    download firestackDependency()
+    websiteImplementation firestackDependency()
+    fdroidImplementation firestackDependency()
+    playImplementation firestackDependency()
 
     // Work manager
-    implementation('androidx.work:work-runtime-ktx:2.9.0') {
+    implementation('androidx.work:work-runtime-ktx:2.10.2') {
         modules {
             module("com.google.guava:listenablefuture") {
                 replacedBy("com.google.guava:guava", "listenablefuture is part of guava")
@@ -265,66 +291,42 @@ dependencies {
     }
 
     // for handling IP addresses and subnets, both IPv4 and IPv6
-    // https://seancfoley.github.io/IPAddress/ipaddress.html
-    download 'com.github.seancfoley:ipaddress:5.4.0'
-    implementation 'com.github.seancfoley:ipaddress:5.4.0'
+    // seancfoley.github.io/IPAddress/ipaddress.html
+    download 'com.github.seancfoley:ipaddress:5.5.1'
+    implementation 'com.github.seancfoley:ipaddress:5.5.1'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
 
     leakCanaryImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
 
-    fullImplementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
-    fullImplementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+    fullImplementation 'androidx.navigation:navigation-fragment-ktx:2.9.1'
+    fullImplementation 'androidx.navigation:navigation-ui-ktx:2.9.1'
 
     fullImplementation 'androidx.biometric:biometric:1.1.0'
 
     playImplementation 'com.google.android.play:app-update:2.1.0'
     playImplementation 'com.google.android.play:app-update-ktx:2.1.0'
 
     // for encrypting wireguard configuration files
-    implementation("androidx.security:security-crypto:1.1.0-alpha06")
-    implementation("androidx.security:security-app-authenticator:1.0.0-alpha03")
-    androidTestImplementation("androidx.security:security-app-authenticator:1.0.0-alpha03")
+    implementation("androidx.security:security-crypto:1.1.0-beta01")
+    implementation("androidx.security:security-app-authenticator:1.0.0-rc01")
+    androidTestImplementation("androidx.security:security-app-authenticator:1.0.0-rc01")
 
     // barcode scanner for wireguard
     fullImplementation 'com.journeyapps:zxing-android-embedded:4.3.0'
-
-    // only using firebase crashlytics experimentally for stability tracking, only in play variant
-    // not in fdroid or website
-    playImplementation 'com.google.firebase:firebase-crashlytics:19.0.0'
-    playImplementation 'com.google.firebase:firebase-crashlytics-ndk:19.0.0'
-}
-
-// github.com/michel-kraemer/gradle-download-task/issues/131#issuecomment-464476903
-tasks.register('downloadBlocklists', Download) {
-    // def assetsDir = new File(projectDir, 'src/main/assets'
-    def assetsDir = android.sourceSets.headless.assets.srcDirs[0]
-    // the filenames are ignored by dl, but acts as a hint for the output
-    // filename for the download-plugin, which does not respect the
-    // content-disposition http header, but rather guesses dest file names
-    // from the final segment of url's path
-    // github.com/michel-kraemer/gradle-download-task/blob/64d1ce32/src/main/java/de/undercouch/gradle/tasks/download/DownloadAction.java#L731
-    def sources = [
-            'https://dl.rethinkdns.com/blocklists/filetag.json',
-            'https://dl.rethinkdns.com/basicconfig/basicconfig.json',
-            'https://dl.rethinkdns.com/rank/rd.txt',
-            'https://dl.rethinkdns.com/trie/td.txt',
-    ]
-    src(sources)
-    dest assetsDir
-    // download files only if last-modified of the local file is less than
-    // the last-modified http header returned by the server
-    onlyIfModified true
-    // or if etag mismatches
-    useETag true
-    // overwrite older files as determined by last-modified, always
-    overwrite true
-}
-
-tasks.register('downloadDependencies', Copy) {
-    dependsOn downloadBlocklists
-    from configurations.download
-    into "libs"
+    fullImplementation 'com.simplecityapps:recyclerview-fastscroll:2.0.1'
+
+    // for confetti animation
+    fullImplementation 'nl.dionsegijn:konfetti-xml:2.0.5'
+    // for in-app purchases
+    //playImplementation 'com.android.billingclient:billing:8.0.0'
+    //websiteImplementation 'com.android.billingclient:billing:8.0.0'
+    // for stripe payment gateway
+    //websiteImplementation 'com.stripe:stripe-android:21.21.0'
+    //fdroidImplementation 'com.stripe:stripe-android:21.21.0'
+
+    lintChecks 'com.android.security.lint:lint:1.0.3'
 }

app/proguard-rules.pro

@@ -55,6 +55,15 @@
 -dontwarn org.bouncycastle.**
 -dontwarn org.openjsse.**
 
+# Keep Gson classes and attributes for JSON serialization/deserialization
+# FileTag class uses Gson with custom deserializer (FileTagDeserializer) to handle
+# dynamic JSON formats where "url" field can be either a string or JsonArray
+# Without these rules, obfuscation would break the reflection-based JSON parsing
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class com.google.gson.** { *; }
+-keep class com.celzero.bravedns.data.FileTag { *; }
+
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile