diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a2f2a42f4..2868bbd54 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,5 +1,6 @@ -import com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE -import com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP +import com.mikepenz.aboutlibraries.plugin.DuplicateMode +import com.mikepenz.aboutlibraries.plugin.DuplicateRule +import java.util.regex.Pattern import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag val isRelease: Boolean @@ -298,9 +299,13 @@ ksp { } aboutLibraries { + collect { + includePlatform = false + } library { - duplicationMode = MERGE - duplicationRule = GROUP + exclusionPatterns.add(Pattern.compile("org\\.jetbrains\\.(?:compose|androidx)\\..*")) + duplicationMode = DuplicateMode.MERGE + duplicationRule = DuplicateRule.GROUP } } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt index 4497afb37..068f38b29 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt @@ -46,7 +46,8 @@ fun AnimatedVisibilityScope.LicenseScreen(navigator: DestinationsNavigator) = Sc LibrariesContainer( modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), librariesBlock = { ctx -> - // Avoid `Resources.getIdentifier()` call + // Avoid `Resources.getIdentifier()` call for strict resource shrinking + // https://developer.android.com/build/shrink-code#strict-reference-checks Libs.Builder().withJson(ctx, R.raw.aboutlibraries).build() }, contentPadding = paddingValues, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 817ec6071..951935b80 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -aboutlibraries = "12.1.0-rc01" +aboutlibraries = "12.1.0-rc02" accompanist = "0.37.2" agp = "8.9.2" androidx-activity = "1.10.1" diff --git a/renovate.json b/renovate.json index e31da366d..4bd07a47e 100644 --- a/renovate.json +++ b/renovate.json @@ -44,12 +44,6 @@ ], "allowedVersions": "!/SNAPSHOT$/" }, - { - "matchDepNames": [ - "com.mikepenz{:,.}aboutlibraries*" - ], - "automerge": false - }, { "groupName": "AGP", "matchDepNames": [