diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 73392b76d..a2f2a42f4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -298,8 +298,10 @@ ksp { } aboutLibraries { - duplicationMode = MERGE - duplicationRule = GROUP + library { + duplicationMode = MERGE + duplicationRule = GROUP + } } val ktlintVersion = libs.ktlint.get().version 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 4f2e19f4b..4497afb37 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 @@ -6,7 +6,6 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar @@ -20,8 +19,8 @@ import com.hippo.ehviewer.R import com.hippo.ehviewer.ui.Screen import com.hippo.ehviewer.ui.openBrowser import com.mikepenz.aboutlibraries.Libs +import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer -import com.mikepenz.aboutlibraries.ui.compose.m3.LibraryDefaults import com.mikepenz.aboutlibraries.util.withJson import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootGraph @@ -51,7 +50,6 @@ fun AnimatedVisibilityScope.LicenseScreen(navigator: DestinationsNavigator) = Sc Libs.Builder().withJson(ctx, R.raw.aboutlibraries).build() }, contentPadding = paddingValues, - colors = LibraryDefaults.libraryColors(badgeBackgroundColor = MaterialTheme.colorScheme.tertiary), padding = LibraryDefaults.libraryPadding(badgeContentPadding = PaddingValues(4.dp)), onLibraryClick = { library -> library.website?.let { openBrowser(it) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 81ce36ec9..0f3e826c9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] -aboutlibraries = "11.2.3" +aboutlibraries = "12.0.0-b03+compose_1_8-2" +aboutlibraries-plugin = "12.0.0-b03" accompanist = "0.37.2" agp = "8.9.1" androidx-activity = "1.10.1" @@ -131,7 +132,7 @@ kotlinx-serialization = ["serialization-cbor", "serialization-json", "serializat splitties = ["splitties-appctx", "splitties-arch-room", "splitties-preferences", "splitties-systemservices"] [plugins] -aboutlibrariesPlugin = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlibraries" } +aboutlibrariesPlugin = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlibraries-plugin" } android-application = { id = "com.android.application", version.ref = "agp" } composeCompilerReportGenerator = { id = "dev.shreyaspatil.compose-compiler-report-generator", version = "1.4.2" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } diff --git a/renovate.json b/renovate.json index b2f753ada..2fea808ae 100644 --- a/renovate.json +++ b/renovate.json @@ -44,12 +44,6 @@ ], "allowedVersions": "!/SNAPSHOT$/" }, - { - "matchDepNames": [ - "com.mikepenz{:.}aboutlibraries*" - ], - "automerge": false - }, { "groupName": "AGP", "matchDepNames": [