diff --git a/build.gradle.kts b/build.gradle.kts index ccfb99f187..6f678cbd16 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,11 +14,18 @@ plugins { jacoco id(Config.QualityPlugins.detekt) version Config.QualityPlugins.detektVersion `maven-publish` - id(Config.QualityPlugins.binaryCompatibilityValidator) version Config.QualityPlugins.binaryCompatibilityValidatorVersion + 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.kotlin.android) apply false + alias(libs.plugins.buildconfig) apply false + // dokka is required by gradle-maven-publish-plugin. + alias(libs.plugins.dokka) apply false + alias(libs.plugins.dokka.javadoc) apply false + alias(libs.plugins.compose.compiler) apply false + alias(libs.plugins.errorprone) apply false + alias(libs.plugins.gradle.versions) apply false } buildscript { @@ -27,16 +34,10 @@ buildscript { } dependencies { classpath(Config.BuildPlugins.androidGradle) - // dokka is required by gradle-maven-publish-plugin. - classpath(Config.BuildPlugins.dokkaPlugin) - classpath(Config.QualityPlugins.errorpronePlugin) - classpath(Config.QualityPlugins.gradleVersionsPlugin) // add classpath of sentry android gradle plugin // classpath("io.sentry:sentry-android-gradle-plugin:{version}") - classpath(Config.QualityPlugins.binaryCompatibilityValidatorPlugin) - classpath(Config.BuildPlugins.composeGradlePlugin) classpath(Config.BuildPlugins.commonsCompressOverride) } } diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 709f15f798..fa284f4e98 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -9,15 +9,10 @@ object Config { val springBoot3Version = "3.4.2" val kotlinCompatibleLanguageVersion = "1.6" - // see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility - // see https://developer.android.com/jetpack/androidx/releases/compose-kotlin - val composeVersion = "1.6.11" val androidComposeCompilerVersion = "1.5.14" object BuildPlugins { val androidGradle = "com.android.tools.build:gradle:$AGP" - val buildConfig = "com.github.gmazzo.buildconfig" - val buildConfigVersion = "5.6.5" val springBoot = "org.springframework.boot" val springDependencyManagement = "io.spring.dependency-management" val springDependencyManagementVersion = "1.0.11.RELEASE" @@ -25,10 +20,6 @@ object Config { val grettyVersion = "4.0.0" val gradleMavenPublishPlugin = "com.vanniktech.maven.publish" val gradleMavenPublishPluginVersion = "0.30.0" - val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:2.0.0" - val dokkaPluginAlias = "org.jetbrains.dokka" - val dokkaPluginJavadocAlias = "org.jetbrains.dokka-javadoc" - val composeGradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$composeVersion" val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0" } @@ -225,16 +216,10 @@ object Config { } val spotless = "com.diffplug.spotless" val spotlessVersion = "6.11.0" - val errorProne = "net.ltgt.errorprone" - val errorpronePlugin = "net.ltgt.gradle:gradle-errorprone-plugin:3.0.1" - val gradleVersionsPlugin = "com.github.ben-manes:gradle-versions-plugin:0.42.0" - val gradleVersions = "com.github.ben-manes.versions" + val detekt = "io.gitlab.arturbosch.detekt" val detektVersion = "1.23.8" val detektPlugin = "io.gitlab.arturbosch.detekt" - val binaryCompatibilityValidatorVersion = "0.13.0" - val binaryCompatibilityValidatorPlugin = "org.jetbrains.kotlinx:binary-compatibility-validator:$binaryCompatibilityValidatorVersion" - val binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator" val jacocoAndroid = "com.mxalbert.gradle.jacoco-android" val jacocoAndroidVersion = "0.2.0" val kover = "org.jetbrains.kotlinx.kover" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1efd1751a4..1d9250e937 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,19 @@ [versions] kotlin = "1.9.24" +# see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility +# see https://developer.android.com/jetpack/androidx/releases/compose-kotlin +composeVersion = "1.6.11" [plugins] kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" } +buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.6.5" } +dokka = { id = "org.jetbrains.dokka", version = "2.0.0" } +dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version = "2.0.0" } +binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" } +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" } [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 18b22598a3..873cb968f6 100644 --- a/sentry-android-core/build.gradle.kts +++ b/sentry-android-core/build.gradle.kts @@ -6,8 +6,8 @@ plugins { kotlin("android") jacoco id(Config.QualityPlugins.jacocoAndroid) - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) } android { diff --git a/sentry-android-fragment/build.gradle.kts b/sentry-android-fragment/build.gradle.kts index b1d03eab28..4e80f02f60 100644 --- a/sentry-android-fragment/build.gradle.kts +++ b/sentry-android-fragment/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin("android") jacoco id(Config.QualityPlugins.jacocoAndroid) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) id(Config.QualityPlugins.detektPlugin) } 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 9fc3fbed4c..d4948f8af0 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 @@ -4,8 +4,8 @@ import net.ltgt.gradle.errorprone.errorprone plugins { id("com.android.application") kotlin("android") - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) id(Config.QualityPlugins.detektPlugin) } 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 037d3eeaf2..3f4e0bbb06 100644 --- a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts @@ -4,8 +4,8 @@ import net.ltgt.gradle.errorprone.errorprone plugins { id("com.android.application") kotlin("android") - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) id(Config.QualityPlugins.detektPlugin) } diff --git a/sentry-android-navigation/build.gradle.kts b/sentry-android-navigation/build.gradle.kts index fd5d7e0b32..385d2e426b 100644 --- a/sentry-android-navigation/build.gradle.kts +++ b/sentry-android-navigation/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin("android") jacoco id(Config.QualityPlugins.jacocoAndroid) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) id(Config.QualityPlugins.detektPlugin) } diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts index 7b2ad4c3c0..4ca63d695e 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin("android") jacoco id(Config.QualityPlugins.jacocoAndroid) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) } android { diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts index 5ca7345eac..ab4f8740ff 100644 --- a/sentry-android-replay/build.gradle.kts +++ b/sentry-android-replay/build.gradle.kts @@ -7,7 +7,7 @@ plugins { kotlin("android") jacoco id(Config.QualityPlugins.jacocoAndroid) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) // TODO: enable it later // id(Config.QualityPlugins.detektPlugin) } diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts index 190cb1f9a4..a39202d248 100644 --- a/sentry-android-sqlite/build.gradle.kts +++ b/sentry-android-sqlite/build.gradle.kts @@ -6,7 +6,7 @@ plugins { kotlin("android") jacoco id(Config.QualityPlugins.jacocoAndroid) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) id(Config.QualityPlugins.detektPlugin) } diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 8d8bf8e0d0..335e6d0eb5 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/sentry-android-timber/build.gradle.kts @@ -6,7 +6,7 @@ plugins { kotlin("android") jacoco id(Config.QualityPlugins.jacocoAndroid) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) id(Config.QualityPlugins.detektPlugin) } diff --git a/sentry-android/build.gradle.kts b/sentry-android/build.gradle.kts index bcc214ae47..55b932f035 100644 --- a/sentry-android/build.gradle.kts +++ b/sentry-android/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("com.android.library") kotlin("android") - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) } android { diff --git a/sentry-apache-http-client-5/build.gradle.kts b/sentry-apache-http-client-5/build.gradle.kts index a3dcc5716b..97a03b5eff 100644 --- a/sentry-apache-http-client-5/build.gradle.kts +++ b/sentry-apache-http-client-5/build.gradle.kts @@ -6,8 +6,8 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) } tasks.withType().configureEach { diff --git a/sentry-apollo-3/build.gradle.kts b/sentry-apollo-3/build.gradle.kts index 41f6a63133..7449ca71b9 100644 --- a/sentry-apollo-3/build.gradle.kts +++ b/sentry-apollo-3/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-apollo-4/build.gradle.kts b/sentry-apollo-4/build.gradle.kts index 2f50f7876d..a38e4788b3 100644 --- a/sentry-apollo-4/build.gradle.kts +++ b/sentry-apollo-4/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } configure { diff --git a/sentry-apollo/build.gradle.kts b/sentry-apollo/build.gradle.kts index d424866e83..9df30aacc1 100644 --- a/sentry-apollo/build.gradle.kts +++ b/sentry-apollo/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts index 5d67845a0c..0a2a109d76 100644 --- a/sentry-compose/build.gradle.kts +++ b/sentry-compose/build.gradle.kts @@ -7,10 +7,10 @@ plugins { id("com.android.library") id("org.jetbrains.compose") id(Config.QualityPlugins.kover) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) id(Config.QualityPlugins.detektPlugin) - id(Config.BuildPlugins.dokkaPluginAlias) - id(Config.BuildPlugins.dokkaPluginJavadocAlias) + alias(libs.plugins.dokka) + alias(libs.plugins.dokka.javadoc) `maven-publish` // necessary for publishMavenLocal task to publish correct artifacts } diff --git a/sentry-graphql-22/build.gradle.kts b/sentry-graphql-22/build.gradle.kts index d230fc080f..2d9a4a6dfd 100644 --- a/sentry-graphql-22/build.gradle.kts +++ b/sentry-graphql-22/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-graphql-core/build.gradle.kts b/sentry-graphql-core/build.gradle.kts index f0e99dbd60..1d06744d82 100644 --- a/sentry-graphql-core/build.gradle.kts +++ b/sentry-graphql-core/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-graphql/build.gradle.kts b/sentry-graphql/build.gradle.kts index b756334068..7bb51bb640 100644 --- a/sentry-graphql/build.gradle.kts +++ b/sentry-graphql/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-jdbc/build.gradle.kts b/sentry-jdbc/build.gradle.kts index 8b38e7c065..0e9ad77bc8 100644 --- a/sentry-jdbc/build.gradle.kts +++ b/sentry-jdbc/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-jul/build.gradle.kts b/sentry-jul/build.gradle.kts index 8dd4d274d2..ebb0645c4a 100644 --- a/sentry-jul/build.gradle.kts +++ b/sentry-jul/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-kotlin-extensions/build.gradle.kts b/sentry-kotlin-extensions/build.gradle.kts index afea488228..42fcabb562 100644 --- a/sentry-kotlin-extensions/build.gradle.kts +++ b/sentry-kotlin-extensions/build.gradle.kts @@ -5,8 +5,8 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) id(Config.QualityPlugins.detektPlugin) } diff --git a/sentry-log4j2/build.gradle.kts b/sentry-log4j2/build.gradle.kts index 3c51521fbd..78c8fe06b6 100644 --- a/sentry-log4j2/build.gradle.kts +++ b/sentry-log4j2/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-logback/build.gradle.kts b/sentry-logback/build.gradle.kts index 4f4f20eea2..43f462b090 100644 --- a/sentry-logback/build.gradle.kts +++ b/sentry-logback/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-okhttp/build.gradle.kts b/sentry-okhttp/build.gradle.kts index 1ebce823da..4d01b2aa36 100644 --- a/sentry-okhttp/build.gradle.kts +++ b/sentry-okhttp/build.gradle.kts @@ -6,9 +6,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-openfeign/build.gradle.kts b/sentry-openfeign/build.gradle.kts index 6295e61140..28a3c50d13 100644 --- a/sentry-openfeign/build.gradle.kts +++ b/sentry-openfeign/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts index 9f2f1a3c69..8653c2ef71 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts @@ -5,8 +5,8 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) } tasks.withType().configureEach { diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts index 804f035a3c..94156bc28f 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts @@ -1,6 +1,6 @@ plugins { `java-library` - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.buildconfig) } dependencies { diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts index cab3325902..a789015bc9 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts @@ -1,6 +1,6 @@ plugins { `java-library` - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.buildconfig) } dependencies { diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts index f040105110..f7b053c0a6 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts @@ -5,8 +5,8 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) } tasks.withType().configureEach { diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts index 02637c12f9..e0a7bdd50d 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts @@ -5,8 +5,8 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) } tasks.withType().configureEach { diff --git a/sentry-quartz/build.gradle.kts b/sentry-quartz/build.gradle.kts index 0619af043c..ed32402a2f 100644 --- a/sentry-quartz/build.gradle.kts +++ b/sentry-quartz/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-reactor/build.gradle.kts b/sentry-reactor/build.gradle.kts index 43cc0aa097..40e7d158ad 100644 --- a/sentry-reactor/build.gradle.kts +++ b/sentry-reactor/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } configure { diff --git a/sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts index 100490935f..2a7e66da5e 100644 --- a/sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java application - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) } application { diff --git a/sentry-samples/sentry-samples-console/build.gradle.kts b/sentry-samples/sentry-samples-console/build.gradle.kts index 44b85a2bca..886f0513d6 100644 --- a/sentry-samples/sentry-samples-console/build.gradle.kts +++ b/sentry-samples/sentry-samples-console/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java application - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) } application { diff --git a/sentry-samples/sentry-samples-jul/build.gradle.kts b/sentry-samples/sentry-samples-jul/build.gradle.kts index aef8c4b7f8..7abf7b3017 100644 --- a/sentry-samples/sentry-samples-jul/build.gradle.kts +++ b/sentry-samples/sentry-samples-jul/build.gradle.kts @@ -3,7 +3,7 @@ plugins { java application - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) } application { diff --git a/sentry-samples/sentry-samples-log4j2/build.gradle.kts b/sentry-samples/sentry-samples-log4j2/build.gradle.kts index e658c123ba..e149c10164 100644 --- a/sentry-samples/sentry-samples-log4j2/build.gradle.kts +++ b/sentry-samples/sentry-samples-log4j2/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java application - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) } application { diff --git a/sentry-samples/sentry-samples-logback/build.gradle.kts b/sentry-samples/sentry-samples-logback/build.gradle.kts index 48569e875b..55641a52d1 100644 --- a/sentry-samples/sentry-samples-logback/build.gradle.kts +++ b/sentry-samples/sentry-samples-logback/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java application - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) } application { diff --git a/sentry-samples/sentry-samples-openfeign/build.gradle.kts b/sentry-samples/sentry-samples-openfeign/build.gradle.kts index 7075c39a3b..b0f4539a88 100644 --- a/sentry-samples/sentry-samples-openfeign/build.gradle.kts +++ b/sentry-samples/sentry-samples-openfeign/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java application - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.gradle.versions) } application { diff --git a/sentry-servlet-jakarta/build.gradle.kts b/sentry-servlet-jakarta/build.gradle.kts index 83643644c6..16a638e93b 100644 --- a/sentry-servlet-jakarta/build.gradle.kts +++ b/sentry-servlet-jakarta/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts index fbb2d1a745..c546dde6cd 100644 --- a/sentry-servlet/build.gradle.kts +++ b/sentry-servlet/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach { diff --git a/sentry-spring-boot-jakarta/build.gradle.kts b/sentry-spring-boot-jakarta/build.gradle.kts index bac9d998c8..b1634ca38c 100644 --- a/sentry-spring-boot-jakarta/build.gradle.kts +++ b/sentry-spring-boot-jakarta/build.gradle.kts @@ -6,9 +6,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) id(Config.BuildPlugins.springBoot) version Config.springBoot3Version apply false } diff --git a/sentry-spring-boot-starter-jakarta/build.gradle.kts b/sentry-spring-boot-starter-jakarta/build.gradle.kts index 20077cfdff..ad67907f1e 100644 --- a/sentry-spring-boot-starter-jakarta/build.gradle.kts +++ b/sentry-spring-boot-starter-jakarta/build.gradle.kts @@ -6,8 +6,8 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) id(Config.BuildPlugins.springBoot) version Config.springBoot3Version apply false } diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index e20e371ae0..0dd9d26014 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -6,8 +6,8 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false } diff --git a/sentry-spring-boot/build.gradle.kts b/sentry-spring-boot/build.gradle.kts index 9367cb0fe0..56920c5bb8 100644 --- a/sentry-spring-boot/build.gradle.kts +++ b/sentry-spring-boot/build.gradle.kts @@ -6,9 +6,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false } diff --git a/sentry-spring-jakarta/build.gradle.kts b/sentry-spring-jakarta/build.gradle.kts index 7baedfa8fb..770f4de376 100644 --- a/sentry-spring-jakarta/build.gradle.kts +++ b/sentry-spring-jakarta/build.gradle.kts @@ -7,9 +7,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) id(Config.BuildPlugins.springBoot) version Config.springBoot3Version apply false } diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index 504f305da3..b1aea772be 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -7,9 +7,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false } diff --git a/sentry-system-test-support/build.gradle.kts b/sentry-system-test-support/build.gradle.kts index 60391d5a0a..3293c0fa02 100644 --- a/sentry-system-test-support/build.gradle.kts +++ b/sentry-system-test-support/build.gradle.kts @@ -2,8 +2,8 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) id("com.apollographql.apollo3") version "3.8.2" } diff --git a/sentry-test-support/build.gradle.kts b/sentry-test-support/build.gradle.kts index d8c556d6b3..bfe19b59f5 100644 --- a/sentry-test-support/build.gradle.kts +++ b/sentry-test-support/build.gradle.kts @@ -2,8 +2,8 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) } configure { diff --git a/sentry/build.gradle.kts b/sentry/build.gradle.kts index d925c8132e..7548d27cd5 100644 --- a/sentry/build.gradle.kts +++ b/sentry/build.gradle.kts @@ -5,9 +5,9 @@ plugins { `java-library` kotlin("jvm") jacoco - id(Config.QualityPlugins.errorProne) - id(Config.QualityPlugins.gradleVersions) - id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion + alias(libs.plugins.errorprone) + alias(libs.plugins.gradle.versions) + alias(libs.plugins.buildconfig) } tasks.withType().configureEach {