From 3db97b7a39862ab4edec128b56b3fea5e6bc980b Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Sat, 30 Dec 2023 12:15:00 -0800 Subject: [PATCH 01/23] Remove non-foss dependencies --- app-compose/build.gradle.kts | 2 - build-logic/convention/build.gradle.kts | 6 -- ...roidApplicationFirebaseConventionPlugin.kt | 59 ------------------- build.gradle.kts | 8 --- core/analytics/build.gradle.kts | 3 - .../blocker/core/analytics/AnalyticsModule.kt | 15 +---- .../core/analytics/FirebaseAnalyticsHelper.kt | 44 -------------- feature/settings/build.gradle.kts | 1 - .../SupportAndFeedbackScreen.kt | 2 +- .../SupportFeedbackViewModel.kt | 4 +- gradle/libs.versions.toml | 23 ++------ 11 files changed, 7 insertions(+), 160 deletions(-) delete mode 100644 build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt delete mode 100644 core/analytics/src/market/kotlin/com/merxury/blocker/core/analytics/FirebaseAnalyticsHelper.kt diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index 851c90c179..a5e40cb416 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -22,11 +22,9 @@ 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("jacoco") id("kotlin-parcelize") - id("com.google.android.gms.oss-licenses-plugin") alias(libs.plugins.baselineprofile) alias(libs.plugins.roborazzi) } diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index 90d9986235..9c236bd0df 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -37,8 +37,6 @@ dependencies { compileOnly(libs.android.gradlePlugin) compileOnly(libs.android.tools.common) compileOnly(libs.kotlin.gradlePlugin) - compileOnly(libs.firebase.performance.gradlePlugin) - compileOnly(libs.firebase.crashlytics.gradlePlugin) compileOnly(libs.ksp.gradlePlugin) compileOnly(libs.room.gradlePlugin) implementation(libs.truth) @@ -93,10 +91,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" diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt deleted file mode 100644 index 8ccc11c949..0000000000 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2023 Blocker - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import com.android.build.api.dsl.ApplicationExtension -import com.android.build.api.variant.ApplicationAndroidComponentsExtension -import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension -import com.merxury.blocker.BlockerFlavor -import com.merxury.blocker.libs -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.dependencies - -class AndroidApplicationFirebaseConventionPlugin : Plugin { - override fun apply(target: Project) { - with(target) { - dependencies { - val bom = libs.findLibrary("firebase-bom").get() - "marketImplementation"(platform(bom)) - "marketImplementation"(libs.findLibrary("firebase.analytics").get()) - "marketImplementation"(libs.findLibrary("firebase.crashlytics").get()) - } - extensions.configure { - pluginManager.apply("com.google.gms.google-services") - pluginManager.apply("com.google.firebase.crashlytics") - } - extensions.configure { - buildTypes.configureEach { - configure { - mappingFileUploadEnabled = this@configureEach.name.contains("release") - } - } - tasks.configureEach { - val isFossTask = name.contains(BlockerFlavor.foss.name, ignoreCase = true) - if (isFossTask) { - val disableKeywords = listOf("google", "crashlytics", "upload", "gms") - if (disableKeywords.any { name.contains(it, ignoreCase = true) }) { - logger.debug("Disabling task: $name") - enabled = false - } - } - } - } - } - } -} diff --git a/build.gradle.kts b/build.gradle.kts index 390f42b6c4..7cc2c440e1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,11 +19,6 @@ buildscript { google() mavenCentral() } - dependencies { - classpath(libs.google.oss.licenses.plugin) { - exclude(group = "com.google.protobuf") - } - } } plugins { @@ -35,9 +30,6 @@ plugins { alias(libs.plugins.kotlin.jvm) apply false alias(libs.plugins.hilt) apply false alias(libs.plugins.kotlin.serialization) 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.secrets) apply false diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts index 067cade528..561cc9adfa 100644 --- a/core/analytics/build.gradle.kts +++ b/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) } diff --git a/core/analytics/src/market/kotlin/com/merxury/blocker/core/analytics/AnalyticsModule.kt b/core/analytics/src/market/kotlin/com/merxury/blocker/core/analytics/AnalyticsModule.kt index f8e4c88189..5f4900f743 100644 --- a/core/analytics/src/market/kotlin/com/merxury/blocker/core/analytics/AnalyticsModule.kt +++ b/core/analytics/src/market/kotlin/com/merxury/blocker/core/analytics/AnalyticsModule.kt @@ -17,27 +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 { - return Firebase.analytics - } - } + abstract fun bindsAnalyticsHelper(analyticsHelperImpl: StubAnalyticsHelper): AnalyticsHelper } diff --git a/core/analytics/src/market/kotlin/com/merxury/blocker/core/analytics/FirebaseAnalyticsHelper.kt b/core/analytics/src/market/kotlin/com/merxury/blocker/core/analytics/FirebaseAnalyticsHelper.kt deleted file mode 100644 index acfd59e3ee..0000000000 --- a/core/analytics/src/market/kotlin/com/merxury/blocker/core/analytics/FirebaseAnalyticsHelper.kt +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.merxury.blocker.core.analytics - -import android.os.Bundle -import com.google.firebase.analytics.FirebaseAnalytics -import timber.log.Timber -import javax.inject.Inject - -/** - * Implementation of `AnalyticsHelper` which logs events to a Firebase backend. - */ -internal class FirebaseAnalyticsHelper @Inject constructor( - private val firebaseAnalytics: FirebaseAnalytics, -) : AnalyticsHelper { - - override fun logEvent(event: AnalyticsEvent) { - Timber.v("Received analytics event: $event") - firebaseAnalytics.logEvent(event.type, event.extras.toBundle()) - } - - private fun List.toBundle(): Bundle { - val bundle = Bundle() - for (extra in this) { - // Truncate parameter keys and values according to firebase maximum length values. - bundle.putString(extra.key.take(40), extra.value.take(100)) - } - return bundle - } -} diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts index 80d755189b..1ba7ca770a 100644 --- a/feature/settings/build.gradle.kts +++ b/feature/settings/build.gradle.kts @@ -32,7 +32,6 @@ dependencies { implementation(libs.androidx.documentfile) implementation(libs.androidx.lifecycle.livedata.ktx) implementation(libs.androidx.work.ktx) - implementation(libs.google.oss.licenses) testImplementation(libs.hilt.android.testing) testImplementation(libs.robolectric) diff --git a/feature/settings/src/main/kotlin/com/merxury/blocker/feature/helpandfeedback/SupportAndFeedbackScreen.kt b/feature/settings/src/main/kotlin/com/merxury/blocker/feature/helpandfeedback/SupportAndFeedbackScreen.kt index 3fc7a64e18..ddcc0457f3 100644 --- a/feature/settings/src/main/kotlin/com/merxury/blocker/feature/helpandfeedback/SupportAndFeedbackScreen.kt +++ b/feature/settings/src/main/kotlin/com/merxury/blocker/feature/helpandfeedback/SupportAndFeedbackScreen.kt @@ -82,7 +82,7 @@ fun SupportAndFeedbackRoute( }, onTelegramGroupLinkClick = { viewModel.openGroupLink(context) }, onDesignLinkClick = { viewModel.openDesignLink(context) }, - onOpenSourceLicenseClick = { viewModel.openOpenSourceLicence(context) }, + onOpenSourceLicenseClick = { viewModel.openOpenSourceLicence() }, ) } diff --git a/feature/settings/src/main/kotlin/com/merxury/blocker/feature/helpandfeedback/SupportFeedbackViewModel.kt b/feature/settings/src/main/kotlin/com/merxury/blocker/feature/helpandfeedback/SupportFeedbackViewModel.kt index f8b493289b..148b03c04e 100644 --- a/feature/settings/src/main/kotlin/com/merxury/blocker/feature/helpandfeedback/SupportFeedbackViewModel.kt +++ b/feature/settings/src/main/kotlin/com/merxury/blocker/feature/helpandfeedback/SupportFeedbackViewModel.kt @@ -25,7 +25,6 @@ import android.os.Build import androidx.browser.customtabs.CustomTabsIntent import androidx.browser.customtabs.CustomTabsService import androidx.lifecycle.ViewModel -import com.google.android.gms.oss.licenses.OssLicensesMenuActivity import com.merxury.blocker.core.domain.ZipLogFileUseCase import dagger.hilt.android.lifecycle.HiltViewModel import timber.log.Timber @@ -52,8 +51,7 @@ class SupportFeedbackViewModel @Inject constructor( fun openDesignLink(context: Context) = openUrl(context, DESIGN_LINK_URL) - fun openOpenSourceLicence(context: Context) = - context.startActivity(Intent(context, OssLicensesMenuActivity::class.java)) + fun openOpenSourceLicence() = Unit fun exportErrorLog() = zipLogFileUseCase() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d7f4a814d5..2a34bbe161 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,13 +31,7 @@ androidxWork = "2.9.0" appiconloader = "1.5.0" coil = "2.5.0" dependencyGuard = "0.4.3" -firebaseBom = "32.7.0" -firebaseCrashlyticsPlugin = "2.9.9" -firebasePerfPlugin = "1.4.2" -gmsPlugin = "4.4.0" googleAndroidMaterial = "1.11.0" -googleOss = "17.0.1" -googleOssPlugin = "0.10.6" hilt = "2.50" hiltExt = "1.1.0" jacoco = "0.8.7" @@ -61,6 +55,7 @@ xmlutil = "0.86.3" turbine = "1.0.0" truth = "1.2.0" material = "1.11.0" +# Non open-source dependencies [libraries] accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" } @@ -113,14 +108,7 @@ appiconloader-coil = { group = "me.zhanghai.android.appiconloader", name = "appi coil-kt = { group = "io.coil-kt", name = "coil", version.ref = "coil" } coil-kt-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } coil-kt-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil" } -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" } -google-oss-licenses = { group = "com.google.android.gms", name = "play-services-oss-licenses", version.ref = "googleOss" } -google-oss-licenses-plugin = { group = "com.google.android.gms", name = "oss-licenses-plugin", version.ref = "googleOssPlugin" } 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" } @@ -159,16 +147,16 @@ 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 = "com.jakewharton.timber:timber:5.0.1" 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" } -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" } 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" } @@ -176,9 +164,6 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" } baselineprofile = { id = "androidx.baselineprofile", version.ref = "androidxMacroBenchmark"} 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"} ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } @@ -188,11 +173,11 @@ protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" } roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" } room = { id = "androidx.room", version.ref = "room" } secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" } +# 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" } From a1e9efba3cabdbacbf3794cf51d0a263769827e7 Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Sat, 30 Dec 2023 12:15:35 -0800 Subject: [PATCH 02/23] Update version code --- app-compose/build.gradle.kts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index a5e40cb416..f8a90c348b 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -33,11 +33,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 = 3511 + versionName = "2.0.3511" // 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" From bc25447278ce579fd2c868de673b2186999c7c4b Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Sat, 30 Dec 2023 13:04:54 -0800 Subject: [PATCH 03/23] Remove OSS declaration in the AndroidManifest.xml --- feature/settings/src/main/AndroidManifest.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/feature/settings/src/main/AndroidManifest.xml b/feature/settings/src/main/AndroidManifest.xml index 0ebdbb7f5a..1b73122243 100644 --- a/feature/settings/src/main/AndroidManifest.xml +++ b/feature/settings/src/main/AndroidManifest.xml @@ -17,19 +17,9 @@ - - - - - - - \ No newline at end of file + From 6e634cd9c837be69613de691b057ddacfd948f7d Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Sat, 30 Dec 2023 13:53:47 -0800 Subject: [PATCH 04/23] Update badging --- app-compose/marketRelease-badging.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app-compose/marketRelease-badging.txt b/app-compose/marketRelease-badging.txt index b027970a88..ce06046a4a 100644 --- a/app-compose/marketRelease-badging.txt +++ b/app-compose/marketRelease-badging.txt @@ -1,4 +1,4 @@ -package: name='com.merxury.blocker' versionCode='3462' versionName='2.0.3462' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14' +package: name='com.merxury.blocker' versionCode='3511' versionName='2.0.3511' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14' sdkVersion:'21' targetSdkVersion:'34' uses-permission: name='android.permission.INTERNET' @@ -10,10 +10,6 @@ uses-permission: name='moe.shizuku.manager.permission.API_V23' 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='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='android.permission.RECEIVE_BOOT_COMPLETED' uses-permission: name='com.merxury.blocker.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION' application-label:'Blocker' @@ -112,15 +108,12 @@ 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='' uses-feature: name='android.hardware.faketouch' uses-implied-feature: name='android.hardware.faketouch' reason='default feature for all apps' main -other-activities other-receivers other-services supports-screens: 'small' 'normal' 'large' 'xlarge' From c806b7bac886e1df16a39c0c7e65cfa799fc9a18 Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Sat, 30 Dec 2023 13:57:10 -0800 Subject: [PATCH 05/23] dependencyGuardBaseline --- .../marketReleaseRuntimeClasspath.txt | 38 +------------------ 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt index 83446d1a9a..d0fa0e98c5 100644 --- a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt +++ b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt @@ -62,8 +62,6 @@ androidx.cursoradapter:cursoradapter:1.0.0 androidx.customview:customview-poolingcontainer:1.0.0 androidx.customview:customview:1.1.0 androidx.datastore:datastore-core:1.0.0 -androidx.datastore:datastore-preferences-core:1.0.0 -androidx.datastore:datastore-preferences:1.0.0 androidx.datastore:datastore:1.0.0 androidx.documentfile:documentfile:1.0.1 androidx.drawerlayout:drawerlayout:1.1.1 @@ -104,8 +102,6 @@ androidx.navigation:navigation-runtime:2.7.6 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 @@ -136,21 +132,6 @@ com.github.topjohnwu.libsu:service:5.2.2 com.google.accompanist:accompanist-drawablepainter:0.32.0 com.google.accompanist:accompanist-navigation-material:0.32.0 com.google.accompanist:accompanist-permissions:0.32.0 -com.google.android.datatransport:transport-api:3.0.0 -com.google.android.datatransport:transport-backend-cct:3.1.9 -com.google.android.datatransport:transport-runtime:3.1.9 -com.google.android.gms:play-services-ads-identifier:18.0.0 -com.google.android.gms:play-services-base:18.0.1 -com.google.android.gms:play-services-basement:18.1.0 -com.google.android.gms:play-services-measurement-api:21.5.0 -com.google.android.gms:play-services-measurement-base:21.5.0 -com.google.android.gms:play-services-measurement-impl:21.5.0 -com.google.android.gms:play-services-measurement-sdk-api:21.5.0 -com.google.android.gms:play-services-measurement-sdk:21.5.0 -com.google.android.gms:play-services-measurement:21.5.0 -com.google.android.gms:play-services-oss-licenses:17.0.1 -com.google.android.gms:play-services-stats:17.0.2 -com.google.android.gms:play-services-tasks:18.0.2 com.google.android.material:material:1.11.0 com.google.code.findbugs:jsr305:3.0.2 com.google.dagger:dagger-lint-aar:2.50 @@ -158,24 +139,8 @@ com.google.dagger:dagger:2.50 com.google.dagger:hilt-android:2.50 com.google.dagger:hilt-core:2.50 com.google.errorprone:error_prone_annotations:2.15.0 -com.google.firebase:firebase-analytics:21.5.0 -com.google.firebase:firebase-annotations:16.2.0 -com.google.firebase:firebase-bom:32.7.0 -com.google.firebase:firebase-common-ktx:20.4.2 -com.google.firebase:firebase-common:20.4.2 -com.google.firebase:firebase-components:17.1.5 -com.google.firebase:firebase-config-interop:16.0.0 -com.google.firebase:firebase-crashlytics:18.6.0 -com.google.firebase:firebase-datatransport:18.1.8 -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.1.1 -com.google.firebase:firebase-installations:17.2.0 -com.google.firebase:firebase-measurement-connector:19.0.0 -com.google.firebase:firebase-sessions:1.2.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:3.25.1 @@ -218,7 +183,6 @@ org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.7.3 -org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0 org.jetbrains.kotlinx:kotlinx-datetime:0.5.0 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.2 From 4fd280f1633e4cc772a78ce2dc111a73147201cc Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Sun, 14 Jan 2024 09:41:59 -0800 Subject: [PATCH 06/23] Update version code to 3607 --- app-compose/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index 1e9581aed6..e5c065ee40 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -33,8 +33,8 @@ android { namespace = "com.merxury.blocker" defaultConfig { applicationId = "com.merxury.blocker" - versionCode = 3511 - versionName = "2.0.3511" // X.Y.Z; X = Major, Y = minor, Z = version code + versionCode = 3607 + versionName = "2.0.3607" // 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" From 1906737582fb3768617a9a7418168a1377e0b47a Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Tue, 23 Jan 2024 22:00:54 -0800 Subject: [PATCH 07/23] Update version code --- app-compose/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index e5c065ee40..94b882bbbb 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -33,8 +33,8 @@ android { namespace = "com.merxury.blocker" defaultConfig { applicationId = "com.merxury.blocker" - versionCode = 3607 - versionName = "2.0.3607" // X.Y.Z; X = Major, Y = minor, Z = version code + versionCode = 3662 + versionName = "2.0.3662-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" From d2c52255c730bd18c280f73ad396ed4815cd3f40 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Tue, 27 Feb 2024 22:30:42 +0000 Subject: [PATCH 08/23] =?UTF-8?q?=F0=9F=A4=96=20Updates=20baselines=20for?= =?UTF-8?q?=20Dependency=20Guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-compose/dependencies/marketReleaseRuntimeClasspath.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt index 07c6137aef..65e7bcfa64 100644 --- a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt +++ b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt @@ -139,9 +139,6 @@ com.github.topjohnwu.libsu:service:5.2.2 com.google.accompanist:accompanist-drawablepainter:0.32.0 com.google.accompanist:accompanist-navigation-material:0.34.0 com.google.accompanist:accompanist-permissions:0.34.0 -com.google.android.datatransport:transport-api:3.0.0 -com.google.android.datatransport:transport-backend-cct:3.1.9 -com.google.android.datatransport:transport-runtime:3.1.9 com.google.android.material:material:1.11.0 com.google.code.findbugs:jsr305:3.0.2 com.google.dagger:dagger-lint-aar:2.50 @@ -196,7 +193,6 @@ org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0 org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.0 -org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.8.0 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0 org.jetbrains.kotlinx:kotlinx-datetime:0.5.0 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3 From d077bec574a6e3369b460508a04af650be0bf64f Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Wed, 13 Mar 2024 15:58:23 -0700 Subject: [PATCH 09/23] Update the version code --- app-compose/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index 0f7787cd8f..06be554256 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -33,8 +33,8 @@ android { namespace = "com.merxury.blocker" defaultConfig { applicationId = "com.merxury.blocker" - versionCode = 3662 - versionName = "2.0.3662-fdroid" // X.Y.Z; X = Major, Y = minor, Z = version code + versionCode = 3961 + versionName = "2.0.3961-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" From 181e06455639db148b87daf7533131b9e451ee29 Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Tue, 2 Apr 2024 20:38:26 -0700 Subject: [PATCH 10/23] Update version code --- app-compose/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index c74979e499..ef709a8200 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -32,8 +32,8 @@ android { namespace = "com.merxury.blocker" defaultConfig { applicationId = "com.merxury.blocker" - versionCode = 3961 - versionName = "2.0.3961-fdroid" // X.Y.Z; X = Major, Y = minor, Z = version code + versionCode = 4031 + versionName = "2.0.4031-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" From b7131cba859d026748acd1ef0ab114c56d9faad6 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Wed, 3 Apr 2024 03:42:56 +0000 Subject: [PATCH 11/23] =?UTF-8?q?=F0=9F=A4=96=20Updates=20baselines=20for?= =?UTF-8?q?=20Dependency=20Guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketReleaseRuntimeClasspath.txt | 103 ++++++++++-------- 1 file changed, 57 insertions(+), 46 deletions(-) diff --git a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt index 289a681c85..faf127f797 100644 --- a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt +++ b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt @@ -14,45 +14,45 @@ androidx.cardview:cardview:1.0.0 androidx.collection:collection-jvm:1.4.0 androidx.collection:collection-ktx:1.4.0 androidx.collection:collection:1.4.0 -androidx.compose.animation:animation-android:1.6.3 -androidx.compose.animation:animation-core-android:1.6.3 -androidx.compose.animation:animation-core:1.6.3 -androidx.compose.animation:animation:1.6.3 -androidx.compose.foundation:foundation-android:1.6.3 -androidx.compose.foundation:foundation-layout-android:1.6.3 -androidx.compose.foundation:foundation-layout:1.6.3 -androidx.compose.foundation:foundation:1.6.3 +androidx.compose.animation:animation-android:1.6.4 +androidx.compose.animation:animation-core-android:1.6.4 +androidx.compose.animation:animation-core:1.6.4 +androidx.compose.animation:animation:1.6.4 +androidx.compose.foundation:foundation-android:1.6.4 +androidx.compose.foundation:foundation-layout-android:1.6.4 +androidx.compose.foundation:foundation-layout:1.6.4 +androidx.compose.foundation:foundation:1.6.4 androidx.compose.material3:material3-android:1.2.1 androidx.compose.material3:material3-window-size-class-android:1.2.1 androidx.compose.material3:material3-window-size-class:1.2.1 androidx.compose.material3:material3:1.2.1 -androidx.compose.material:material-android:1.6.3 -androidx.compose.material:material-icons-core-android:1.6.3 -androidx.compose.material:material-icons-core:1.6.3 -androidx.compose.material:material-icons-extended-android:1.6.3 -androidx.compose.material:material-icons-extended:1.6.3 -androidx.compose.material:material-ripple-android:1.6.3 -androidx.compose.material:material-ripple:1.6.3 -androidx.compose.material:material:1.6.3 -androidx.compose.runtime:runtime-android:1.6.3 -androidx.compose.runtime:runtime-saveable-android:1.6.3 -androidx.compose.runtime:runtime-saveable:1.6.3 -androidx.compose.runtime:runtime:1.6.3 -androidx.compose.ui:ui-android:1.6.3 -androidx.compose.ui:ui-geometry-android:1.6.3 -androidx.compose.ui:ui-geometry:1.6.3 -androidx.compose.ui:ui-graphics-android:1.6.3 -androidx.compose.ui:ui-graphics:1.6.3 -androidx.compose.ui:ui-text-android:1.6.3 -androidx.compose.ui:ui-text:1.6.3 -androidx.compose.ui:ui-tooling-preview-android:1.6.3 -androidx.compose.ui:ui-tooling-preview:1.6.3 -androidx.compose.ui:ui-unit-android:1.6.3 -androidx.compose.ui:ui-unit:1.6.3 -androidx.compose.ui:ui-util-android:1.6.3 -androidx.compose.ui:ui-util:1.6.3 -androidx.compose.ui:ui:1.6.3 -androidx.compose:compose-bom:2024.02.02 +androidx.compose.material:material-android:1.6.4 +androidx.compose.material:material-icons-core-android:1.6.4 +androidx.compose.material:material-icons-core:1.6.4 +androidx.compose.material:material-icons-extended-android:1.6.4 +androidx.compose.material:material-icons-extended:1.6.4 +androidx.compose.material:material-ripple-android:1.6.4 +androidx.compose.material:material-ripple:1.6.4 +androidx.compose.material:material:1.6.4 +androidx.compose.runtime:runtime-android:1.6.4 +androidx.compose.runtime:runtime-saveable-android:1.6.4 +androidx.compose.runtime:runtime-saveable:1.6.4 +androidx.compose.runtime:runtime:1.6.4 +androidx.compose.ui:ui-android:1.6.4 +androidx.compose.ui:ui-geometry-android:1.6.4 +androidx.compose.ui:ui-geometry:1.6.4 +androidx.compose.ui:ui-graphics-android:1.6.4 +androidx.compose.ui:ui-graphics:1.6.4 +androidx.compose.ui:ui-text-android:1.6.4 +androidx.compose.ui:ui-text:1.6.4 +androidx.compose.ui:ui-tooling-preview-android:1.6.4 +androidx.compose.ui:ui-tooling-preview:1.6.4 +androidx.compose.ui:ui-unit-android:1.6.4 +androidx.compose.ui:ui-unit:1.6.4 +androidx.compose.ui:ui-util-android:1.6.4 +androidx.compose.ui:ui-util:1.6.4 +androidx.compose.ui:ui:1.6.4 +androidx.compose:compose-bom:2024.03.00 androidx.concurrent:concurrent-futures:1.1.0 androidx.constraintlayout:constraintlayout-solver:2.0.1 androidx.constraintlayout:constraintlayout:2.0.1 @@ -130,6 +130,8 @@ com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:0.13.0 com.atlassian.commonmark:commonmark-ext-gfm-tables:0.13.0 com.atlassian.commonmark:commonmark:0.13.0 com.caverock:androidsvg-aar:1.4 +com.github.ajalt.colormath:colormath-jvm:3.4.0 +com.github.ajalt.colormath:colormath:3.4.0 com.github.jeziellago:Markwon:58aa5aba6a com.github.jeziellago:compose-markdown:0.4.1 com.github.topjohnwu.libsu:core:5.2.2 @@ -141,24 +143,30 @@ com.google.accompanist:accompanist-navigation-material:0.34.0 com.google.accompanist:accompanist-permissions:0.34.0 com.google.android.material:material:1.11.0 com.google.code.findbugs:jsr305:3.0.2 -com.google.dagger:dagger-lint-aar:2.51 -com.google.dagger:dagger:2.51 -com.google.dagger:hilt-android:2.51 -com.google.dagger:hilt-core:2.51 +com.google.dagger:dagger-lint-aar:2.51.1 +com.google.dagger:dagger:2.51.1 +com.google.dagger:hilt-android:2.51.1 +com.google.dagger:hilt-core:2.51.1 com.google.errorprone:error_prone_annotations:2.15.0 com.google.guava:failureaccess:1.0.1 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:3.25.3 -com.google.protobuf:protobuf-kotlin-lite:3.25.3 +com.google.protobuf:protobuf-javalite:4.26.1 +com.google.protobuf:protobuf-kotlin-lite:4.26.1 com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0 com.jakewharton.timber:timber:5.0.1 +com.materialkolor:material-color-utilities-android:1.4.4 +com.materialkolor:material-color-utilities:1.4.4 +com.materialkolor:material-kolor-android:1.4.4 +com.materialkolor:material-kolor:1.4.4 com.squareup.okhttp3:logging-interceptor:4.12.0 com.squareup.okhttp3:okhttp:4.12.0 com.squareup.okio:okio-jvm:3.8.0 com.squareup.okio:okio:3.8.0 -com.squareup.retrofit2:retrofit:2.9.0 +com.squareup.retrofit2:retrofit:2.11.0 +dev.drewhamilton.poko:poko-annotations-jvm:0.15.2 +dev.drewhamilton.poko:poko-annotations:0.15.2 dev.rikka.shizuku:aidl:13.1.5 dev.rikka.shizuku:api:13.1.5 dev.rikka.shizuku:provider:13.1.5 @@ -181,13 +189,16 @@ me.zhanghai.android.appiconloader:appiconloader-coil:1.5.0 me.zhanghai.android.appiconloader:appiconloader-iconloaderlib:1.5.0 me.zhanghai.android.appiconloader:appiconloader:1.5.0 org.checkerframework:checker-qual:3.12.0 -org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22 +org.jetbrains.compose.material3:material3:1.6.1 +org.jetbrains.compose.runtime:runtime:1.6.1 +org.jetbrains.compose.ui:ui:1.6.1 +org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.23 org.jetbrains.kotlin:kotlin-bom:1.8.22 -org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22 -org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22 +org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.23 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.23 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.21 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21 -org.jetbrains.kotlin:kotlin-stdlib:1.9.22 +org.jetbrains.kotlin:kotlin-stdlib:1.9.23 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0 From fd7884b731a9ca7f72b1e2049e9d4a15e9c490b3 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Sun, 7 Apr 2024 14:23:11 -0700 Subject: [PATCH 12/23] Upgrade version code Change-Id: Ia9efa0cf212571e25e8adb618e1ebb66b0f1ac1d --- app-compose/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index ef709a8200..da5c3b20f0 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -32,8 +32,8 @@ android { namespace = "com.merxury.blocker" defaultConfig { applicationId = "com.merxury.blocker" - versionCode = 4031 - versionName = "2.0.4031-fdroid" // X.Y.Z; X = Major, Y = minor, Z = version code + versionCode = 4044 + versionName = "2.0.4044-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" From 084bbea7cee46b155165899d95ce0a73cde81e5e Mon Sep 17 00:00:00 2001 From: lihenggui Date: Sat, 4 May 2024 00:43:30 +0000 Subject: [PATCH 13/23] =?UTF-8?q?=F0=9F=A4=96=20Updates=20baselines=20for?= =?UTF-8?q?=20Dependency=20Guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketReleaseRuntimeClasspath.txt | 94 ++++++++++--------- 1 file changed, 49 insertions(+), 45 deletions(-) diff --git a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt index 569dc41d0c..6832eafd21 100644 --- a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt +++ b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt @@ -1,6 +1,6 @@ -androidx.activity:activity-compose:1.8.2 -androidx.activity:activity-ktx:1.8.2 -androidx.activity:activity:1.8.2 +androidx.activity:activity-compose:1.9.0 +androidx.activity:activity-ktx:1.9.0 +androidx.activity:activity:1.9.0 androidx.annotation:annotation-experimental:1.4.0 androidx.annotation:annotation-jvm:1.7.1 androidx.annotation:annotation:1.7.1 @@ -14,57 +14,61 @@ androidx.cardview:cardview:1.0.0 androidx.collection:collection-jvm:1.4.0 androidx.collection:collection-ktx:1.4.0 androidx.collection:collection:1.4.0 -androidx.compose.animation:animation-android:1.6.5 -androidx.compose.animation:animation-core-android:1.6.5 -androidx.compose.animation:animation-core:1.6.5 -androidx.compose.animation:animation:1.6.5 -androidx.compose.foundation:foundation-android:1.6.5 -androidx.compose.foundation:foundation-layout-android:1.6.5 -androidx.compose.foundation:foundation-layout:1.6.5 -androidx.compose.foundation:foundation:1.6.5 +androidx.compose.animation:animation-android:1.6.7 +androidx.compose.animation:animation-core-android:1.6.7 +androidx.compose.animation:animation-core:1.6.7 +androidx.compose.animation:animation:1.6.7 +androidx.compose.foundation:foundation-android:1.6.7 +androidx.compose.foundation:foundation-layout-android:1.6.7 +androidx.compose.foundation:foundation-layout:1.6.7 +androidx.compose.foundation:foundation:1.6.7 androidx.compose.material3:material3-android:1.2.1 androidx.compose.material3:material3-window-size-class-android:1.2.1 androidx.compose.material3:material3-window-size-class:1.2.1 androidx.compose.material3:material3:1.2.1 -androidx.compose.material:material-android:1.6.5 -androidx.compose.material:material-icons-core-android:1.6.5 -androidx.compose.material:material-icons-core:1.6.5 -androidx.compose.material:material-icons-extended-android:1.6.5 -androidx.compose.material:material-icons-extended:1.6.5 -androidx.compose.material:material-ripple-android:1.6.5 -androidx.compose.material:material-ripple:1.6.5 -androidx.compose.material:material:1.6.5 -androidx.compose.runtime:runtime-android:1.6.5 -androidx.compose.runtime:runtime-saveable-android:1.6.5 -androidx.compose.runtime:runtime-saveable:1.6.5 -androidx.compose.runtime:runtime:1.6.5 -androidx.compose.ui:ui-android:1.6.5 -androidx.compose.ui:ui-geometry-android:1.6.5 -androidx.compose.ui:ui-geometry:1.6.5 -androidx.compose.ui:ui-graphics-android:1.6.5 -androidx.compose.ui:ui-graphics:1.6.5 -androidx.compose.ui:ui-text-android:1.6.5 -androidx.compose.ui:ui-text:1.6.5 -androidx.compose.ui:ui-tooling-preview-android:1.6.5 -androidx.compose.ui:ui-tooling-preview:1.6.5 -androidx.compose.ui:ui-unit-android:1.6.5 -androidx.compose.ui:ui-unit:1.6.5 -androidx.compose.ui:ui-util-android:1.6.5 -androidx.compose.ui:ui-util:1.6.5 -androidx.compose.ui:ui:1.6.5 -androidx.compose:compose-bom:2024.04.00 +androidx.compose.material:material-android:1.6.7 +androidx.compose.material:material-icons-core-android:1.6.7 +androidx.compose.material:material-icons-core:1.6.7 +androidx.compose.material:material-icons-extended-android:1.6.7 +androidx.compose.material:material-icons-extended:1.6.7 +androidx.compose.material:material-ripple-android:1.6.7 +androidx.compose.material:material-ripple:1.6.7 +androidx.compose.material:material:1.6.7 +androidx.compose.runtime:runtime-android:1.6.7 +androidx.compose.runtime:runtime-saveable-android:1.6.7 +androidx.compose.runtime:runtime-saveable:1.6.7 +androidx.compose.runtime:runtime:1.6.7 +androidx.compose.ui:ui-android:1.6.7 +androidx.compose.ui:ui-geometry-android:1.6.7 +androidx.compose.ui:ui-geometry:1.6.7 +androidx.compose.ui:ui-graphics-android:1.6.7 +androidx.compose.ui:ui-graphics:1.6.7 +androidx.compose.ui:ui-text-android:1.6.7 +androidx.compose.ui:ui-text:1.6.7 +androidx.compose.ui:ui-tooling-preview-android:1.6.7 +androidx.compose.ui:ui-tooling-preview:1.6.7 +androidx.compose.ui:ui-unit-android:1.6.7 +androidx.compose.ui:ui-unit:1.6.7 +androidx.compose.ui:ui-util-android:1.6.7 +androidx.compose.ui:ui-util:1.6.7 +androidx.compose.ui:ui:1.6.7 +androidx.compose:compose-bom:2024.05.00 androidx.concurrent:concurrent-futures:1.1.0 androidx.constraintlayout:constraintlayout-solver:2.0.1 androidx.constraintlayout:constraintlayout:2.0.1 androidx.coordinatorlayout:coordinatorlayout:1.1.0 -androidx.core:core-ktx:1.12.0 +androidx.core:core-ktx:1.13.1 androidx.core:core-splashscreen:1.0.1 -androidx.core:core:1.12.0 +androidx.core:core:1.13.1 androidx.cursoradapter:cursoradapter:1.0.0 androidx.customview:customview-poolingcontainer:1.0.0 androidx.customview:customview:1.1.0 -androidx.datastore:datastore-core:1.0.0 -androidx.datastore:datastore:1.0.0 +androidx.datastore:datastore-android:1.1.1 +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:1.1.1 androidx.documentfile:documentfile:1.0.1 androidx.drawerlayout:drawerlayout:1.1.1 androidx.dynamicanimation:dynamicanimation:1.0.0 @@ -117,7 +121,7 @@ androidx.sqlite:sqlite:2.4.0 androidx.startup:startup-runtime:1.1.1 androidx.tracing:tracing-ktx:1.3.0-alpha02 androidx.tracing:tracing:1.3.0-alpha02 -androidx.transition:transition:1.2.0 +androidx.transition:transition:1.5.0 androidx.vectordrawable:vectordrawable-animated:1.1.0 androidx.vectordrawable:vectordrawable:1.1.0 androidx.versionedparcelable:versionedparcelable:1.1.1 @@ -133,7 +137,7 @@ com.caverock:androidsvg-aar:1.4 com.github.ajalt.colormath:colormath-jvm:3.4.0 com.github.ajalt.colormath:colormath:3.4.0 com.github.jeziellago:Markwon:58aa5aba6a -com.github.jeziellago:compose-markdown:0.4.1 +com.github.jeziellago:compose-markdown:0.5.0 com.github.topjohnwu.libsu:core:5.2.2 com.github.topjohnwu.libsu:io:5.2.2 com.github.topjohnwu.libsu:nio:5.2.2 @@ -141,7 +145,7 @@ com.github.topjohnwu.libsu:service:5.2.2 com.google.accompanist:accompanist-drawablepainter:0.32.0 com.google.accompanist:accompanist-navigation-material:0.34.0 com.google.accompanist:accompanist-permissions:0.34.0 -com.google.android.material:material:1.11.0 +com.google.android.material:material:1.12.0 com.google.code.findbugs:jsr305:3.0.2 com.google.dagger:dagger-lint-aar:2.51.1 com.google.dagger:dagger:2.51.1 From 66f7df135383cf7b440106f3f8742bcac62c3627 Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Sat, 4 May 2024 07:48:44 -0700 Subject: [PATCH 14/23] Update badging --- app-compose/marketRelease-badging.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-compose/marketRelease-badging.txt b/app-compose/marketRelease-badging.txt index ce06046a4a..f4012c602d 100644 --- a/app-compose/marketRelease-badging.txt +++ b/app-compose/marketRelease-badging.txt @@ -1,4 +1,4 @@ -package: name='com.merxury.blocker' versionCode='3511' versionName='2.0.3511' 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' @@ -120,3 +120,4 @@ supports-screens: 'small' 'normal' 'large' 'xlarge' supports-any-density: 'true' locales: '--_--' 'af' 'am' 'ar' 'as' 'az' 'be' 'bg' 'bn' 'bs' 'ca' 'cs' 'da' 'de' 'el' 'en-AU' 'en-CA' 'en-GB' 'en-IN' 'en-XC' 'es' 'es-419' 'es-US' 'et' 'eu' 'fa' 'fi' 'fr' 'fr-CA' 'gl' 'gu' 'hi' 'hr' 'hu' 'hy' 'in' 'is' 'it' 'iw' 'ja' 'ka' 'kk' 'km' 'kn' 'ko' 'ky' 'lo' 'lt' 'lv' 'mk' 'ml' 'mn' 'mr' 'ms' 'my' 'nb' 'ne' 'nl' 'or' 'pa' 'pl' 'pt' 'pt-BR' 'pt-PT' 'ro' 'ru' 'si' 'sk' 'sl' 'sq' 'sr' 'sr-Latn' 'sv' 'sw' 'ta' 'te' 'th' 'tl' 'tr' 'uk' 'ur' 'uz' 'vi' 'zh-CN' 'zh-HK' 'zh-TW' 'zu' densities: '120' '160' '240' '320' '480' '640' '65534' +native-code: 'arm64-v8a' 'armeabi-v7a' 'x86' 'x86_64' From 74fde767a220c6cd52332d2a30b2869448fb8242 Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Sat, 1 Jun 2024 10:02:47 -0700 Subject: [PATCH 15/23] Bump version code to 2.0.4369 --- app-compose/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index da5c3b20f0..0ef0f5062f 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -32,8 +32,8 @@ android { namespace = "com.merxury.blocker" defaultConfig { applicationId = "com.merxury.blocker" - versionCode = 4044 - versionName = "2.0.4044-fdroid" // X.Y.Z; X = Major, Y = minor, Z = version code + versionCode = 4369 + versionName = "2.0.4369-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" From c2b8ce3d1e8cfbb885a0f71002ae8b6a1da7b0e6 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Sat, 1 Jun 2024 17:07:50 +0000 Subject: [PATCH 16/23] =?UTF-8?q?=F0=9F=A4=96=20Updates=20baselines=20for?= =?UTF-8?q?=20Dependency=20Guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketReleaseRuntimeClasspath.txt | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt index 6832eafd21..e59abc45c8 100644 --- a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt +++ b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt @@ -134,8 +134,8 @@ com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:0.13.0 com.atlassian.commonmark:commonmark-ext-gfm-tables:0.13.0 com.atlassian.commonmark:commonmark:0.13.0 com.caverock:androidsvg-aar:1.4 -com.github.ajalt.colormath:colormath-jvm:3.4.0 -com.github.ajalt.colormath:colormath:3.4.0 +com.github.ajalt.colormath:colormath-jvm:3.5.0 +com.github.ajalt.colormath:colormath:3.5.0 com.github.jeziellago:Markwon:58aa5aba6a com.github.jeziellago:compose-markdown:0.5.0 com.github.topjohnwu.libsu:core:5.2.2 @@ -156,21 +156,23 @@ com.google.guava:failureaccess:1.0.1 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.26.1 -com.google.protobuf:protobuf-kotlin-lite:4.26.1 +com.google.protobuf:protobuf-javalite:4.27.0 +com.google.protobuf:protobuf-kotlin-lite:4.27.0 +com.googlecode.javaewah:JavaEWAH:1.2.3 com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0 com.jakewharton.timber:timber:5.0.1 -com.materialkolor:material-color-utilities-android:1.4.4 -com.materialkolor:material-color-utilities:1.4.4 -com.materialkolor:material-kolor-android:1.4.4 -com.materialkolor:material-kolor:1.4.4 +com.materialkolor:material-color-utilities-android:1.6.1 +com.materialkolor:material-color-utilities:1.6.1 +com.materialkolor:material-kolor-android:1.6.1 +com.materialkolor:material-kolor:1.6.1 com.squareup.okhttp3:logging-interceptor:4.12.0 com.squareup.okhttp3:okhttp:4.12.0 com.squareup.okio:okio-jvm:3.8.0 com.squareup.okio:okio:3.8.0 com.squareup.retrofit2:retrofit:2.11.0 -dev.drewhamilton.poko:poko-annotations-jvm:0.15.2 -dev.drewhamilton.poko:poko-annotations:0.15.2 +commons-codec:commons-codec:1.16.0 +dev.drewhamilton.poko:poko-annotations-jvm:0.16.0-beta01 +dev.drewhamilton.poko:poko-annotations:0.16.0-beta01 dev.rikka.shizuku:aidl:13.1.5 dev.rikka.shizuku:api:13.1.5 dev.rikka.shizuku:provider:13.1.5 @@ -193,23 +195,24 @@ me.zhanghai.android.appiconloader:appiconloader-coil:1.5.0 me.zhanghai.android.appiconloader:appiconloader-iconloaderlib:1.5.0 me.zhanghai.android.appiconloader:appiconloader:1.5.0 org.checkerframework:checker-qual:3.12.0 -org.jetbrains.compose.material3:material3:1.6.1 -org.jetbrains.compose.runtime:runtime:1.6.1 -org.jetbrains.compose.ui:ui:1.6.1 -org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.23 +org.eclipse.jgit:org.eclipse.jgit:6.9.0.202403050737-r +org.jetbrains.compose.material3:material3:1.6.10 +org.jetbrains.compose.runtime:runtime:1.6.10 +org.jetbrains.compose.ui:ui:1.6.10 +org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.22 -org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.23 -org.jetbrains.kotlin:kotlin-stdlib-common:1.9.23 +org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.0 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.21 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21 -org.jetbrains.kotlin:kotlin-stdlib:1.9.23 -org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0 -org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.0 -org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0 -org.jetbrains.kotlinx:kotlinx-datetime:0.5.0 +org.jetbrains.kotlin:kotlin-stdlib:2.0.0 +org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 +org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.1 +org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.0 +org.jetbrains.kotlinx:kotlinx-datetime:0.6.0 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3 org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3 @@ -217,3 +220,4 @@ org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3 org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3 org.jetbrains:annotations:23.0.0 org.lsposed.hiddenapibypass:hiddenapibypass:4.3 +org.slf4j:slf4j-api:1.7.36 From 9e92011f65e2b328b8fde3f790a827d7721c4013 Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Sat, 1 Jun 2024 19:00:00 -0700 Subject: [PATCH 17/23] Bump version code --- app-compose/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index 0ef0f5062f..d971930a0e 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -32,8 +32,8 @@ android { namespace = "com.merxury.blocker" defaultConfig { applicationId = "com.merxury.blocker" - versionCode = 4369 - versionName = "2.0.4369-fdroid" // X.Y.Z; X = Major, Y = minor, Z = version code + versionCode = 4373 + versionName = "2.0.4373-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" From 7c3b399d197614d4796d19902299195ecfcfafae Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Tue, 2 Jul 2024 19:43:42 -0700 Subject: [PATCH 18/23] Bump version code --- app-compose/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index d971930a0e..5d150fc393 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -32,8 +32,8 @@ android { namespace = "com.merxury.blocker" defaultConfig { applicationId = "com.merxury.blocker" - versionCode = 4373 - versionName = "2.0.4373-fdroid" // X.Y.Z; X = Major, Y = minor, Z = version code + versionCode = 4497 + versionName = "2.0.4497-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" From fe34a968ecda82fd5aabed2dc4f3b9ec9e22666b Mon Sep 17 00:00:00 2001 From: lihenggui Date: Wed, 3 Jul 2024 02:47:44 +0000 Subject: [PATCH 19/23] =?UTF-8?q?=F0=9F=A4=96=20Updates=20baselines=20for?= =?UTF-8?q?=20Dependency=20Guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketReleaseRuntimeClasspath.txt | 131 +++++++++--------- 1 file changed, 66 insertions(+), 65 deletions(-) diff --git a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt index e59abc45c8..b9d1167951 100644 --- a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt +++ b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt @@ -4,8 +4,8 @@ androidx.activity:activity:1.9.0 androidx.annotation:annotation-experimental:1.4.0 androidx.annotation:annotation-jvm:1.7.1 androidx.annotation:annotation:1.7.1 -androidx.appcompat:appcompat-resources:1.6.1 -androidx.appcompat:appcompat:1.6.1 +androidx.appcompat:appcompat-resources:1.7.0 +androidx.appcompat:appcompat:1.7.0 androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.autofill:autofill:1.0.0 @@ -14,45 +14,45 @@ androidx.cardview:cardview:1.0.0 androidx.collection:collection-jvm:1.4.0 androidx.collection:collection-ktx:1.4.0 androidx.collection:collection:1.4.0 -androidx.compose.animation:animation-android:1.6.7 -androidx.compose.animation:animation-core-android:1.6.7 -androidx.compose.animation:animation-core:1.6.7 -androidx.compose.animation:animation:1.6.7 -androidx.compose.foundation:foundation-android:1.6.7 -androidx.compose.foundation:foundation-layout-android:1.6.7 -androidx.compose.foundation:foundation-layout:1.6.7 -androidx.compose.foundation:foundation:1.6.7 +androidx.compose.animation:animation-android:1.6.8 +androidx.compose.animation:animation-core-android:1.6.8 +androidx.compose.animation:animation-core:1.6.8 +androidx.compose.animation:animation:1.6.8 +androidx.compose.foundation:foundation-android:1.6.8 +androidx.compose.foundation:foundation-layout-android:1.6.8 +androidx.compose.foundation:foundation-layout:1.6.8 +androidx.compose.foundation:foundation:1.6.8 androidx.compose.material3:material3-android:1.2.1 androidx.compose.material3:material3-window-size-class-android:1.2.1 androidx.compose.material3:material3-window-size-class:1.2.1 androidx.compose.material3:material3:1.2.1 -androidx.compose.material:material-android:1.6.7 -androidx.compose.material:material-icons-core-android:1.6.7 -androidx.compose.material:material-icons-core:1.6.7 -androidx.compose.material:material-icons-extended-android:1.6.7 -androidx.compose.material:material-icons-extended:1.6.7 -androidx.compose.material:material-ripple-android:1.6.7 -androidx.compose.material:material-ripple:1.6.7 -androidx.compose.material:material:1.6.7 -androidx.compose.runtime:runtime-android:1.6.7 -androidx.compose.runtime:runtime-saveable-android:1.6.7 -androidx.compose.runtime:runtime-saveable:1.6.7 -androidx.compose.runtime:runtime:1.6.7 -androidx.compose.ui:ui-android:1.6.7 -androidx.compose.ui:ui-geometry-android:1.6.7 -androidx.compose.ui:ui-geometry:1.6.7 -androidx.compose.ui:ui-graphics-android:1.6.7 -androidx.compose.ui:ui-graphics:1.6.7 -androidx.compose.ui:ui-text-android:1.6.7 -androidx.compose.ui:ui-text:1.6.7 -androidx.compose.ui:ui-tooling-preview-android:1.6.7 -androidx.compose.ui:ui-tooling-preview:1.6.7 -androidx.compose.ui:ui-unit-android:1.6.7 -androidx.compose.ui:ui-unit:1.6.7 -androidx.compose.ui:ui-util-android:1.6.7 -androidx.compose.ui:ui-util:1.6.7 -androidx.compose.ui:ui:1.6.7 -androidx.compose:compose-bom:2024.05.00 +androidx.compose.material:material-android:1.6.8 +androidx.compose.material:material-icons-core-android:1.6.8 +androidx.compose.material:material-icons-core:1.6.8 +androidx.compose.material:material-icons-extended-android:1.6.8 +androidx.compose.material:material-icons-extended:1.6.8 +androidx.compose.material:material-ripple-android:1.6.8 +androidx.compose.material:material-ripple:1.6.8 +androidx.compose.material:material:1.6.8 +androidx.compose.runtime:runtime-android:1.6.8 +androidx.compose.runtime:runtime-saveable-android:1.6.8 +androidx.compose.runtime:runtime-saveable:1.6.8 +androidx.compose.runtime:runtime:1.6.8 +androidx.compose.ui:ui-android:1.6.8 +androidx.compose.ui:ui-geometry-android:1.6.8 +androidx.compose.ui:ui-geometry:1.6.8 +androidx.compose.ui:ui-graphics-android:1.6.8 +androidx.compose.ui:ui-graphics:1.6.8 +androidx.compose.ui:ui-text-android:1.6.8 +androidx.compose.ui:ui-text:1.6.8 +androidx.compose.ui:ui-tooling-preview-android:1.6.8 +androidx.compose.ui:ui-tooling-preview:1.6.8 +androidx.compose.ui:ui-unit-android:1.6.8 +androidx.compose.ui:ui-unit:1.6.8 +androidx.compose.ui:ui-util-android:1.6.8 +androidx.compose.ui:ui-util:1.6.8 +androidx.compose.ui:ui:1.6.8 +androidx.compose:compose-bom:2024.06.00 androidx.concurrent:concurrent-futures:1.1.0 androidx.constraintlayout:constraintlayout-solver:2.0.1 androidx.constraintlayout:constraintlayout:2.0.1 @@ -75,7 +75,7 @@ androidx.dynamicanimation:dynamicanimation:1.0.0 androidx.emoji2:emoji2-views-helper:1.3.0 androidx.emoji2:emoji2:1.3.0 androidx.exifinterface:exifinterface:1.3.7 -androidx.fragment:fragment:1.5.1 +androidx.fragment:fragment:1.5.4 androidx.hilt:hilt-common:1.2.0 androidx.hilt:hilt-navigation-compose:1.2.0 androidx.hilt:hilt-navigation:1.2.0 @@ -138,10 +138,10 @@ com.github.ajalt.colormath:colormath-jvm:3.5.0 com.github.ajalt.colormath:colormath:3.5.0 com.github.jeziellago:Markwon:58aa5aba6a com.github.jeziellago:compose-markdown:0.5.0 -com.github.topjohnwu.libsu:core:5.2.2 -com.github.topjohnwu.libsu:io:5.2.2 -com.github.topjohnwu.libsu:nio:5.2.2 -com.github.topjohnwu.libsu:service:5.2.2 +com.github.topjohnwu.libsu:core:6.0.0 +com.github.topjohnwu.libsu:io:6.0.0 +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-navigation-material:0.34.0 com.google.accompanist:accompanist-permissions:0.34.0 @@ -156,23 +156,23 @@ com.google.guava:failureaccess:1.0.1 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.27.0 -com.google.protobuf:protobuf-kotlin-lite:4.27.0 +com.google.protobuf:protobuf-javalite:4.27.2 +com.google.protobuf:protobuf-kotlin-lite:4.27.2 com.googlecode.javaewah:JavaEWAH:1.2.3 com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0 com.jakewharton.timber:timber:5.0.1 -com.materialkolor:material-color-utilities-android:1.6.1 -com.materialkolor:material-color-utilities:1.6.1 -com.materialkolor:material-kolor-android:1.6.1 -com.materialkolor:material-kolor:1.6.1 +com.materialkolor:material-color-utilities-android:1.7.0 +com.materialkolor:material-color-utilities:1.7.0 +com.materialkolor:material-kolor-android:1.7.0 +com.materialkolor:material-kolor:1.7.0 com.squareup.okhttp3:logging-interceptor:4.12.0 com.squareup.okhttp3:okhttp:4.12.0 com.squareup.okio:okio-jvm:3.8.0 com.squareup.okio:okio:3.8.0 com.squareup.retrofit2:retrofit:2.11.0 -commons-codec:commons-codec:1.16.0 -dev.drewhamilton.poko:poko-annotations-jvm:0.16.0-beta01 -dev.drewhamilton.poko:poko-annotations:0.16.0-beta01 +commons-codec:commons-codec:1.17.0 +dev.drewhamilton.poko:poko-annotations-jvm:0.16.0 +dev.drewhamilton.poko:poko-annotations:0.16.0 dev.rikka.shizuku:aidl:13.1.5 dev.rikka.shizuku:api:13.1.5 dev.rikka.shizuku:provider:13.1.5 @@ -182,9 +182,10 @@ io.coil-kt:coil-compose-base:2.6.0 io.coil-kt:coil-compose:2.6.0 io.coil-kt:coil-svg:2.6.0 io.coil-kt:coil:2.6.0 -io.github.pdvrieze.xmlutil:core-android:0.86.3 -io.github.pdvrieze.xmlutil:core:0.86.3 -io.github.pdvrieze.xmlutil:serialization-android:0.86.3 +io.github.pdvrieze.xmlutil:core-android:0.90.1 +io.github.pdvrieze.xmlutil:core-jvmcommon:0.90.1 +io.github.pdvrieze.xmlutil:core:0.90.1 +io.github.pdvrieze.xmlutil:serialization-android:0.90.1 io.noties.markwon:core:4.6.2 io.noties.markwon:ext-strikethrough:4.6.2 io.noties.markwon:ext-tables:4.6.2 @@ -195,16 +196,16 @@ me.zhanghai.android.appiconloader:appiconloader-coil:1.5.0 me.zhanghai.android.appiconloader:appiconloader-iconloaderlib:1.5.0 me.zhanghai.android.appiconloader:appiconloader:1.5.0 org.checkerframework:checker-qual:3.12.0 -org.eclipse.jgit:org.eclipse.jgit:6.9.0.202403050737-r -org.jetbrains.compose.material3:material3:1.6.10 -org.jetbrains.compose.runtime:runtime:1.6.10 -org.jetbrains.compose.ui:ui:1.6.10 +org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r +org.jetbrains.compose.material3:material3:1.6.11 +org.jetbrains.compose.runtime:runtime:1.6.11 +org.jetbrains.compose.ui:ui:1.6.11 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.22 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.0 org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 org.jetbrains.kotlin:kotlin-stdlib:2.0.0 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1 @@ -213,11 +214,11 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.1 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.0 org.jetbrains.kotlinx:kotlinx-datetime:0.6.0 -org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3 +org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.1 +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1 org.jetbrains:annotations:23.0.0 org.lsposed.hiddenapibypass:hiddenapibypass:4.3 org.slf4j:slf4j-api:1.7.36 From 1769701399497fa778f20fd1987bd93877fb04ea Mon Sep 17 00:00:00 2001 From: lihenggui Date: Tue, 10 Sep 2024 12:47:14 -0700 Subject: [PATCH 20/23] Upgrade version code Change-Id: Ief9530955e9bd6ca7dde47a025b66628bb417648 --- app-compose/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index 7b51aa3e5b..1c314b4e41 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -32,8 +32,8 @@ android { namespace = "com.merxury.blocker" defaultConfig { applicationId = "com.merxury.blocker" - versionCode = 4497 - versionName = "2.0.4497-fdroid" // X.Y.Z; X = Major, Y = minor, Z = version code + versionCode = 4803 + versionName = "2.0.4803-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" From 0790a45e3b4e04794baadc103672f3c5d4881d20 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Tue, 10 Sep 2024 19:57:13 +0000 Subject: [PATCH 21/23] =?UTF-8?q?=F0=9F=A4=96=20Updates=20baselines=20for?= =?UTF-8?q?=20Dependency=20Guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketReleaseRuntimeClasspath.txt | 203 +++++++++--------- 1 file changed, 106 insertions(+), 97 deletions(-) diff --git a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt index b9d1167951..5963cdd330 100644 --- a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt +++ b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt @@ -1,9 +1,9 @@ -androidx.activity:activity-compose:1.9.0 -androidx.activity:activity-ktx:1.9.0 -androidx.activity:activity:1.9.0 -androidx.annotation:annotation-experimental:1.4.0 -androidx.annotation:annotation-jvm:1.7.1 -androidx.annotation:annotation:1.7.1 +androidx.activity:activity-compose:1.9.2 +androidx.activity:activity-ktx:1.9.2 +androidx.activity:activity:1.9.2 +androidx.annotation:annotation-experimental:1.4.1 +androidx.annotation:annotation-jvm:1.8.1 +androidx.annotation:annotation:1.8.1 androidx.appcompat:appcompat-resources:1.7.0 androidx.appcompat:appcompat:1.7.0 androidx.arch.core:core-common:2.2.0 @@ -11,48 +11,49 @@ androidx.arch.core:core-runtime:2.2.0 androidx.autofill:autofill:1.0.0 androidx.browser:browser:1.8.0 androidx.cardview:cardview:1.0.0 -androidx.collection:collection-jvm:1.4.0 -androidx.collection:collection-ktx:1.4.0 -androidx.collection:collection:1.4.0 -androidx.compose.animation:animation-android:1.6.8 -androidx.compose.animation:animation-core-android:1.6.8 -androidx.compose.animation:animation-core:1.6.8 -androidx.compose.animation:animation:1.6.8 -androidx.compose.foundation:foundation-android:1.6.8 -androidx.compose.foundation:foundation-layout-android:1.6.8 -androidx.compose.foundation:foundation-layout:1.6.8 -androidx.compose.foundation:foundation:1.6.8 -androidx.compose.material3:material3-android:1.2.1 -androidx.compose.material3:material3-window-size-class-android:1.2.1 -androidx.compose.material3:material3-window-size-class:1.2.1 -androidx.compose.material3:material3:1.2.1 -androidx.compose.material:material-android:1.6.8 -androidx.compose.material:material-icons-core-android:1.6.8 -androidx.compose.material:material-icons-core:1.6.8 -androidx.compose.material:material-icons-extended-android:1.6.8 -androidx.compose.material:material-icons-extended:1.6.8 -androidx.compose.material:material-ripple-android:1.6.8 -androidx.compose.material:material-ripple:1.6.8 -androidx.compose.material:material:1.6.8 -androidx.compose.runtime:runtime-android:1.6.8 -androidx.compose.runtime:runtime-saveable-android:1.6.8 -androidx.compose.runtime:runtime-saveable:1.6.8 -androidx.compose.runtime:runtime:1.6.8 -androidx.compose.ui:ui-android:1.6.8 -androidx.compose.ui:ui-geometry-android:1.6.8 -androidx.compose.ui:ui-geometry:1.6.8 -androidx.compose.ui:ui-graphics-android:1.6.8 -androidx.compose.ui:ui-graphics:1.6.8 -androidx.compose.ui:ui-text-android:1.6.8 -androidx.compose.ui:ui-text:1.6.8 -androidx.compose.ui:ui-tooling-preview-android:1.6.8 -androidx.compose.ui:ui-tooling-preview:1.6.8 -androidx.compose.ui:ui-unit-android:1.6.8 -androidx.compose.ui:ui-unit:1.6.8 -androidx.compose.ui:ui-util-android:1.6.8 -androidx.compose.ui:ui-util:1.6.8 -androidx.compose.ui:ui:1.6.8 -androidx.compose:compose-bom:2024.06.00 +androidx.collection:collection-jvm:1.4.2 +androidx.collection:collection-ktx:1.4.2 +androidx.collection:collection:1.4.2 +androidx.compose.animation:animation-android:1.7.0 +androidx.compose.animation:animation-core-android:1.7.0 +androidx.compose.animation:animation-core:1.7.0 +androidx.compose.animation:animation:1.7.0 +androidx.compose.foundation:foundation-android:1.7.0 +androidx.compose.foundation:foundation-layout-android:1.7.0 +androidx.compose.foundation:foundation-layout:1.7.0 +androidx.compose.foundation:foundation:1.7.0 +androidx.compose.material3:material3-android:1.3.0 +androidx.compose.material3:material3-window-size-class-android:1.3.0 +androidx.compose.material3:material3-window-size-class:1.3.0 +androidx.compose.material3:material3:1.3.0 +androidx.compose.material:material-android:1.7.0 +androidx.compose.material:material-icons-core-android:1.7.0 +androidx.compose.material:material-icons-core:1.7.0 +androidx.compose.material:material-icons-extended-android:1.7.0 +androidx.compose.material:material-icons-extended:1.7.0 +androidx.compose.material:material-navigation:1.7.0-beta01 +androidx.compose.material:material-ripple-android:1.7.0 +androidx.compose.material:material-ripple:1.7.0 +androidx.compose.material:material:1.7.0 +androidx.compose.runtime:runtime-android:1.7.0 +androidx.compose.runtime:runtime-saveable-android:1.7.0 +androidx.compose.runtime:runtime-saveable:1.7.0 +androidx.compose.runtime:runtime:1.7.0 +androidx.compose.ui:ui-android:1.7.0 +androidx.compose.ui:ui-geometry-android:1.7.0 +androidx.compose.ui:ui-geometry:1.7.0 +androidx.compose.ui:ui-graphics-android:1.7.0 +androidx.compose.ui:ui-graphics:1.7.0 +androidx.compose.ui:ui-text-android:1.7.0 +androidx.compose.ui:ui-text:1.7.0 +androidx.compose.ui:ui-tooling-preview-android:1.7.0 +androidx.compose.ui:ui-tooling-preview:1.7.0 +androidx.compose.ui:ui-unit-android:1.7.0 +androidx.compose.ui:ui-unit:1.7.0 +androidx.compose.ui:ui-util-android:1.7.0 +androidx.compose.ui:ui-util:1.7.0 +androidx.compose.ui:ui:1.7.0 +androidx.compose:compose-bom:2024.09.00 androidx.concurrent:concurrent-futures:1.1.0 androidx.constraintlayout:constraintlayout-solver:2.0.1 androidx.constraintlayout:constraintlayout:2.0.1 @@ -76,35 +77,42 @@ androidx.emoji2:emoji2-views-helper:1.3.0 androidx.emoji2:emoji2:1.3.0 androidx.exifinterface:exifinterface:1.3.7 androidx.fragment:fragment:1.5.4 +androidx.graphics:graphics-path:1.0.1 androidx.hilt:hilt-common:1.2.0 androidx.hilt:hilt-navigation-compose:1.2.0 androidx.hilt:hilt-navigation:1.2.0 androidx.hilt:hilt-work:1.2.0 androidx.interpolator:interpolator:1.0.0 androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.7.0 -androidx.lifecycle:lifecycle-common:2.7.0 -androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0 -androidx.lifecycle:lifecycle-livedata-core:2.7.0 -androidx.lifecycle:lifecycle-livedata-ktx:2.7.0 -androidx.lifecycle:lifecycle-livedata:2.7.0 -androidx.lifecycle:lifecycle-process:2.7.0 -androidx.lifecycle:lifecycle-runtime-compose:2.7.0 -androidx.lifecycle:lifecycle-runtime-ktx:2.7.0 -androidx.lifecycle:lifecycle-runtime:2.7.0 -androidx.lifecycle:lifecycle-service:2.7.0 -androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0 -androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 -androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 -androidx.lifecycle:lifecycle-viewmodel:2.7.0 +androidx.lifecycle:lifecycle-common-java8:2.8.5 +androidx.lifecycle:lifecycle-common-jvm:2.8.5 +androidx.lifecycle:lifecycle-common:2.8.5 +androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.5 +androidx.lifecycle:lifecycle-livedata-core:2.8.5 +androidx.lifecycle:lifecycle-livedata-ktx:2.8.5 +androidx.lifecycle:lifecycle-livedata:2.8.5 +androidx.lifecycle:lifecycle-process:2.8.5 +androidx.lifecycle:lifecycle-runtime-android:2.8.5 +androidx.lifecycle:lifecycle-runtime-compose-android:2.8.5 +androidx.lifecycle:lifecycle-runtime-compose:2.8.5 +androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.5 +androidx.lifecycle:lifecycle-runtime-ktx:2.8.5 +androidx.lifecycle:lifecycle-runtime:2.8.5 +androidx.lifecycle:lifecycle-service:2.8.5 +androidx.lifecycle:lifecycle-viewmodel-android:2.8.5 +androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.5 +androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5 +androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5 +androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.5 +androidx.lifecycle:lifecycle-viewmodel:2.8.5 androidx.loader:loader:1.0.0 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 androidx.metrics:metrics-performance:1.0.0-beta01 -androidx.navigation:navigation-common-ktx:2.7.7 -androidx.navigation:navigation-common:2.7.7 -androidx.navigation:navigation-compose:2.7.7 -androidx.navigation:navigation-runtime-ktx:2.7.7 -androidx.navigation:navigation-runtime:2.7.7 +androidx.navigation:navigation-common-ktx:2.8.0 +androidx.navigation:navigation-common:2.8.0 +androidx.navigation:navigation-compose:2.8.0 +androidx.navigation:navigation-runtime-ktx:2.8.0 +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 @@ -128,8 +136,8 @@ androidx.versionedparcelable:versionedparcelable:1.1.1 androidx.viewpager2:viewpager2:1.0.0 androidx.viewpager:viewpager:1.0.0 androidx.window:window:1.0.0 -androidx.work:work-runtime-ktx:2.9.0 -androidx.work:work-runtime:2.9.0 +androidx.work:work-runtime-ktx:2.9.1 +androidx.work:work-runtime:2.9.1 com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:0.13.0 com.atlassian.commonmark:commonmark-ext-gfm-tables:0.13.0 com.atlassian.commonmark:commonmark:0.13.0 @@ -137,27 +145,26 @@ com.caverock:androidsvg-aar:1.4 com.github.ajalt.colormath:colormath-jvm:3.5.0 com.github.ajalt.colormath:colormath:3.5.0 com.github.jeziellago:Markwon:58aa5aba6a -com.github.jeziellago:compose-markdown:0.5.0 +com.github.jeziellago:compose-markdown:0.5.4 com.github.topjohnwu.libsu:core:6.0.0 com.github.topjohnwu.libsu:io:6.0.0 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-navigation-material:0.34.0 -com.google.accompanist:accompanist-permissions:0.34.0 +com.google.accompanist:accompanist-permissions:0.36.0 com.google.android.material:material:1.12.0 com.google.code.findbugs:jsr305:3.0.2 -com.google.dagger:dagger-lint-aar:2.51.1 -com.google.dagger:dagger:2.51.1 -com.google.dagger:hilt-android:2.51.1 -com.google.dagger:hilt-core:2.51.1 +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.15.0 com.google.guava:failureaccess:1.0.1 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.27.2 -com.google.protobuf:protobuf-kotlin-lite:4.27.2 +com.google.protobuf:protobuf-javalite:4.28.0 +com.google.protobuf:protobuf-kotlin-lite:4.28.0 com.googlecode.javaewah:JavaEWAH:1.2.3 com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0 com.jakewharton.timber:timber:5.0.1 @@ -167,8 +174,8 @@ com.materialkolor:material-kolor-android:1.7.0 com.materialkolor:material-kolor:1.7.0 com.squareup.okhttp3:logging-interceptor:4.12.0 com.squareup.okhttp3:okhttp:4.12.0 -com.squareup.okio:okio-jvm:3.8.0 -com.squareup.okio:okio:3.8.0 +com.squareup.okio:okio-jvm:3.9.0 +com.squareup.okio:okio:3.9.0 com.squareup.retrofit2:retrofit:2.11.0 commons-codec:commons-codec:1.17.0 dev.drewhamilton.poko:poko-annotations-jvm:0.16.0 @@ -177,11 +184,11 @@ dev.rikka.shizuku:aidl:13.1.5 dev.rikka.shizuku:api:13.1.5 dev.rikka.shizuku:provider:13.1.5 dev.rikka.shizuku:shared:13.1.5 -io.coil-kt:coil-base:2.6.0 -io.coil-kt:coil-compose-base:2.6.0 -io.coil-kt:coil-compose:2.6.0 -io.coil-kt:coil-svg:2.6.0 -io.coil-kt:coil:2.6.0 +io.coil-kt:coil-base:2.7.0 +io.coil-kt:coil-compose-base:2.7.0 +io.coil-kt:coil-compose:2.7.0 +io.coil-kt:coil-svg:2.7.0 +io.coil-kt:coil:2.7.0 io.github.pdvrieze.xmlutil:core-android:0.90.1 io.github.pdvrieze.xmlutil:core-jvmcommon:0.90.1 io.github.pdvrieze.xmlutil:core:0.90.1 @@ -189,8 +196,10 @@ io.github.pdvrieze.xmlutil:serialization-android:0.90.1 io.noties.markwon:core:4.6.2 io.noties.markwon:ext-strikethrough:4.6.2 io.noties.markwon:ext-tables:4.6.2 +io.noties.markwon:ext-tasklist:4.6.2 io.noties.markwon:html:4.6.2 io.noties.markwon:linkify:4.6.2 +jakarta.inject:jakarta.inject-api:2.0.1 javax.inject:javax.inject:1 me.zhanghai.android.appiconloader:appiconloader-coil:1.5.0 me.zhanghai.android.appiconloader:appiconloader-iconloaderlib:1.5.0 @@ -200,25 +209,25 @@ org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r org.jetbrains.compose.material3:material3:1.6.11 org.jetbrains.compose.runtime:runtime:1.6.11 org.jetbrains.compose.ui:ui:1.6.11 -org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.0 +org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.20 org.jetbrains.kotlin:kotlin-bom:1.8.22 -org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.0 -org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0 +org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.20 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 -org.jetbrains.kotlin:kotlin-stdlib:2.0.0 +org.jetbrains.kotlin:kotlin-stdlib:2.0.20 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.1 -org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.0 -org.jetbrains.kotlinx:kotlinx-datetime:0.6.0 -org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.1 -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.1 -org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.1 -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.1 -org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1 +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 +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.2 +org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.2 +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.2 +org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2 org.jetbrains:annotations:23.0.0 org.lsposed.hiddenapibypass:hiddenapibypass:4.3 org.slf4j:slf4j-api:1.7.36 From 99dad90005b064c0d2c96bd062f9954a415a7f80 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Tue, 17 Sep 2024 18:25:17 +0000 Subject: [PATCH 22/23] =?UTF-8?q?=F0=9F=A4=96=20Updates=20baselines=20for?= =?UTF-8?q?=20Dependency=20Guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketReleaseRuntimeClasspath.txt | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt index 5963cdd330..7bc7ec9f42 100644 --- a/app-compose/dependencies/marketReleaseRuntimeClasspath.txt +++ b/app-compose/dependencies/marketReleaseRuntimeClasspath.txt @@ -14,46 +14,46 @@ androidx.cardview:cardview:1.0.0 androidx.collection:collection-jvm:1.4.2 androidx.collection:collection-ktx:1.4.2 androidx.collection:collection:1.4.2 -androidx.compose.animation:animation-android:1.7.0 -androidx.compose.animation:animation-core-android:1.7.0 -androidx.compose.animation:animation-core:1.7.0 -androidx.compose.animation:animation:1.7.0 -androidx.compose.foundation:foundation-android:1.7.0 -androidx.compose.foundation:foundation-layout-android:1.7.0 -androidx.compose.foundation:foundation-layout:1.7.0 -androidx.compose.foundation:foundation:1.7.0 +androidx.compose.animation:animation-android:1.7.1 +androidx.compose.animation:animation-core-android:1.7.1 +androidx.compose.animation:animation-core:1.7.1 +androidx.compose.animation:animation:1.7.1 +androidx.compose.foundation:foundation-android:1.7.1 +androidx.compose.foundation:foundation-layout-android:1.7.1 +androidx.compose.foundation:foundation-layout:1.7.1 +androidx.compose.foundation:foundation:1.7.1 androidx.compose.material3:material3-android:1.3.0 androidx.compose.material3:material3-window-size-class-android:1.3.0 androidx.compose.material3:material3-window-size-class:1.3.0 androidx.compose.material3:material3:1.3.0 -androidx.compose.material:material-android:1.7.0 -androidx.compose.material:material-icons-core-android:1.7.0 -androidx.compose.material:material-icons-core:1.7.0 -androidx.compose.material:material-icons-extended-android:1.7.0 -androidx.compose.material:material-icons-extended:1.7.0 +androidx.compose.material:material-android:1.7.1 +androidx.compose.material:material-icons-core-android:1.7.1 +androidx.compose.material:material-icons-core:1.7.1 +androidx.compose.material:material-icons-extended-android:1.7.1 +androidx.compose.material:material-icons-extended:1.7.1 androidx.compose.material:material-navigation:1.7.0-beta01 -androidx.compose.material:material-ripple-android:1.7.0 -androidx.compose.material:material-ripple:1.7.0 -androidx.compose.material:material:1.7.0 -androidx.compose.runtime:runtime-android:1.7.0 -androidx.compose.runtime:runtime-saveable-android:1.7.0 -androidx.compose.runtime:runtime-saveable:1.7.0 -androidx.compose.runtime:runtime:1.7.0 -androidx.compose.ui:ui-android:1.7.0 -androidx.compose.ui:ui-geometry-android:1.7.0 -androidx.compose.ui:ui-geometry:1.7.0 -androidx.compose.ui:ui-graphics-android:1.7.0 -androidx.compose.ui:ui-graphics:1.7.0 -androidx.compose.ui:ui-text-android:1.7.0 -androidx.compose.ui:ui-text:1.7.0 -androidx.compose.ui:ui-tooling-preview-android:1.7.0 -androidx.compose.ui:ui-tooling-preview:1.7.0 -androidx.compose.ui:ui-unit-android:1.7.0 -androidx.compose.ui:ui-unit:1.7.0 -androidx.compose.ui:ui-util-android:1.7.0 -androidx.compose.ui:ui-util:1.7.0 -androidx.compose.ui:ui:1.7.0 -androidx.compose:compose-bom:2024.09.00 +androidx.compose.material:material-ripple-android:1.7.1 +androidx.compose.material:material-ripple:1.7.1 +androidx.compose.material:material:1.7.1 +androidx.compose.runtime:runtime-android:1.7.1 +androidx.compose.runtime:runtime-saveable-android:1.7.1 +androidx.compose.runtime:runtime-saveable:1.7.1 +androidx.compose.runtime:runtime:1.7.1 +androidx.compose.ui:ui-android:1.7.1 +androidx.compose.ui:ui-geometry-android:1.7.1 +androidx.compose.ui:ui-geometry:1.7.1 +androidx.compose.ui:ui-graphics-android:1.7.1 +androidx.compose.ui:ui-graphics:1.7.1 +androidx.compose.ui:ui-text-android:1.7.1 +androidx.compose.ui:ui-text:1.7.1 +androidx.compose.ui:ui-tooling-preview-android:1.7.1 +androidx.compose.ui:ui-tooling-preview:1.7.1 +androidx.compose.ui:ui-unit-android:1.7.1 +androidx.compose.ui:ui-unit:1.7.1 +androidx.compose.ui:ui-util-android:1.7.1 +androidx.compose.ui:ui-util:1.7.1 +androidx.compose.ui:ui:1.7.1 +androidx.compose:compose-bom:2024.09.01 androidx.concurrent:concurrent-futures:1.1.0 androidx.constraintlayout:constraintlayout-solver:2.0.1 androidx.constraintlayout:constraintlayout:2.0.1 @@ -163,8 +163,8 @@ com.google.guava:failureaccess:1.0.1 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.0 -com.google.protobuf:protobuf-kotlin-lite:4.28.0 +com.google.protobuf:protobuf-javalite:4.28.1 +com.google.protobuf:protobuf-kotlin-lite:4.28.1 com.googlecode.javaewah:JavaEWAH:1.2.3 com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0 com.jakewharton.timber:timber:5.0.1 @@ -216,11 +216,11 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.0.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 org.jetbrains.kotlin:kotlin-stdlib:2.0.20 -org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.1 +org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0 +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-datetime-jvm:0.6.1 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.2 From 48532079843170f7e18694496bcec3d421dc6ebd Mon Sep 17 00:00:00 2001 From: lihenggui Date: Tue, 17 Sep 2024 13:01:41 -0700 Subject: [PATCH 23/23] Bump version code Change-Id: Iaef5af539bb365b0249c5708ca16fe415640fd8d --- app-compose/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts index 1c314b4e41..a787bf482f 100644 --- a/app-compose/build.gradle.kts +++ b/app-compose/build.gradle.kts @@ -32,8 +32,8 @@ android { namespace = "com.merxury.blocker" defaultConfig { applicationId = "com.merxury.blocker" - versionCode = 4803 - versionName = "2.0.4803-fdroid" // 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"