diff --git a/build.gradle.kts b/build.gradle.kts index 6f678cbd164..2d7543beb7f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,14 +10,14 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { `java-library` - id(Config.QualityPlugins.spotless) version Config.QualityPlugins.spotlessVersion apply true + alias(libs.plugins.spotless) jacoco - id(Config.QualityPlugins.detekt) version Config.QualityPlugins.detektVersion + alias(libs.plugins.detekt) `maven-publish` alias(libs.plugins.binary.compatibility.validator) - id(Config.QualityPlugins.jacocoAndroid) version Config.QualityPlugins.jacocoAndroidVersion apply false - id(Config.QualityPlugins.kover) version Config.QualityPlugins.koverVersion apply false - id(Config.BuildPlugins.gradleMavenPublishPlugin) version Config.BuildPlugins.gradleMavenPublishPluginVersion apply false + alias(libs.plugins.jacoco.android) apply false + alias(libs.plugins.kover) apply false + alias(libs.plugins.vanniktech.maven.publish) apply false alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.buildconfig) apply false // dokka is required by gradle-maven-publish-plugin. diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index fa284f4e980..b4eebaf547a 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -18,8 +18,6 @@ object Config { val springDependencyManagementVersion = "1.0.11.RELEASE" val gretty = "org.gretty" val grettyVersion = "4.0.0" - val gradleMavenPublishPlugin = "com.vanniktech.maven.publish" - val gradleMavenPublishPluginVersion = "0.30.0" val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0" } @@ -214,16 +212,9 @@ object Config { // TODO [POTEL] add tests and restore val minimumCoverage = BigDecimal.valueOf(0.1) } - val spotless = "com.diffplug.spotless" - val spotlessVersion = "6.11.0" - val detekt = "io.gitlab.arturbosch.detekt" - val detektVersion = "1.23.8" + // this can be removed when we upgrade to Gradle 8, which allows us to use a getter for the plugin ID val detektPlugin = "io.gitlab.arturbosch.detekt" - val jacocoAndroid = "com.mxalbert.gradle.jacoco-android" - val jacocoAndroidVersion = "0.2.0" - val kover = "org.jetbrains.kotlinx.kover" - val koverVersion = "0.7.3" } object Sentry { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1d9250e9376..6c2d9776bdf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,6 +14,11 @@ binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibil compose-compiler = { id = "org.jetbrains.compose", version.ref = "composeVersion" } errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" } gradle-versions = {id = "com.github.ben-manes.versions", version = "0.42.0" } +spotless = { id = "com.diffplug.spotless", version = "6.11.0" } +detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8"} +jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" } +kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" } +vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" } [libraries] kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts index 873cb968f67..094c7827d98 100644 --- a/sentry-android-core/build.gradle.kts +++ b/sentry-android-core/build.gradle.kts @@ -5,7 +5,7 @@ plugins { id("com.android.library") kotlin("android") jacoco - id(Config.QualityPlugins.jacocoAndroid) + alias(libs.plugins.jacoco.android) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) } diff --git a/sentry-android-fragment/build.gradle.kts b/sentry-android-fragment/build.gradle.kts index 4e80f02f600..104e9757c4b 100644 --- a/sentry-android-fragment/build.gradle.kts +++ b/sentry-android-fragment/build.gradle.kts @@ -4,9 +4,9 @@ plugins { id("com.android.library") kotlin("android") jacoco - id(Config.QualityPlugins.jacocoAndroid) + alias(libs.plugins.jacoco.android) alias(libs.plugins.gradle.versions) - id(Config.QualityPlugins.detektPlugin) + alias(libs.plugins.detekt) } android { diff --git a/sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts index d4948f8af0a..a52f022daa3 100644 --- a/sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts @@ -6,7 +6,7 @@ plugins { kotlin("android") alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) - id(Config.QualityPlugins.detektPlugin) + alias(libs.plugins.detekt) } android { diff --git a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts index 3f4e0bbb063..2e59ecfc38a 100644 --- a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts @@ -6,7 +6,7 @@ plugins { kotlin("android") alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) - id(Config.QualityPlugins.detektPlugin) + alias(libs.plugins.detekt) } android { diff --git a/sentry-android-navigation/build.gradle.kts b/sentry-android-navigation/build.gradle.kts index 385d2e426b6..24c5c2cadd6 100644 --- a/sentry-android-navigation/build.gradle.kts +++ b/sentry-android-navigation/build.gradle.kts @@ -4,9 +4,9 @@ plugins { id("com.android.library") kotlin("android") jacoco - id(Config.QualityPlugins.jacocoAndroid) + alias(libs.plugins.jacoco.android) alias(libs.plugins.gradle.versions) - id(Config.QualityPlugins.detektPlugin) + alias(libs.plugins.detekt) } android { diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts index 4ca63d695e3..7aa16e469bc 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -4,7 +4,7 @@ plugins { id("com.android.library") kotlin("android") jacoco - id(Config.QualityPlugins.jacocoAndroid) + alias(libs.plugins.jacoco.android) alias(libs.plugins.gradle.versions) } diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts index ab4f8740ff0..aec9d6fd2b2 100644 --- a/sentry-android-replay/build.gradle.kts +++ b/sentry-android-replay/build.gradle.kts @@ -6,10 +6,10 @@ plugins { id("com.android.library") kotlin("android") jacoco - id(Config.QualityPlugins.jacocoAndroid) + alias(libs.plugins.jacoco.android) alias(libs.plugins.gradle.versions) // TODO: enable it later -// id(Config.QualityPlugins.detektPlugin) +// alias(libs.plugins.detekt) } android { diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts index a39202d248a..096aa97fa3f 100644 --- a/sentry-android-sqlite/build.gradle.kts +++ b/sentry-android-sqlite/build.gradle.kts @@ -5,9 +5,9 @@ plugins { id("com.android.library") kotlin("android") jacoco - id(Config.QualityPlugins.jacocoAndroid) + alias(libs.plugins.jacoco.android) alias(libs.plugins.gradle.versions) - id(Config.QualityPlugins.detektPlugin) + alias(libs.plugins.detekt) } android { diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 335e6d0eb5d..376fd8d49b1 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/sentry-android-timber/build.gradle.kts @@ -5,9 +5,9 @@ plugins { id("com.android.library") kotlin("android") jacoco - id(Config.QualityPlugins.jacocoAndroid) + alias(libs.plugins.jacoco.android) alias(libs.plugins.gradle.versions) - id(Config.QualityPlugins.detektPlugin) + alias(libs.plugins.detekt) } android { diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts index 0a2a109d762..c1609496d4a 100644 --- a/sentry-compose/build.gradle.kts +++ b/sentry-compose/build.gradle.kts @@ -6,9 +6,9 @@ plugins { kotlin("multiplatform") id("com.android.library") id("org.jetbrains.compose") - id(Config.QualityPlugins.kover) + alias(libs.plugins.kover) alias(libs.plugins.gradle.versions) - id(Config.QualityPlugins.detektPlugin) + alias(libs.plugins.detekt) alias(libs.plugins.dokka) alias(libs.plugins.dokka.javadoc) `maven-publish` // necessary for publishMavenLocal task to publish correct artifacts diff --git a/sentry-kotlin-extensions/build.gradle.kts b/sentry-kotlin-extensions/build.gradle.kts index 42fcabb5620..e185218b851 100644 --- a/sentry-kotlin-extensions/build.gradle.kts +++ b/sentry-kotlin-extensions/build.gradle.kts @@ -7,7 +7,7 @@ plugins { jacoco alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) - id(Config.QualityPlugins.detektPlugin) + alias(libs.plugins.detekt) } tasks.withType().configureEach {