From c2253a560d388f733294a2b09123e3b85ff8953e Mon Sep 17 00:00:00 2001 From: Erik Eelde Date: Fri, 10 May 2024 09:02:08 +0200 Subject: [PATCH] Bump versions --- .../toggles.detekt-conventions.gradle.kts | 2 +- build.gradle.kts | 7 ++ gradle/libs.versions.toml | 92 +++++-------------- 3 files changed, 30 insertions(+), 71 deletions(-) diff --git a/build-logic/conventions/src/main/kotlin/toggles.detekt-conventions.gradle.kts b/build-logic/conventions/src/main/kotlin/toggles.detekt-conventions.gradle.kts index 5671e3d9..234d4095 100644 --- a/build-logic/conventions/src/main/kotlin/toggles.detekt-conventions.gradle.kts +++ b/build-logic/conventions/src/main/kotlin/toggles.detekt-conventions.gradle.kts @@ -6,7 +6,7 @@ plugins { } dependencies { - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0") + detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.6") } detekt { diff --git a/build.gradle.kts b/build.gradle.kts index 84720ee4..9b2d5528 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,6 +28,13 @@ plugins { alias(libs.plugins.com.autonomousapps.dependency.analysis) } +develocity { + buildScan { + termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use") + termsOfUseAgree.set("yes") + } +} + fun isNonStable(version: String): Boolean { val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase(Locale.getDefault()).contains(it) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f0106919..16035333 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,20 +3,16 @@ agp = "8.4.0" androidx-activity = "1.7.1" androidx-appcompat = "1.6.1" androidx-arch-core = "2.2.0" -androidx-collection = "1.1.0" androidx-compose-bom = "2024.05.00" androidx-compose-compiler = "1.5.13" -androidx-core = "1.10.0" -androidx-hilt = "1.0.0" -androidx-lifecycle = "2.6.1" -androidx-navigation = "2.7.0" -androidx-room = "2.6.0-alpha03" -androidx-savedstate = "1.2.1" +androidx-hilt = "1.2.0" +androidx-lifecycle = "2.7.0" +androidx-navigation = "2.7.7" +androidx-room = "2.6.1" androidx-test = "1.5.0" -androidx-vectordrawable = "1.1.0" -com-google-dagger = "2.48" -com-squareup-leakcanary = "2.8.1" -com-squareup-moshi = "1.15.0" +com-google-dagger = "2.51.1" +com-squareup-leakcanary = "2.14" +com-squareup-moshi = "1.15.1" dokka = "1.9.0" espresso-core = "3.5.1" junit = "4.13.2" @@ -25,68 +21,37 @@ orchestrator = "1.4.2" org-jetbrains-kotlinx = "1.6.4" [libraries] -androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" } androidx-activity-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } -androidx-activity-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" } androidx-annotation = "androidx.annotation:annotation:1.6.0" androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } -androidx-arch-core-core-common = { module = "androidx.arch.core:core-common", version.ref = "androidx-arch-core" } -androidx-arch-core-core-runtime = { module = "androidx.arch.core:core-runtime", version.ref = "androidx-arch-core" } androidx-arch-core-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "androidx-arch-core" } -androidx-collection = { module = "androidx.collection:collection", version.ref = "androidx-collection" } -androidx-collection-collection-ktx = { module = "androidx.collection:collection-ktx", version.ref = "androidx-collection" } androidx-compose-animation = { module = "androidx.compose.animation:animation" } -androidx-compose-animation-animation-core = { module = "androidx.compose.animation:animation-core" } androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } androidx-compose-foundation-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } -androidx-compose-material-material-icons-core = { module = "androidx.compose.material:material-icons-core" } androidx-compose-material-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" } -androidx-compose-material-material-ripple = { module = "androidx.compose.material:material-ripple" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } -androidx-compose-runtime-runtime-saveable = { module = "androidx.compose.runtime:runtime-saveable" } androidx-compose-ui = { module = "androidx.compose.ui:ui" } -androidx-compose-ui-ui-geometry = { module = "androidx.compose.ui:ui-geometry" } -androidx-compose-ui-ui-graphics = { module = "androidx.compose.ui:ui-graphics" } androidx-compose-ui-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } androidx-compose-ui-ui-text = { module = "androidx.compose.ui:ui-text" } androidx-compose-ui-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } -androidx-compose-ui-ui-tooling-data = { module = "androidx.compose.ui:ui-tooling-data" } androidx-compose-ui-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } -androidx-compose-ui-ui-unit = { module = "androidx.compose.ui:ui-unit" } -androidx-compose-ui-ui-util = { module = "androidx.compose.ui:ui-util" } -androidx-concurrent-concurrent-futures = "androidx.concurrent:concurrent-futures:1.1.0" -androidx-core = { module = "androidx.core:core", version.ref = "androidx-core" } androidx-core-core-ktx = "androidx.core:core-ktx:1.9.0" -androidx-cursoradapter = "androidx.cursoradapter:cursoradapter:1.0.0" -androidx-customview-customview-poolingcontainer = "androidx.customview:customview-poolingcontainer:1.0.0" -androidx-fragment = "androidx.fragment:fragment:1.5.1" androidx-hilt-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" } -androidx-hilt-hilt-navigation = { module = "androidx.hilt:hilt-navigation", version.ref = "androidx-hilt" } -androidx-hilt-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-hilt" } -androidx-interpolator = "androidx.interpolator:interpolator:1.0.0" -androidx-lifecycle-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" } +androidx-hilt-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version = "1.2.0" } androidx-lifecycle-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidx-lifecycle" } androidx-lifecycle-lifecycle-runtime-compose = "androidx.lifecycle:lifecycle-runtime-compose:2.6.1" -androidx-lifecycle-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "androidx-lifecycle" } androidx-lifecycle-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" } -androidx-lifecycle-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" } androidx-lifecycle-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" } -androidx-lifecycle-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" } -androidx-loader = "androidx.loader:loader:1.0.0" -androidx-navigation-navigation-common = { module = "androidx.navigation:navigation-common", version.ref = "androidx-navigation" } -androidx-navigation-navigation-common-ktx = { module = "androidx.navigation:navigation-common-ktx", version.ref = "androidx-navigation" } androidx-navigation-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" } -androidx-navigation-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidx-navigation" } androidx-navigation-navigation-runtime-ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "androidx-navigation" } androidx-test-orchestrator = { module = "androidx.test:orchestrator", version.ref = "orchestrator" } androidx-room-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" } androidx-room-room-ktx = { module = "androidx.room:room-ktx", version.ref = "androidx-room" } androidx-room-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidx-room" } androidx-room-room-testing = { module = "androidx.room:room-testing", version.ref = "androidx-room" } -androidx-savedstate = { module = "androidx.savedstate:savedstate", version.ref = "androidx-savedstate" } androidx-startup-startup-runtime = "androidx.startup:startup-runtime:1.1.1" androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" } androidx-test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidx-test" } @@ -95,14 +60,8 @@ androidx-test-ext-junit = "androidx.test.ext:junit:1.1.5" androidx-test-ext-truth = "androidx.test.ext:truth:1.5.0" androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" } androidx-test-runner = "androidx.test:runner:1.5.2" -androidx-tracing = "androidx.tracing:tracing:1.0.0" -androidx-vectordrawable = { module = "androidx.vectordrawable:vectordrawable", version.ref = "androidx-vectordrawable" } -androidx-vectordrawable-vectordrawable-animated = { module = "androidx.vectordrawable:vectordrawable-animated", version.ref = "androidx-vectordrawable" } -androidx-versionedparcelable = "androidx.versionedparcelable:versionedparcelable:1.1.1" -androidx-viewpager = "androidx.viewpager:viewpager:1.0.0" -app-cash-licensee-licensee-gradle-plugin = "app.cash.licensee:licensee-gradle-plugin:1.8.0" +app-cash-licensee-licensee-gradle-plugin = "app.cash.licensee:licensee-gradle-plugin:1.11.0" com-android-tools-build-gradle = "com.android.tools.build:gradle:8.4.0" -com-google-code-findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2" com-google-dagger = { module = "com.google.dagger:dagger", version.ref = "com-google-dagger" } com-google-dagger-dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "com-google-dagger" } com-google-dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "com-google-dagger" } @@ -110,26 +69,22 @@ com-google-dagger-hilt-android-compiler = { module = "com.google.dagger:hilt-and com-google-dagger-hilt-android-gradle-plugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "com-google-dagger" } com-google-dagger-hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "com-google-dagger" } com-google-dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "com-google-dagger" } -com-google-firebase-firebase-crashlytics-gradle = "com.google.firebase:firebase-crashlytics-gradle:2.9.8" -com-google-gms-google-services = "com.google.gms:google-services:4.3.15" -com-slack-lint-compose-compose-lint-checks = "com.slack.lint.compose:compose-lint-checks:1.2.0" +com-google-gms-google-services = "com.google.gms:google-services:4.4.1" +com-slack-lint-compose-compose-lint-checks = "com.slack.lint.compose:compose-lint-checks:1.3.1" com-squareup-leakcanary-leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "com-squareup-leakcanary" } com-squareup-moshi = { module = "com.squareup.moshi:moshi", version.ref = "com-squareup-moshi" } com-squareup-moshi-moshi-kotlin-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "com-squareup-moshi" } -com-squareup-okio = "com.squareup.okio:okio:3.5.0" -espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso-core" } -io-gitlab-arturbosch-detekt-detekt-formatting = "io.gitlab.arturbosch.detekt:detekt-formatting:1.23.1" -io-gitlab-arturbosch-detekt-detekt-gradle-plugin = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.1" -io-gitlab-arturbosch-detekt-detekt-rules-libraries = "io.gitlab.arturbosch.detekt:detekt-rules-libraries:1.23.1" +com-squareup-okio = "com.squareup.okio:okio:3.9.0" +io-gitlab-arturbosch-detekt-detekt-formatting = "io.gitlab.arturbosch.detekt:detekt-formatting:1.23.6" +io-gitlab-arturbosch-detekt-detekt-gradle-plugin = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6" +io-gitlab-arturbosch-detekt-detekt-rules-libraries = "io.gitlab.arturbosch.detekt:detekt-rules-libraries:1.23.6" junit = { module = "junit:junit", version.ref = "junit" } org-jetbrains-dokka-dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } org-jetbrains-kotlin-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -org-jetbrains-kotlin-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } -org-jetbrains-kotlin-kotlin-stdlib-jdk8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0" -org-jetbrains-kotlinx-kotlinx-collections-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5" +org-jetbrains-kotlinx-kotlinx-collections-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7" org-jetbrains-kotlinx-kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android" } org-jetbrains-kotlinx-kotlinx-coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version.ref = "org-jetbrains-kotlinx" } -org-robolectric = "org.robolectric:robolectric:4.10.3" +org-robolectric = "org.robolectric:robolectric:4.12.1" se-eelde-toggles-toggles-core = { module = "se.eelde.toggles:toggles-core" } se-eelde-toggles-toggles-flow = { module = "se.eelde.toggles:toggles-flow" } se-eelde-toggles-toggles-prefs = { module = "se.eelde.toggles:toggles-prefs" } @@ -138,15 +93,12 @@ se-eelde-toggles-toggles-prefs = { module = "se.eelde.toggles:toggles-prefs" } #se-eelde-toggles-toggles-prefs = "se.eelde.toggles:toggles-prefs:0.0.1" [plugins] com-android-library = { id = "com.android.library", version.ref = "agp" } -com-autonomousapps-dependency-analysis = "com.autonomousapps.dependency-analysis:1.28.0" -com-github-ben-manes-versions = "com.github.ben-manes.versions:0.50.0" -com-github-triplet-play = "com.github.triplet.play:3.8.4" -com-google-dagger-hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "com-google-dagger" } +com-autonomousapps-dependency-analysis = "com.autonomousapps.dependency-analysis:1.31.0" +com-github-ben-manes-versions = "com.github.ben-manes.versions:0.51.0" +com-github-triplet-play = "com.github.triplet.play:3.9.1" com-google-devtools-ksp = "com.google.devtools.ksp:1.9.23-1.0.20" -com-google-firebase-crashlytics = "com.google.firebase.crashlytics:2.9.8" -com-google-gms-google-services = "com.google.gms.google-services:4.3.15" com-vanniktech-maven-publish = "com.vanniktech.maven.publish:0.27.0" -nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.3" +nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.4" org-jetbrains-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } org-jetbrains-kotlinx-binary-compatibility-validator = "org.jetbrains.kotlinx.binary-compatibility-validator:0.13.2" -se-premex-gross = "se.premex.gross:0.2.0" +se-premex-gross = "se.premex.gross:0.4.2"