diff --git a/build.gradle.kts b/build.gradle.kts index f7a18781..17551f9e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,7 +33,6 @@ plugins { alias(libs.plugins.dokkaJavadocPlugin) apply false alias(libs.plugins.androidApplicationPlugin) apply false alias(libs.plugins.androidLibraryPlugin) apply false - alias(libs.plugins.versionsPluginGradle) apply false alias(libs.plugins.mavenPublishPlugin) apply false } diff --git a/dd-sdk-android-gradle-plugin-kcp-common/build.gradle.kts b/dd-sdk-android-gradle-plugin-kcp-common/build.gradle.kts index 79f41b0a..c3f8e149 100644 --- a/dd-sdk-android-gradle-plugin-kcp-common/build.gradle.kts +++ b/dd-sdk-android-gradle-plugin-kcp-common/build.gradle.kts @@ -21,7 +21,6 @@ plugins { // Analysis tools id("ktlint") - id("com.github.ben-manes.versions") // Internal Generation id("thirdPartyLicences") @@ -58,6 +57,5 @@ datadogBuildConfig { applyJavadocConfig() applyKotlinConfig() applyJunitConfig() - applyDependencyUpdateConfig() applyPublishingConfig("Common module for Datadog Kotlin Compiler Plugin") } diff --git a/dd-sdk-android-gradle-plugin-kcp-kotlin20/build.gradle.kts b/dd-sdk-android-gradle-plugin-kcp-kotlin20/build.gradle.kts index 86ec1abc..99fe0b6d 100644 --- a/dd-sdk-android-gradle-plugin-kcp-kotlin20/build.gradle.kts +++ b/dd-sdk-android-gradle-plugin-kcp-kotlin20/build.gradle.kts @@ -17,7 +17,6 @@ plugins { // Analysis tools id("ktlint") - id("com.github.ben-manes.versions") // Tests id("org.jetbrains.kotlinx.kover") @@ -51,6 +50,5 @@ datadogBuildConfig { applyKotlinConfig() applyJunitConfig() applyJavadocConfig() - applyDependencyUpdateConfig() applyPublishingConfig("Module to support Datadog Compiler Plugin with kotlin 2.0.x or below") } diff --git a/dd-sdk-android-gradle-plugin-kcp-kotlin21/build.gradle.kts b/dd-sdk-android-gradle-plugin-kcp-kotlin21/build.gradle.kts index 2b8ee1c6..b63a8d11 100644 --- a/dd-sdk-android-gradle-plugin-kcp-kotlin21/build.gradle.kts +++ b/dd-sdk-android-gradle-plugin-kcp-kotlin21/build.gradle.kts @@ -17,7 +17,6 @@ plugins { // Analysis tools id("ktlint") - id("com.github.ben-manes.versions") // Tests id("org.jetbrains.kotlinx.kover") @@ -51,6 +50,5 @@ datadogBuildConfig { applyKotlinConfig() applyJunitConfig() applyJavadocConfig() - applyDependencyUpdateConfig() applyPublishingConfig("Module to support Datadog Compiler Plugin with kotlin 2.1.x") } diff --git a/dd-sdk-android-gradle-plugin-kcp-kotlin22/build.gradle.kts b/dd-sdk-android-gradle-plugin-kcp-kotlin22/build.gradle.kts index 3d9f8a31..62d69956 100644 --- a/dd-sdk-android-gradle-plugin-kcp-kotlin22/build.gradle.kts +++ b/dd-sdk-android-gradle-plugin-kcp-kotlin22/build.gradle.kts @@ -17,7 +17,6 @@ plugins { // Analysis tools id("ktlint") - id("com.github.ben-manes.versions") // Tests id("org.jetbrains.kotlinx.kover") @@ -51,6 +50,5 @@ datadogBuildConfig { applyKotlinConfig() applyJunitConfig() applyJavadocConfig() - applyDependencyUpdateConfig() applyPublishingConfig("Module to support Datadog Compiler Plugin with kotlin 2.2.x or above") } diff --git a/dd-sdk-android-gradle-plugin-kcp-kotlin24/build.gradle.kts b/dd-sdk-android-gradle-plugin-kcp-kotlin24/build.gradle.kts index 0d871126..f4cdd25c 100644 --- a/dd-sdk-android-gradle-plugin-kcp-kotlin24/build.gradle.kts +++ b/dd-sdk-android-gradle-plugin-kcp-kotlin24/build.gradle.kts @@ -17,7 +17,6 @@ plugins { // Analysis tools id("ktlint") - id("com.github.ben-manes.versions") // Tests id("org.jetbrains.kotlinx.kover") @@ -51,6 +50,5 @@ datadogBuildConfig { applyKotlinConfig() applyJunitConfig() applyJavadocConfig() - applyDependencyUpdateConfig() applyPublishingConfig("Module to support Datadog Compiler Plugin with kotlin 2.4.x or above") } diff --git a/dd-sdk-android-gradle-plugin/build.gradle.kts b/dd-sdk-android-gradle-plugin/build.gradle.kts index ef04c080..7951d568 100644 --- a/dd-sdk-android-gradle-plugin/build.gradle.kts +++ b/dd-sdk-android-gradle-plugin/build.gradle.kts @@ -20,7 +20,6 @@ plugins { // Analysis tools id("ktlint") - id("com.github.ben-manes.versions") // Tests id("org.jetbrains.kotlinx.kover") @@ -59,7 +58,6 @@ datadogBuildConfig { applyKotlinConfig() applyJunitConfig() applyJavadocConfig() - applyDependencyUpdateConfig() applyPublishingConfig("Plugin to upload Proguard/R8 mapping files to Datadog.") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e29a0f9f..802f448f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -45,7 +45,6 @@ unmock = "0.7.5" fuzzyWuzzy = "1.4.0" -versionsPluginGradle = "0.33.0" gradlePluginPublishPlugin = "2.1.1" mavenPublishPlugin = "0.37.0" buildConfig = "6.0.10" @@ -78,7 +77,6 @@ dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", versio ktlintGradlePlugin = { module = "org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin", version.ref = "ktlintGradlePlugin" } unmockGradlePlugin = { module = "de.mobilej.unmock:UnMockPlugin", version.ref = "unmock" } -versionsGradlePlugin = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "versionsPluginGradle" } mavenPublishPlugin = { module = "com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin", version.ref = "mavenPublishPlugin" } kotlin21 = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin21" } @@ -190,7 +188,6 @@ kotlinPlugin24 = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin24" } ktlintGradlePlugin = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlintGradlePlugin" } koverPlugin = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } mavenPublishPlugin = { id = "com.vanniktech.maven.publish.base", version.ref = "mavenPublishPlugin" } -versionsPluginGradle = { id = "com.github.ben-manes.versions", version.ref = "versionsPluginGradle" } kotlinComposePlugin = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinComposePlugin" } gradlePluginPublish = { id = "com.gradle.plugin-publish", version.ref = "gradlePluginPublishPlugin" } buildConfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildConfig" } diff --git a/tools/build-config/build.gradle.kts b/tools/build-config/build.gradle.kts index 56740785..6fe563ac 100644 --- a/tools/build-config/build.gradle.kts +++ b/tools/build-config/build.gradle.kts @@ -7,7 +7,6 @@ plugins { `kotlin-dsl` alias(libs.plugins.ktlintGradlePlugin) - alias(libs.plugins.versionsPluginGradle) } ktlint { @@ -45,7 +44,6 @@ dependencies { // Dependencies used to configure the Gradle plugins compileOnly(libs.kotlinGradlePlugin21) compileOnly(libs.ktlintGradlePlugin) - compileOnly(libs.versionsGradlePlugin) compileOnly(libs.dokkaGradlePlugin) compileOnly(libs.mavenPublishPlugin) implementation(libs.fuzzyWuzzy) diff --git a/tools/build-config/src/main/kotlin/com/datadog/gradle/config/DependencyUpdateConfig.kt b/tools/build-config/src/main/kotlin/com/datadog/gradle/config/DependencyUpdateConfig.kt deleted file mode 100644 index 9769ead8..00000000 --- a/tools/build-config/src/main/kotlin/com/datadog/gradle/config/DependencyUpdateConfig.kt +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. - * This product includes software developed at Datadog (https://www.datadoghq.com/). - * Copyright 2020-Present Datadog, Inc. - */ - -package com.datadog.gradle.config - -import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask -import org.gradle.api.Project - -internal fun Project.dependencyUpdateConfig() { - taskConfig { - revision = "release" - } -} diff --git a/tools/build-config/src/main/kotlin/com/datadog/gradle/plugin/config/BuildConfigExtension.kt b/tools/build-config/src/main/kotlin/com/datadog/gradle/plugin/config/BuildConfigExtension.kt index 9732769d..2353320e 100644 --- a/tools/build-config/src/main/kotlin/com/datadog/gradle/plugin/config/BuildConfigExtension.kt +++ b/tools/build-config/src/main/kotlin/com/datadog/gradle/plugin/config/BuildConfigExtension.kt @@ -6,7 +6,6 @@ package com.datadog.gradle.plugin.config -import com.datadog.gradle.config.dependencyUpdateConfig import com.datadog.gradle.config.javadocConfig import com.datadog.gradle.config.junitConfig import com.datadog.gradle.config.kotlinConfig @@ -30,10 +29,6 @@ abstract class BuildConfigExtension @Inject constructor( project.javadocConfig() } - fun applyDependencyUpdateConfig() { - project.dependencyUpdateConfig() - } - fun applyPublishingConfig(description: String) { project.publishingConfig(description) }