From 6d4acac53f9afdfd1f48944daf0649a9b8c9a023 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 22 Jan 2024 00:22:34 +0530 Subject: feat(build): remove dependency updates plugin Renovate handles this for us --- build-logic/build.gradle.kts | 6 ---- .../gradle/DependencyUpdatesPlugin.kt | 35 ---------------------- gradle/libs.versions.toml | 4 +-- settings.gradle.kts | 2 -- 4 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 build-logic/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 4dc0e4b3..877d6752 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -65,10 +65,6 @@ gradlePlugin { id = "com.github.android-password-store.versioning-plugin" implementationClass = "app.passwordstore.gradle.versioning.VersioningPlugin" } - register("versions") { - id = "com.github.android-password-store.versions" - implementationClass = "app.passwordstore.gradle.DependencyUpdatesPlugin" - } } } @@ -88,8 +84,6 @@ dependencies { implementation(libs.build.r8) implementation(libs.build.semver) implementation(libs.build.sentry) - implementation(libs.build.vcu) - implementation(libs.build.versions) implementation(libs.kotlinx.coroutines.core) // Expose the generated version catalog API to the plugin. diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt deleted file mode 100644 index 2880ac1d..00000000 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt +++ /dev/null @@ -1,35 +0,0 @@ -package app.passwordstore.gradle - -import com.github.benmanes.gradle.versions.VersionsPlugin -import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask -import nl.littlerobots.vcu.plugin.VersionCatalogUpdateExtension -import nl.littlerobots.vcu.plugin.VersionCatalogUpdatePlugin -import org.gradle.api.Plugin -import org.gradle.api.initialization.Settings -import org.gradle.kotlin.dsl.apply -import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.withType - -@Suppress("Unused") -class DependencyUpdatesPlugin : Plugin { - - override fun apply(settings: Settings) { - settings.gradle.allprojects { - if (rootProject == this) { - pluginManager.apply(VersionCatalogUpdatePlugin::class) - extensions.configure { keep.keepUnusedLibraries.set(true) } - pluginManager.apply(VersionsPlugin::class) - tasks.withType { - rejectVersionIf { - when (candidate.group) { - "commons-codec", - "org.eclipse.jgit" -> true - else -> false - } - } - checkForGradleUpdate = false - } - } - } - } -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 22fa8671..f891ffaf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,6 @@ agp = "8.2.0" androidxActivity = "1.8.2" bouncycastle = "1.77" -moshi = "1.15.0" # @keep used for kotlinCompilerExtensionVersion composeCompiler = "1.5.8-dev-k1.9.22-42b6ec2b037" coroutines = "1.7.3" @@ -13,6 +12,7 @@ hilt = "2.50" kotlin = "1.9.22" kotlinResult = "1.1.18" lifecycle = "2.7.0" +moshi = "1.15.0" [libraries] android-desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.0.4" @@ -52,8 +52,6 @@ build-okhttp = "com.squareup.okhttp3:okhttp:4.12.0" build-r8 = "com.android.tools:r8:8.2.42" build-semver = "com.vdurmont:semver4j:3.1.0" build-sentry = "io.sentry.android.gradle:io.sentry.android.gradle.gradle.plugin:4.2.0" -build-vcu = "nl.littlerobots.version-catalog-update:nl.littlerobots.version-catalog-update.gradle.plugin:0.8.3" -build-versions = "com.github.ben-manes:gradle-versions-plugin:0.50.0" compose-bom = "androidx.compose:compose-bom:2023.10.01" compose-foundation-core = { module = "androidx.compose.foundation:foundation" } compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 4ea514e3..ad0970cd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,7 +20,6 @@ pluginManagement { exclusiveContent { forRepository { gradlePluginPortal() } filter { - includeModule("com.github.ben-manes", "gradle-versions-plugin") includeModule("com.gradle", "gradle-enterprise-gradle-plugin") includeModule("com.gradle.enterprise", "com.gradle.enterprise.gradle.plugin") includeModule("me.tylerbwong.gradle.metalava", "plugin") @@ -42,7 +41,6 @@ pluginManagement { plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" id("com.gradle.enterprise") version "3.16.1" - id("com.github.android-password-store.versions") } gradleEnterprise { -- cgit v1.2.3