From 3b090272cb26188bb79d705d84031eebf649cba0 Mon Sep 17 00:00:00 2001 From: Erik Eelde Date: Mon, 9 Sep 2024 01:34:35 +0200 Subject: [PATCH] Fix build again --- build.gradle.kts | 2 ++ gradle/libs.versions.toml | 10 ++++++++++ toggles-flow/build.gradle.kts | 2 +- toggles-prefs/build.gradle.kts | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 05a56c7f..2ff37dde 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,6 +21,8 @@ buildscript { versionCatalogUpdate { keep { keepUnusedVersions = true + keepUnusedLibraries = true + keepUnusedPlugins = true } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5508df8a..db54f283 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,6 +14,7 @@ com-squareup-leakcanary = "2.14" com-squareup-moshi = "1.15.1" dokka = "1.9.20" espresso-core = "3.6.1" +io-gitlab-arturbosch-detekt = "1.23.6" junit = "4.13.2" kotlin = "2.0.20" ksp = "2.0.20-1.0.25" @@ -23,6 +24,7 @@ se-eelde-toggles = "0.0.1" [libraries] androidx-activity-activity-compose = { module = "androidx.activity:activity-compose", 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-testing = { module = "androidx.arch.core:core-testing", version.ref = "androidx-arch-core" } androidx-compose-animation = { module = "androidx.compose.animation:animation" } @@ -68,15 +70,20 @@ 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-devtools-ksp-com-google-devtools-ksp-gradle-plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" } com-google-gms-google-services = "com.google.gms:google-services:4.4.2" com-slack-lint-compose-compose-lint-checks = "com.slack.lint.compose:compose-lint-checks:1.3.1" +com-squareup-kotlinpoet = "com.squareup:kotlinpoet:1.16.0" 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.9.0" io-gitlab-arturbosch-detekt-detekt-formatting = "io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7" +io-gitlab-arturbosch-detekt-detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "io-gitlab-arturbosch-detekt" } +io-gitlab-arturbosch-detekt-detekt-rules-libraries = { module = "io.gitlab.arturbosch.detekt:detekt-rules-libraries", version.ref = "io-gitlab-arturbosch-detekt" } 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-compose-compiler-gradle-plugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" } org-jetbrains-kotlin-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } org-jetbrains-kotlinx-kotlinx-collections-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8" org-jetbrains-kotlinx-kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android" } @@ -88,6 +95,7 @@ org-robolectric = "org.robolectric:robolectric:4.13" se-eelde-toggles-toggles-core = "se.eelde.toggles:toggles-core:0.0.2" se-eelde-toggles-toggles-flow = { module = "se.eelde.toggles:toggles-flow", version.ref = "se-eelde-toggles" } se-eelde-toggles-toggles-prefs = { module = "se.eelde.toggles:toggles-prefs", version.ref = "se-eelde-toggles" } +se-premex-ownership-gradle-plugin = "se.premex:ownership-gradle-plugin:0.0.11" [plugins] com-android-library = { id = "com.android.library", version.ref = "agp" } @@ -95,6 +103,8 @@ com-autonomousapps-dependency-analysis = "com.autonomousapps.dependency-analysis com-github-ben-manes-versions = "com.github.ben-manes.versions:0.51.0" com-github-triplet-play = "com.github.triplet.play:3.11.0" com-google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +com-vanniktech-maven-publish = "com.vanniktech.maven.publish:0.27.0" 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.4.2" diff --git a/toggles-flow/build.gradle.kts b/toggles-flow/build.gradle.kts index e16816f1..2fc396f7 100644 --- a/toggles-flow/build.gradle.kts +++ b/toggles-flow/build.gradle.kts @@ -13,7 +13,7 @@ android { dependencies { testImplementation(libs.junit) - testImplementation(libs.androidx.test.core) + testImplementation(libs.androidx.test.core.ktx) testImplementation(libs.androidx.test.ext.truth) testImplementation(libs.androidx.test.rules) testImplementation(libs.androidx.test.runner) diff --git a/toggles-prefs/build.gradle.kts b/toggles-prefs/build.gradle.kts index 6dc28f59..0ccf4a23 100644 --- a/toggles-prefs/build.gradle.kts +++ b/toggles-prefs/build.gradle.kts @@ -13,7 +13,7 @@ android { dependencies { testImplementation(libs.junit) - testImplementation(libs.androidx.test.core) + testImplementation(libs.androidx.test.core.ktx) testImplementation(libs.androidx.test.ext.truth) testImplementation(libs.androidx.test.rules) testImplementation(libs.androidx.test.runner)