Build & Check F-Droid version

app-compose/build.gradle.kts

@@ -22,7 +22,6 @@ plugins {
     alias(libs.plugins.blocker.android.application.flavors)
     alias(libs.plugins.blocker.android.application.jacoco)
     alias(libs.plugins.blocker.android.hilt)
-    alias(libs.plugins.blocker.android.application.firebase)
     alias(libs.plugins.ksp)
     id("kotlin-parcelize")
     alias(libs.plugins.baselineprofile)
@@ -33,11 +32,8 @@ android {
     namespace = "com.merxury.blocker"
     defaultConfig {
         applicationId = "com.merxury.blocker"
-        val gitCommitCount = providers.exec {
-            commandLine("git", "rev-list", "--count", "HEAD")
-        }.standardOutput.asText.get().trim()
-        versionCode = gitCommitCount.toIntOrNull() ?: 1
-        versionName = "2.0.$gitCommitCount" // X.Y.Z; X = Major, Y = minor, Z = version code
+        versionCode = 4839
+        versionName = "2.0.4839-fdroid" // X.Y.Z; X = Major, Y = minor, Z = version code
 
         // Custom test runner to set up Hilt dependency graph
         testInstrumentationRunner = "com.merxury.blocker.core.testing.BlockerTestRunner"

app-compose/dependencies/marketReleaseRuntimeClasspath.txt

@@ -69,10 +69,6 @@ androidx.datastore:datastore-core-android:1.1.1
 androidx.datastore:datastore-core-okio-jvm:1.1.1
 androidx.datastore:datastore-core-okio:1.1.1
 androidx.datastore:datastore-core:1.1.1
-androidx.datastore:datastore-preferences-android:1.1.1
-androidx.datastore:datastore-preferences-core-jvm:1.1.1
-androidx.datastore:datastore-preferences-core:1.1.1
-androidx.datastore:datastore-preferences:1.1.1
 androidx.datastore:datastore:1.1.1
 androidx.documentfile:documentfile:1.0.1
 androidx.drawerlayout:drawerlayout:1.1.1
@@ -120,8 +116,6 @@ androidx.navigation:navigation-runtime:2.8.0
 androidx.palette:palette-ktx:1.0.0
 androidx.palette:palette:1.0.0
 androidx.print:print:1.0.0
-androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05
-androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05
 androidx.profileinstaller:profileinstaller:1.3.1
 androidx.recyclerview:recyclerview:1.1.0
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
@@ -158,44 +152,15 @@ com.github.topjohnwu.libsu:nio:6.0.0
 com.github.topjohnwu.libsu:service:6.0.0
 com.google.accompanist:accompanist-drawablepainter:0.32.0
 com.google.accompanist:accompanist-permissions:0.36.0
-com.google.android.datatransport:transport-api:3.2.0
-com.google.android.datatransport:transport-backend-cct:3.3.0
-com.google.android.datatransport:transport-runtime:3.3.0
-com.google.android.gms:play-services-ads-identifier:18.0.0
-com.google.android.gms:play-services-basement:18.4.0
-com.google.android.gms:play-services-measurement-api:22.1.0
-com.google.android.gms:play-services-measurement-base:22.1.0
-com.google.android.gms:play-services-measurement-impl:22.1.0
-com.google.android.gms:play-services-measurement-sdk-api:22.1.0
-com.google.android.gms:play-services-measurement-sdk:22.1.0
-com.google.android.gms:play-services-measurement:22.1.0
-com.google.android.gms:play-services-stats:17.0.2
-com.google.android.gms:play-services-tasks:18.2.0
 com.google.android.material:material:1.12.0
 com.google.code.findbugs:jsr305:3.0.2
 com.google.dagger:dagger-lint-aar:2.52
 com.google.dagger:dagger:2.52
 com.google.dagger:hilt-android:2.52
 com.google.dagger:hilt-core:2.52
-com.google.errorprone:error_prone_annotations:2.26.0
-com.google.firebase:firebase-analytics:22.1.0
-com.google.firebase:firebase-annotations:16.2.0
-com.google.firebase:firebase-bom:33.3.0
-com.google.firebase:firebase-common-ktx:21.0.0
-com.google.firebase:firebase-common:21.0.0
-com.google.firebase:firebase-components:18.0.0
-com.google.firebase:firebase-config-interop:16.0.1
-com.google.firebase:firebase-crashlytics:19.1.0
-com.google.firebase:firebase-datatransport:19.0.0
-com.google.firebase:firebase-encoders-json:18.0.1
-com.google.firebase:firebase-encoders-proto:16.0.0
-com.google.firebase:firebase-encoders:17.0.0
-com.google.firebase:firebase-installations-interop:17.2.0
-com.google.firebase:firebase-installations:18.0.0
-com.google.firebase:firebase-measurement-connector:20.0.1
-com.google.firebase:firebase-sessions:2.0.4
+com.google.errorprone:error_prone_annotations:2.15.0
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:31.1-android
+com.google.guava:guava:31.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 com.google.protobuf:protobuf-javalite:4.28.1
@@ -256,7 +221,6 @@ org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0
 org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.9.0
-org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.9.0
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.2

app-compose/marketRelease-badging.txt

@@ -1,4 +1,4 @@
-package: name='com.merxury.blocker' versionCode='4727' versionName='2.0.4727' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='com.merxury.blocker' versionCode='4044' versionName='2.0.4044-fdroid' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
 sdkVersion:'21'
 targetSdkVersion:'34'
 uses-permission: name='android.permission.INTERNET'
@@ -11,10 +11,6 @@ uses-permission: name='moe.shizuku.manager.permission.API'
 uses-permission: name='android.permission.QUERY_ALL_PACKAGES'
 uses-permission: name='android.permission.WAKE_LOCK'
 uses-permission: name='android.permission.RECEIVE_BOOT_COMPLETED'
-uses-permission: name='com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE'
-uses-permission: name='com.google.android.gms.permission.AD_ID'
-uses-permission: name='android.permission.ACCESS_ADSERVICES_ATTRIBUTION'
-uses-permission: name='android.permission.ACCESS_ADSERVICES_AD_ID'
 uses-permission: name='com.merxury.blocker.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION'
 application-label:'Blocker'
 application-label-af:'Blocker'
@@ -112,8 +108,6 @@ application-icon-640:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application-icon-65534:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application: label='Blocker' icon='res/mipmap-anydpi-v26/ic_launcher.xml'
 launchable-activity: name='com.merxury.blocker.MainActivity'  label='' icon=''
-property: name='android.adservices.AD_SERVICES_CONFIG' resource='res/xml/ga_ad_services_config.xml' 
-uses-library-not-required:'android.ext.adservices'
 uses-library-not-required:'androidx.window.extensions'
 uses-library-not-required:'androidx.window.sidecar'
 feature-group: label=''

build-logic/convention/build.gradle.kts

@@ -38,8 +38,6 @@ dependencies {
     compileOnly(libs.android.gradlePlugin)
     compileOnly(libs.android.tools.common)
     compileOnly(libs.compose.gradlePlugin)
-    compileOnly(libs.firebase.performance.gradlePlugin)
-    compileOnly(libs.firebase.crashlytics.gradlePlugin)
     compileOnly(libs.kotlin.gradlePlugin)
     compileOnly(libs.ksp.gradlePlugin)
     compileOnly(libs.licensee.gradlePlugin)
@@ -96,10 +94,6 @@ gradlePlugin {
             id = "blocker.android.room"
             implementationClass = "AndroidRoomConventionPlugin"
         }
-        register("firebase") {
-            id = "blocker.android.application.firebase"
-            implementationClass = "AndroidApplicationFirebaseConventionPlugin"
-        }
         register("androidFlavors") {
             id = "blocker.android.application.flavors"
             implementationClass = "AndroidApplicationFlavorsConventionPlugin"

build.gradle.kts

@@ -33,9 +33,6 @@ plugins {
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.licensee) apply false
-    alias(libs.plugins.firebase.crashlytics) apply false
-    alias(libs.plugins.firebase.perf) apply false
-    alias(libs.plugins.gms) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.roborazzi) apply false
     alias(libs.plugins.room) apply false

core/analytics/build.gradle.kts

@@ -27,7 +27,4 @@ android {
 dependencies {
     implementation(libs.androidx.compose.runtime)
     implementation(libs.timber)
-
-    marketImplementation(platform(libs.firebase.bom))
-    marketImplementation(libs.firebase.analytics)
 }

core/analytics/src/market/kotlin/com/merxury/blocker/core/analytics/AnalyticsModule.kt

@@ -17,25 +17,14 @@
 
 package com.merxury.blocker.core.analytics
 
-import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.analytics.ktx.analytics
-import com.google.firebase.ktx.Firebase
 import dagger.Binds
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 internal abstract class AnalyticsModule {
     @Binds
-    abstract fun bindsAnalyticsHelper(analyticsHelperImpl: FirebaseAnalyticsHelper): AnalyticsHelper
-
-    companion object {
-        @Provides
-        @Singleton
-        fun provideFirebaseAnalytics(): FirebaseAnalytics = Firebase.analytics
-    }
+    abstract fun bindsAnalyticsHelper(analyticsHelperImpl: StubAnalyticsHelper): AnalyticsHelper
 }

feature/settings/src/main/AndroidManifest.xml

@@ -22,4 +22,4 @@
             <action android:name="android.support.customtabs.action.CustomTabsService" />
         </intent>
     </queries>
-</manifest>
+</manifest>

gradle/libs.versions.toml

@@ -32,10 +32,6 @@ appiconloader = "1.5.0"
 coil = "2.7.0"
 composeMarkdown = "0.5.4"
 dependencyGuard = "0.5.0"
-firebaseBom = "33.3.0"
-firebaseCrashlyticsPlugin = "3.0.2"
-firebasePerfPlugin = "1.4.2"
-gmsPlugin = "4.4.2"
 googleAndroidMaterial = "1.12.0"
 hilt = "2.52"
 hiltExt = "1.2.0"
@@ -66,6 +62,7 @@ xmlutil = "0.90.1"
 turbine = "1.1.0"
 truth = "1.4.4"
 material = "1.12.0"
+# Non open-source dependencies
 
 [bundles]
 androidx-compose-ui-test = ["androidx-compose-ui-test", "androidx-compose-ui-testManifest"]
@@ -121,12 +118,7 @@ coil-kt-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "
 coil-kt-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil" }
 compose-markdown = { group = "com.github.jeziellago", name = "compose-markdown", version.ref = "composeMarkdown" }
 eclipse-jgit = { group = "org.eclipse.jgit", name = "org.eclipse.jgit", version.ref = "jgit" }
-firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref="firebaseBom"}
-firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics"}
-firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics"}
-firebase-performance = { group = "com.google.firebase", name = "firebase-perf"}
 google-android-material = { group = "com.google.android.material", name = "material", version.ref = "googleAndroidMaterial" }
-google-services = { module = "com.google.gms:google-services", version.ref = "gmsPlugin" }
 hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
 hilt-ext-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "hiltExt" }
 hilt-ext-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "hiltExt" }
@@ -167,18 +159,18 @@ xmlutil-core-android = { group = "io.github.pdvrieze.xmlutil", name = "core-andr
 xmlutil-serialization-android = { group = "io.github.pdvrieze.xmlutil", name = "serialization-android", version.ref = "xmlutil" }
 timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" }
 hiddenapibypass = "org.lsposed.hiddenapibypass:hiddenapibypass:4.3"
+# Non open-source dependencies
 
 # Dependencies of the included build-logic
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 android-tools-common = { group = "com.android.tools", name = "common", version.ref = "androidTools" }
 compose-gradlePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
-firebase-crashlytics-gradlePlugin = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsPlugin" }
-firebase-performance-gradlePlugin = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
 licensee-gradlePlugin = { group = "app.cash.licensee", name = "licensee-gradle-plugin", version.ref = "licensee" }
 room-gradlePlugin = { group = "androidx.room", name = "room-gradle-plugin", version.ref = "room" }
 work-testing = { group = "androidx.work", name = "work-testing", version.ref = "androidxWork" }
+# Non open-source plugins
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
@@ -187,9 +179,6 @@ android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
 baselineprofile = { id = "androidx.baselineprofile", version.ref = "androidxMacroBenchmark"}
 compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 dependencyGuard = { id = "com.dropbox.dependency-guard", version.ref = "dependencyGuard" }
-firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin"}
-firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "firebasePerfPlugin"}
-gms = { id = "com.google.gms.google-services", version.ref = "gmsPlugin"}
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
@@ -200,11 +189,11 @@ module-graph = { id = "com.jraska.module.graph.assertion", version.ref = "module
 protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" }
 roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
 room = { id = "androidx.room", version.ref = "room" }
+# Non open-source plugins
 
 # Plugins defined by this project
 blocker-android-application = { id = "blocker.android.application", version = "unspecified" }
 blocker-android-application-compose = { id = "blocker.android.application.compose", version = "unspecified" }
-blocker-android-application-firebase = { id = "blocker.android.application.firebase", version = "unspecified" }
 blocker-android-application-flavors = { id = "blocker.android.application.flavors", version = "unspecified" }
 blocker-android-application-jacoco = { id = "blocker.android.application.jacoco", version = "unspecified" }
 blocker-android-feature = { id = "blocker.android.feature", version = "unspecified" }