diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index d02ab584885..2b6cf517c04 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -5,6 +5,8 @@ plugins { dependencies { implementation(libs.animalsniffer.gradle.plugin) implementation(libs.spotlessLib) + implementation(libs.detektLib) + implementation(libs.vanniktechMavenPublishLib) compileOnly(libs.kotlin.gradle.plugin) compileOnly(libs.android.gradle.plugin) } @@ -15,6 +17,18 @@ gradlePlugin { id = "io.sentry.jdk-target" implementationClass = "io.sentry.gradle.JdkTargetConvention" } + register("sentryDetekt") { + id = "io.sentry.detekt" + implementationClass = "io.sentry.gradle.SentryDetektPlugin" + } + register("sentryPublish") { + id = "io.sentry.publish" + implementationClass = "io.sentry.gradle.SentryPublishPlugin" + } + register("sentryMultiplatformPublish") { + id = "io.sentry.publish.multiplatform" + implementationClass = "io.sentry.gradle.SentryMultiplatformPublishPlugin" + } register("sentryAnimalSniffer") { id = "io.sentry.animalsniffer" implementationClass = "io.sentry.gradle.SentryAnimalSnifferPlugin" diff --git a/build-logic/src/main/kotlin/io/sentry/gradle/AarTypes.kt b/build-logic/src/main/kotlin/io/sentry/gradle/AarTypes.kt new file mode 100644 index 00000000000..0dda1a6bcb4 --- /dev/null +++ b/build-logic/src/main/kotlin/io/sentry/gradle/AarTypes.kt @@ -0,0 +1,69 @@ +/* + * Adapted from https://github.com/androidx/androidx/blob/c799cba927a71f01ea6b421a8f83c181682633fb/buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt#L524-L549 + * + * Copyright 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.sentry.gradle + +import com.vanniktech.maven.publish.MavenPublishBaseExtension +import groovy.util.Node + +private val androidLibs = + setOf( + "sentry-android-core", + "sentry-android-ndk", + "sentry-android-fragment", + "sentry-android-navigation", + "sentry-android-navigation3", + "sentry-android-timber", + "sentry-compose-android", + "sentry-android-sqlite", + "sentry-android-replay", + ) + +private val androidXLibs = listOf("androidx.core:core") + +// Workaround for https://github.com/gradle/gradle/issues/3170 +fun MavenPublishBaseExtension.assignAarTypes() { + pom { + withXml { + val dependencies = + asNode().children().find { it is Node && it.name().toString().endsWith("dependencies") } + as Node? + + dependencies?.children()?.forEach { dep -> + if (dep !is Node) { + return@forEach + } + val group = + dep.children().firstOrNull { it is Node && it.name().toString().endsWith("groupId") } + as? Node + val groupValue = group?.children()?.firstOrNull() as? String + + val artifactId = + dep.children().firstOrNull { it is Node && it.name().toString().endsWith("artifactId") } + as? Node + val artifactIdValue = artifactId?.children()?.firstOrNull() as? String + + if (artifactIdValue in androidLibs) { + dep.appendNode("type", "aar") + } else if ("$groupValue:$artifactIdValue" in androidXLibs) { + dep.appendNode("type", "aar") + } + } + } + } +} diff --git a/buildSrc/src/main/java/Publication.kt b/build-logic/src/main/kotlin/io/sentry/gradle/Publication.kt similarity index 99% rename from buildSrc/src/main/java/Publication.kt rename to build-logic/src/main/kotlin/io/sentry/gradle/Publication.kt index d545e6e32dc..1529913745b 100644 --- a/buildSrc/src/main/java/Publication.kt +++ b/build-logic/src/main/kotlin/io/sentry/gradle/Publication.kt @@ -1,3 +1,5 @@ +package io.sentry.gradle + import org.gradle.api.Project import org.gradle.api.distribution.DistributionContainer import org.gradle.api.file.CopySpec diff --git a/build-logic/src/main/kotlin/io/sentry/gradle/SentryDetektPlugin.kt b/build-logic/src/main/kotlin/io/sentry/gradle/SentryDetektPlugin.kt new file mode 100644 index 00000000000..1775f672a5a --- /dev/null +++ b/build-logic/src/main/kotlin/io/sentry/gradle/SentryDetektPlugin.kt @@ -0,0 +1,20 @@ +package io.sentry.gradle + +import io.gitlab.arturbosch.detekt.extensions.DetektExtension +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.kotlin.dsl.configure + +/** Runs detekt on a module against the shared ruleset, with a per-module baseline. */ +class SentryDetektPlugin : Plugin { + override fun apply(project: Project) { + project.pluginManager.apply("io.gitlab.arturbosch.detekt") + + project.extensions.configure { + buildUponDefaultConfig = true + allRules = true + config.setFrom(project.isolated.rootProject.projectDirectory.file("detekt.yml")) + baseline = project.file("detekt-baseline.xml") + } + } +} diff --git a/build-logic/src/main/kotlin/io/sentry/gradle/SentryPublishPlugin.kt b/build-logic/src/main/kotlin/io/sentry/gradle/SentryPublishPlugin.kt new file mode 100644 index 00000000000..30f354054ee --- /dev/null +++ b/build-logic/src/main/kotlin/io/sentry/gradle/SentryPublishPlugin.kt @@ -0,0 +1,88 @@ +package io.sentry.gradle + +import com.vanniktech.maven.publish.JavaLibrary +import com.vanniktech.maven.publish.JavadocJar +import com.vanniktech.maven.publish.MavenPublishBaseExtension +import java.io.File +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.distribution.DistributionContainer +import org.gradle.api.distribution.plugins.DistributionPlugin +import org.gradle.api.plugins.JavaPluginExtension +import org.gradle.api.publish.PublishingExtension +import org.gradle.kotlin.dsl.configure + +/** Publishes a JVM or Android module and packages it as the zip distribution craft consumes. */ +class SentryPublishPlugin : Plugin { + override fun apply(project: Project) { + project.configurePublishing(DistributionContainer::configureForJvm) + } +} + +/** + * Publishes a Kotlin Multiplatform module. Separate from [SentryPublishPlugin] because the + * per-target distributions it lays out have no counterpart in a single-target module. + */ +class SentryMultiplatformPublishPlugin : Plugin { + override fun apply(project: Project) { + project.configurePublishing(DistributionContainer::configureForMultiplatform) + } +} + +private fun Project.configurePublishing( + configureDistributions: DistributionContainer.(Project) -> Unit +) { + pluginManager.apply(DistributionPlugin::class.java) + pluginManager.apply("com.vanniktech.maven.publish") + + extensions.configure { + configureDistributions(project) + // craft only uses zip archives + forEach { dist -> + if (dist.name == DistributionPlugin.MAIN_DISTRIBUTION_NAME) { + tasks.named("distTar").configure { enabled = false } + } else { + tasks.named(dist.name + "DistTar").configure { enabled = false } + } + } + } + + val sep = File.separator + val distributionFile = + layout.buildDirectory.file("distributions$sep$name-$version.zip").get().asFile + + tasks.named("distZip").configure { + dependsOn("publishToMavenLocal") + val file = distributionFile + doLast { + if (!file.exists()) { + throw IllegalStateException("Distribution file: ${file.absolutePath} does not exist") + } + if (file.length() == 0L) { + throw IllegalStateException("Distribution file: ${file.absolutePath} is empty") + } + } + } + + extensions.configure { assignAarTypes() } + + plugins.withId("java-library") { + extensions.configure { + // we have to disable javadoc publication in maven-publish plugin as it's not + // including it in the .module file + // https://github.com/vanniktech/gradle-maven-publish-plugin/issues/861 + // and do it ourselves + configure(JavaLibrary(JavadocJar.None(), sourcesJar = true)) + } + + extensions.configure { withJavadocJar() } + } + + // this is needed for sentry-unity to consume our artifacts locally as proper maven publication + extensions.configure { + repositories.maven { + name = "unityMaven" + url = isolated.rootProject.projectDirectory.dir("build${sep}unityMaven").asFile.toURI() + } + } +} diff --git a/build.gradle.kts b/build.gradle.kts index 898b429cb5d..9490c0d54b1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,3 @@ -import com.vanniktech.maven.publish.JavaLibrary -import com.vanniktech.maven.publish.JavadocJar -import com.vanniktech.maven.publish.MavenPublishBaseExtension -import groovy.util.Node -import io.gitlab.arturbosch.detekt.extensions.DetektExtension import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent @@ -12,13 +7,12 @@ plugins { alias(libs.plugins.detekt) `maven-publish` alias(libs.plugins.binary.compatibility.validator) - alias(libs.plugins.vanniktech.maven.publish) apply false alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.multiplatform) apply false alias(libs.plugins.kotlin.jvm) apply false alias(libs.plugins.kotlin.spring) apply false alias(libs.plugins.buildconfig) apply false - // dokka is required by gradle-maven-publish-plugin. + // dokka is applied directly by sentry-compose; pinned here so it is on the classpath. alias(libs.plugins.dokka) apply false alias(libs.plugins.dokka.javadoc) apply false alias(libs.plugins.kotlin.compose) apply false @@ -113,90 +107,6 @@ allprojects { } } -subprojects { - apply { plugin("io.sentry.spotless") } - apply { plugin("io.sentry.jdk-target") } - - plugins.withId(Config.QualityPlugins.detektPlugin) { - configure { - buildUponDefaultConfig = true - allRules = true - config.setFrom("${rootProject.rootDir}/detekt.yml") - baseline = file("detekt-baseline.xml") - } - } - - if (!this.name.contains("sample") && !this.name.contains("integration-tests") && this.name != "sentry-system-test-support" && this.name != "sentry-test-support") { - apply() - apply() - - val sep = File.separator - - configure { - if (this@subprojects.name.contains("-compose")) { - this.configureForMultiplatform(this@subprojects) - } else { - this.configureForJvm(this@subprojects) - } - // craft only uses zip archives - this.forEach { dist -> - if (dist.name == DistributionPlugin.MAIN_DISTRIBUTION_NAME) { - tasks.named("distTar").configure { enabled = false } - } else { - tasks.named(dist.name + "DistTar").configure { enabled = false } - } - } - } - - tasks.named("distZip").configure { - this.dependsOn("publishToMavenLocal") - val file = this.project.layout.buildDirectory.file("distributions${sep}${this.project.name}-${this.project.version}.zip").get().asFile - this.doLast { - if (!file.exists()) throw IllegalStateException("Distribution file: ${file.absolutePath} does not exist") - if (file.length() == 0L) throw IllegalStateException("Distribution file: ${file.absolutePath} is empty") - } - } - - plugins.withId("java-library") { - configure { - // we have to disable javadoc publication in maven-publish plugin as it's not - // including it in the .module file https://github.com/vanniktech/gradle-maven-publish-plugin/issues/861 - // and do it ourselves - configure(JavaLibrary(JavadocJar.None(), sourcesJar = true)) - } - - configure { - withJavadocJar() - } - } - - apply() - - afterEvaluate { - configure { - assignAarTypes() - } - - // this is needed for sentry-unity to consume our artifacts locally as proper maven publication - configure { - repositories { - maven { - name = "unityMaven" - url = rootProject.layout.buildDirectory.file("unityMaven").get().asFile.toURI() - } - } - } - - // maven central info go to: - // ~/.gradle/gradle.properties - - // maven central info: - // mavenCentralUsername=user name - // mavenCentralPassword=password - } - } -} - tasks.register("buildForCodeQL") { subprojects .filter { @@ -217,53 +127,3 @@ tasks.register("buildForCodeQL") { } } } - -/* - * Adapted from https://github.com/androidx/androidx/blob/c799cba927a71f01ea6b421a8f83c181682633fb/buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt#L524-L549 - * - * Copyright 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// Workaround for https://github.com/gradle/gradle/issues/3170 -fun MavenPublishBaseExtension.assignAarTypes() { - pom { - withXml { - val dependencies = asNode().children().find { - it is Node && it.name().toString().endsWith("dependencies") - } as Node? - - dependencies?.children()?.forEach { dep -> - if (dep !is Node) { - return@forEach - } - val group = dep.children().firstOrNull { - it is Node && it.name().toString().endsWith("groupId") - } as? Node - val groupValue = group?.children()?.firstOrNull() as? String - - val artifactId = dep.children().firstOrNull { - it is Node && it.name().toString().endsWith("artifactId") - } as? Node - val artifactIdValue = artifactId?.children()?.firstOrNull() as? String - - if (artifactIdValue in Config.BuildScript.androidLibs) { - dep.appendNode("type", "aar") - } else if ("$groupValue:$artifactIdValue" in Config.BuildScript.androidXLibs) { - dep.appendNode("type", "aar") - } - } - } - } -} diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 05786658ef3..140805224a4 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -36,11 +36,6 @@ object Config { val springBootConfiguration = "org.springframework.boot:spring-boot-configuration-processor" } - object QualityPlugins { - // 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" - } - object Sentry { val SENTRY_JAVA_SDK_NAME = "sentry.java" val SENTRY_ANDROID_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.android" @@ -92,22 +87,4 @@ object Config { val description = "SDK for sentry.io" val versionNameProp = "versionName" } - - object BuildScript { - val androidLibs = setOf( - "sentry-android-core", - "sentry-android-ndk", - "sentry-android-fragment", - "sentry-android-navigation", - "sentry-android-navigation3", - "sentry-android-timber", - "sentry-compose-android", - "sentry-android-sqlite", - "sentry-android-replay" - ) - - val androidXLibs = listOf( - "androidx.core:core" - ) - } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index daedf7629f4..bc7d0424d7a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,6 +10,8 @@ asyncProfiler = "4.4" camerax = "1.4.0" composeCompiler = "1.5.14" coroutines = "1.6.1" +detekt = "1.23.8" +dokka = "2.0.0" espresso = "3.7.0" feign = "11.6" gummyBears = "0.12.0" @@ -51,6 +53,7 @@ springboot4 = "4.1.0" springKafka2 = "2.8.11" springKafka3 = "3.3.5" sqldelight = "2.3.2" +vanniktechMavenPublish = "0.30.0" # Android targetSdk = "37" @@ -66,14 +69,14 @@ kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "ko kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } 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" } +dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } +dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version.ref = "dokka" } binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" } errorprone = { id = "net.ltgt.errorprone", version = "5.1.1" } gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } -detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" } -vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } +vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktechMavenPublish" } springboot3 = { id = "org.springframework.boot", version.ref = "springboot3" } springboot4 = { id = "org.springframework.boot", version.ref = "springboot4" } spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.7" } @@ -195,6 +198,8 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" } slf4j2-api = { module = "org.slf4j:slf4j-api", version = "2.0.5" } spotlessLib = { module = "com.diffplug.spotless:com.diffplug.spotless.gradle.plugin", version.ref = "spotless"} +detektLib = { module = "io.gitlab.arturbosch.detekt:io.gitlab.arturbosch.detekt.gradle.plugin", version.ref = "detekt" } +vanniktechMavenPublishLib = { module = "com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin", version.ref = "vanniktechMavenPublish" } springboot2-bom = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "springboot2" } springboot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot2" } spring-graphql = { module = "org.springframework.graphql:spring-graphql", version = "1.0.6" } diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts index 4facf6f4c23..c9a8c79d079 100644 --- a/sentry-android-core/build.gradle.kts +++ b/sentry-android-core/build.gradle.kts @@ -8,6 +8,9 @@ plugins { alias(libs.plugins.kotlin.compose) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } android { diff --git a/sentry-android-distribution/build.gradle.kts b/sentry-android-distribution/build.gradle.kts index 074d56c08e6..0ccfce441da 100644 --- a/sentry-android-distribution/build.gradle.kts +++ b/sentry-android-distribution/build.gradle.kts @@ -4,7 +4,10 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { id("com.android.library") alias(libs.plugins.kotlin.android) - alias(libs.plugins.detekt) + id("io.sentry.detekt") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } android { diff --git a/sentry-android-fragment/build.gradle.kts b/sentry-android-fragment/build.gradle.kts index 3c7a0404970..50519aaf3f3 100644 --- a/sentry-android-fragment/build.gradle.kts +++ b/sentry-android-fragment/build.gradle.kts @@ -6,7 +6,10 @@ plugins { id("com.android.library") alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) - alias(libs.plugins.detekt) + id("io.sentry.detekt") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } android { diff --git a/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts index e606ab52553..dedce1bfa53 100644 --- a/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts @@ -4,6 +4,8 @@ plugins { id("com.android.application") alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } android { diff --git a/sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/build.gradle.kts index cab7c28f934..12da53b7721 100644 --- a/sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/build.gradle.kts @@ -1,6 +1,8 @@ plugins { id("com.android.test") alias(libs.plugins.kotlin.android) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } 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 8f479470cac..d67f29648a4 100644 --- a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts @@ -7,7 +7,9 @@ plugins { alias(libs.plugins.kotlin.compose) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) - alias(libs.plugins.detekt) + id("io.sentry.detekt") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } android { diff --git a/sentry-android-integration-tests/test-app-size/build.gradle.kts b/sentry-android-integration-tests/test-app-size/build.gradle.kts index 7bebbc6cfd0..499e468cb09 100644 --- a/sentry-android-integration-tests/test-app-size/build.gradle.kts +++ b/sentry-android-integration-tests/test-app-size/build.gradle.kts @@ -1,6 +1,8 @@ plugins { id("com.android.application") id("io.sentry.android.gradle") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } android { diff --git a/sentry-android-navigation/build.gradle.kts b/sentry-android-navigation/build.gradle.kts index ddc6d6f4161..a58b5a662d4 100644 --- a/sentry-android-navigation/build.gradle.kts +++ b/sentry-android-navigation/build.gradle.kts @@ -6,7 +6,10 @@ plugins { id("com.android.library") alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) - alias(libs.plugins.detekt) + id("io.sentry.detekt") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } android { diff --git a/sentry-android-navigation3/build.gradle.kts b/sentry-android-navigation3/build.gradle.kts index 9612fded9d6..6150ef573cf 100644 --- a/sentry-android-navigation3/build.gradle.kts +++ b/sentry-android-navigation3/build.gradle.kts @@ -7,7 +7,10 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.gradle.versions) - alias(libs.plugins.detekt) + id("io.sentry.detekt") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } android { diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts index dff85906ca1..0d421a15b66 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -4,6 +4,9 @@ plugins { id("com.android.library") alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } android { diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts index 1a92f9a0b36..0a85ef99cc7 100644 --- a/sentry-android-replay/build.gradle.kts +++ b/sentry-android-replay/build.gradle.kts @@ -8,7 +8,10 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.gradle.versions) - alias(libs.plugins.detekt) + id("io.sentry.detekt") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } android { diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts index 38ea832082f..d6a60b017a3 100644 --- a/sentry-android-sqlite/build.gradle.kts +++ b/sentry-android-sqlite/build.gradle.kts @@ -6,7 +6,10 @@ plugins { id("com.android.library") alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) - alias(libs.plugins.detekt) + id("io.sentry.detekt") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } android { diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 92f14b37c8c..724391a3390 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/sentry-android-timber/build.gradle.kts @@ -6,7 +6,10 @@ plugins { id("com.android.library") alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) - alias(libs.plugins.detekt) + id("io.sentry.detekt") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } android { diff --git a/sentry-android/build.gradle.kts b/sentry-android/build.gradle.kts index 4c493e9e2d2..8a281972d9c 100644 --- a/sentry-android/build.gradle.kts +++ b/sentry-android/build.gradle.kts @@ -2,6 +2,9 @@ plugins { id("com.android.library") alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } android { diff --git a/sentry-apache-http-client-5/build.gradle.kts b/sentry-apache-http-client-5/build.gradle.kts index 06c5f839f95..e537a1f4866 100644 --- a/sentry-apache-http-client-5/build.gradle.kts +++ b/sentry-apache-http-client-5/build.gradle.kts @@ -10,6 +10,9 @@ plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } kotlin { diff --git a/sentry-apollo-3/build.gradle.kts b/sentry-apollo-3/build.gradle.kts index ae8721b22b2..9fe43df6bc6 100644 --- a/sentry-apollo-3/build.gradle.kts +++ b/sentry-apollo-3/build.gradle.kts @@ -5,11 +5,14 @@ plugins { `java-library` id("io.sentry.javadoc") alias(libs.plugins.kotlin.jvm) - alias(libs.plugins.detekt) + id("io.sentry.detekt") alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer.android") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-apollo-4/build.gradle.kts b/sentry-apollo-4/build.gradle.kts index 63c8b5431c6..38d67d95076 100644 --- a/sentry-apollo-4/build.gradle.kts +++ b/sentry-apollo-4/build.gradle.kts @@ -5,11 +5,14 @@ plugins { `java-library` id("io.sentry.javadoc") alias(libs.plugins.kotlin.jvm) - alias(libs.plugins.detekt) + id("io.sentry.detekt") alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer.android") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-apollo-5/build.gradle.kts b/sentry-apollo-5/build.gradle.kts index 2d78dff8fa1..ea4c2d1cb75 100644 --- a/sentry-apollo-5/build.gradle.kts +++ b/sentry-apollo-5/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer.android") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-apollo/build.gradle.kts b/sentry-apollo/build.gradle.kts index 72a183bb7b3..6c4511a8ad9 100644 --- a/sentry-apollo/build.gradle.kts +++ b/sentry-apollo/build.gradle.kts @@ -5,11 +5,14 @@ plugins { `java-library` id("io.sentry.javadoc") alias(libs.plugins.kotlin.jvm) - alias(libs.plugins.detekt) + id("io.sentry.detekt") alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer.android") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-async-profiler/build.gradle.kts b/sentry-async-profiler/build.gradle.kts index 3bcdefd1d82..d02a718e541 100644 --- a/sentry-async-profiler/build.gradle.kts +++ b/sentry-async-profiler/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-bom/build.gradle.kts b/sentry-bom/build.gradle.kts index f219c964e52..ca9cd6e9222 100644 --- a/sentry-bom/build.gradle.kts +++ b/sentry-bom/build.gradle.kts @@ -1,6 +1,9 @@ plugins { `java-platform` // used to build Maven BOM `maven-publish` + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } dependencies { @@ -15,7 +18,9 @@ dependencies { } .forEach { project -> evaluationDependsOn(project.path) - project.publishing.publications + // container projects such as sentry-opentelemetry have no build file and publish nothing + val publishing = project.extensions.findByType() ?: return@forEach + publishing.publications .mapNotNull { it as? MavenPublication } .filter { !it.artifactId.endsWith("-kotlinMultiplatform") && !it.artifactId.endsWith("-metadata") diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts index 19fce9f95b5..ee3b5a7be26 100644 --- a/sentry-compose/build.gradle.kts +++ b/sentry-compose/build.gradle.kts @@ -8,10 +8,13 @@ plugins { alias(libs.plugins.kotlin.compose) id("com.android.library") alias(libs.plugins.gradle.versions) - alias(libs.plugins.detekt) + id("io.sentry.detekt") alias(libs.plugins.dokka) alias(libs.plugins.dokka.javadoc) `maven-publish` // necessary for publishMavenLocal task to publish correct artifacts + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish.multiplatform") } kotlin { diff --git a/sentry-graphql-22/build.gradle.kts b/sentry-graphql-22/build.gradle.kts index 9da6bcc1e36..7ef8ab12648 100644 --- a/sentry-graphql-22/build.gradle.kts +++ b/sentry-graphql-22/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-graphql-core/build.gradle.kts b/sentry-graphql-core/build.gradle.kts index df0496f070e..f070d8459c0 100644 --- a/sentry-graphql-core/build.gradle.kts +++ b/sentry-graphql-core/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-graphql/build.gradle.kts b/sentry-graphql/build.gradle.kts index 25613e1fdd6..09a0eff1e94 100644 --- a/sentry-graphql/build.gradle.kts +++ b/sentry-graphql/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-jcache/build.gradle.kts b/sentry-jcache/build.gradle.kts index b773c42c340..993add2083c 100644 --- a/sentry-jcache/build.gradle.kts +++ b/sentry-jcache/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-jdbc/build.gradle.kts b/sentry-jdbc/build.gradle.kts index 9d0aa1596fe..662dacbab83 100644 --- a/sentry-jdbc/build.gradle.kts +++ b/sentry-jdbc/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-jul/build.gradle.kts b/sentry-jul/build.gradle.kts index 130b46ad5ed..d3da209e6e7 100644 --- a/sentry-jul/build.gradle.kts +++ b/sentry-jul/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-kafka/build.gradle.kts b/sentry-kafka/build.gradle.kts index 37240c8305e..942e3a7a0e5 100644 --- a/sentry-kafka/build.gradle.kts +++ b/sentry-kafka/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-kotlin-extensions/build.gradle.kts b/sentry-kotlin-extensions/build.gradle.kts index ded17d445e7..c3ed4a99e43 100644 --- a/sentry-kotlin-extensions/build.gradle.kts +++ b/sentry-kotlin-extensions/build.gradle.kts @@ -7,8 +7,11 @@ plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) - alias(libs.plugins.detekt) + id("io.sentry.detekt") id("io.sentry.animalsniffer.android") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-ktor-client/build.gradle.kts b/sentry-ktor-client/build.gradle.kts index 28edd1689e0..de993955ab0 100644 --- a/sentry-ktor-client/build.gradle.kts +++ b/sentry-ktor-client/build.gradle.kts @@ -4,12 +4,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `java-library` alias(libs.plugins.kotlin.jvm) - alias(libs.plugins.detekt) + id("io.sentry.detekt") id("io.sentry.javadoc") alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer.android") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-launchdarkly-android/build.gradle.kts b/sentry-launchdarkly-android/build.gradle.kts index df081b21213..079125cdd94 100644 --- a/sentry-launchdarkly-android/build.gradle.kts +++ b/sentry-launchdarkly-android/build.gradle.kts @@ -2,6 +2,9 @@ plugins { id("com.android.library") alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } android { diff --git a/sentry-launchdarkly-server/build.gradle.kts b/sentry-launchdarkly-server/build.gradle.kts index f2ed3d15742..985ba1b59ab 100644 --- a/sentry-launchdarkly-server/build.gradle.kts +++ b/sentry-launchdarkly-server/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-log4j2/build.gradle.kts b/sentry-log4j2/build.gradle.kts index 2d2444a2395..bb6ed4256e1 100644 --- a/sentry-log4j2/build.gradle.kts +++ b/sentry-log4j2/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-logback/build.gradle.kts b/sentry-logback/build.gradle.kts index 48f84725a78..efc25239ba9 100644 --- a/sentry-logback/build.gradle.kts +++ b/sentry-logback/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-okhttp/build.gradle.kts b/sentry-okhttp/build.gradle.kts index 0b3e2388415..420869d5de5 100644 --- a/sentry-okhttp/build.gradle.kts +++ b/sentry-okhttp/build.gradle.kts @@ -4,12 +4,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `java-library` alias(libs.plugins.kotlin.jvm) - alias(libs.plugins.detekt) + id("io.sentry.detekt") id("io.sentry.javadoc") alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer.android") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-openfeature/build.gradle.kts b/sentry-openfeature/build.gradle.kts index 6750e22e61c..10101d31fc9 100644 --- a/sentry-openfeature/build.gradle.kts +++ b/sentry-openfeature/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-openfeign/build.gradle.kts b/sentry-openfeign/build.gradle.kts index 209e5c34e54..8e1dea4775d 100644 --- a/sentry-openfeign/build.gradle.kts +++ b/sentry-openfeign/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts index b4b1a8b840d..302c34d0d40 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts @@ -8,6 +8,9 @@ plugins { id("io.sentry.javadoc") alias(libs.plugins.kotlin.jvm) alias(libs.plugins.shadow) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts index 3390f2695c8..855012d46b6 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts @@ -8,6 +8,9 @@ plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts index 5a94dcd4422..ed50bed1e4f 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts @@ -3,6 +3,9 @@ plugins { id("io.sentry.javadoc") alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } dependencies { diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts index 72508d73737..a0db190810b 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts @@ -3,6 +3,9 @@ plugins { id("io.sentry.javadoc") alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } dependencies { diff --git a/sentry-opentelemetry/sentry-opentelemetry-bom/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-bom/build.gradle.kts index d945002b716..2876823b067 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-bom/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-bom/build.gradle.kts @@ -1,6 +1,9 @@ plugins { `java-platform` `maven-publish` + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } javaPlatform.allowDependencies() diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts index 28a1b030e15..c9e3fe166d9 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts @@ -8,6 +8,9 @@ plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts index 1c1e7f984ba..551adde96d4 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts @@ -8,6 +8,9 @@ plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-opentelemetry/sentry-opentelemetry-otlp-spring/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-otlp-spring/build.gradle.kts index 8a5093a6570..fba7b596833 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-otlp-spring/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-otlp-spring/build.gradle.kts @@ -2,6 +2,9 @@ plugins { `java-library` id("io.sentry.animalsniffer") id("io.sentry.javadoc") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } dependencies { diff --git a/sentry-opentelemetry/sentry-opentelemetry-otlp/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-otlp/build.gradle.kts index afab9ef180f..87371bc1e9f 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-otlp/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-otlp/build.gradle.kts @@ -8,6 +8,9 @@ plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-quartz/build.gradle.kts b/sentry-quartz/build.gradle.kts index b5387daf207..3fc2ecd24e9 100644 --- a/sentry-quartz/build.gradle.kts +++ b/sentry-quartz/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-reactor/build.gradle.kts b/sentry-reactor/build.gradle.kts index b98eafd028f..9cd16edcceb 100644 --- a/sentry-reactor/build.gradle.kts +++ b/sentry-reactor/build.gradle.kts @@ -8,6 +8,9 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } // Published code targets Java 17. Test code is not published and follows the toolchain. diff --git a/sentry-samples/sentry-samples-android/build.gradle.kts b/sentry-samples/sentry-samples-android/build.gradle.kts index a9d4ea8ac5f..6cb5b3d6d6d 100644 --- a/sentry-samples/sentry-samples-android/build.gradle.kts +++ b/sentry-samples/sentry-samples-android/build.gradle.kts @@ -13,6 +13,8 @@ plugins { alias(libs.plugins.ksp) alias(libs.plugins.sentry) apply false alias(libs.plugins.sqldelight) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } if (providers.gradleProperty("useSagp").isPresent) { 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 57d1dea0e8d..e1f07e50114 100644 --- a/sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts @@ -7,6 +7,8 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.shadow) id("io.sentry.systemtest") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } application { mainClass.set("io.sentry.samples.console.Main") } diff --git a/sentry-samples/sentry-samples-console-otlp/build.gradle.kts b/sentry-samples/sentry-samples-console-otlp/build.gradle.kts index 58a8578c7d1..8f5bc007add 100644 --- a/sentry-samples/sentry-samples-console-otlp/build.gradle.kts +++ b/sentry-samples/sentry-samples-console-otlp/build.gradle.kts @@ -7,6 +7,8 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.shadow) id("io.sentry.systemtest") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } application { mainClass.set("io.sentry.samples.console.Main") } diff --git a/sentry-samples/sentry-samples-console/build.gradle.kts b/sentry-samples/sentry-samples-console/build.gradle.kts index f0b0d862896..171dc78750c 100644 --- a/sentry-samples/sentry-samples-console/build.gradle.kts +++ b/sentry-samples/sentry-samples-console/build.gradle.kts @@ -7,6 +7,8 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.shadow) id("io.sentry.systemtest") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } application { mainClass.set("io.sentry.samples.console.Main") } diff --git a/sentry-samples/sentry-samples-jul/build.gradle.kts b/sentry-samples/sentry-samples-jul/build.gradle.kts index 6fa4bbb8c8b..945b0497492 100644 --- a/sentry-samples/sentry-samples-jul/build.gradle.kts +++ b/sentry-samples/sentry-samples-jul/build.gradle.kts @@ -7,6 +7,8 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.shadow) id("io.sentry.systemtest") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } application { mainClass.set("io.sentry.samples.jul.Main") } diff --git a/sentry-samples/sentry-samples-ktor-client/build.gradle.kts b/sentry-samples/sentry-samples-ktor-client/build.gradle.kts index 08a08b01c88..c1704330564 100644 --- a/sentry-samples/sentry-samples-ktor-client/build.gradle.kts +++ b/sentry-samples/sentry-samples-ktor-client/build.gradle.kts @@ -2,6 +2,8 @@ plugins { alias(libs.plugins.kotlin.jvm) application alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } application { mainClass.set("io.sentry.samples.ktorClient.Main") } diff --git a/sentry-samples/sentry-samples-log4j2/build.gradle.kts b/sentry-samples/sentry-samples-log4j2/build.gradle.kts index 901604d2cff..dda154d5a48 100644 --- a/sentry-samples/sentry-samples-log4j2/build.gradle.kts +++ b/sentry-samples/sentry-samples-log4j2/build.gradle.kts @@ -7,6 +7,8 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.shadow) id("io.sentry.systemtest") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } application { mainClass.set("io.sentry.samples.log4j2.Main") } diff --git a/sentry-samples/sentry-samples-logback/build.gradle.kts b/sentry-samples/sentry-samples-logback/build.gradle.kts index 12644bf2ded..6deebda29f2 100644 --- a/sentry-samples/sentry-samples-logback/build.gradle.kts +++ b/sentry-samples/sentry-samples-logback/build.gradle.kts @@ -3,6 +3,8 @@ plugins { application alias(libs.plugins.gradle.versions) alias(libs.plugins.shadow) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } application { mainClass.set("io.sentry.samples.logback.Main") } diff --git a/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts b/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts index 90bc1ffc86f..f4cce527834 100644 --- a/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts +++ b/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts @@ -7,6 +7,8 @@ plugins { alias(libs.plugins.shadow) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } application { mainClass.set("io.sentry.samples.netflix.dgs.NetlixDgsApplication") } diff --git a/sentry-samples/sentry-samples-openfeign/build.gradle.kts b/sentry-samples/sentry-samples-openfeign/build.gradle.kts index 8da1dfe785a..e19e7478193 100644 --- a/sentry-samples/sentry-samples-openfeign/build.gradle.kts +++ b/sentry-samples/sentry-samples-openfeign/build.gradle.kts @@ -2,6 +2,8 @@ plugins { java application alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } application { mainClass.set("io.sentry.samples.openfeign.Main") } diff --git a/sentry-samples/sentry-samples-servlet/build.gradle.kts b/sentry-samples/sentry-samples-servlet/build.gradle.kts index 01ecef54154..6f4d1ebabe7 100644 --- a/sentry-samples/sentry-samples-servlet/build.gradle.kts +++ b/sentry-samples/sentry-samples-servlet/build.gradle.kts @@ -1,4 +1,8 @@ -plugins { war } +plugins { + war + id("io.sentry.spotless") + id("io.sentry.jdk-target") +} group = "io.sentry.sample.servlet" diff --git a/sentry-samples/sentry-samples-spring-7/build.gradle.kts b/sentry-samples/sentry-samples-spring-7/build.gradle.kts index 82a18d86c73..7fb1fd9db47 100644 --- a/sentry-samples/sentry-samples-spring-7/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-7/build.gradle.kts @@ -11,6 +11,8 @@ plugins { id("war") alias(libs.plugins.gretty) id("io.sentry.systemtest") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } application { mainClass.set("io.sentry.samples.spring7.Main") } diff --git a/sentry-samples/sentry-samples-spring-boot-4-log4j2/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-log4j2/build.gradle.kts index 86ae3560d22..af5446277a2 100644 --- a/sentry-samples/sentry-samples-spring-boot-4-log4j2/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-4-log4j2/build.gradle.kts @@ -6,6 +6,8 @@ plugins { alias(libs.plugins.spring.dependency.management) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } group = "io.sentry.sample.spring-boot-4-log4j2" diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts index b8f4cf762a4..e6f088e7ff3 100644 --- a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts @@ -6,6 +6,8 @@ plugins { alias(libs.plugins.spring.dependency.management) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } group = "io.sentry.sample.spring-boot-4" diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts index 15bb3fca8a8..034f0817664 100644 --- a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts @@ -8,6 +8,8 @@ plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) id("io.sentry.systemtest") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } group = "io.sentry.sample.spring-boot-4" diff --git a/sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts index c5bc2b96fb3..aa12dad4ceb 100644 --- a/sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts @@ -7,6 +7,8 @@ plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) id("io.sentry.systemtest") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } group = "io.sentry.sample.spring-boot-4-otlp" diff --git a/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts index 6b1f3d91770..39f8b0487a2 100644 --- a/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts @@ -6,6 +6,8 @@ plugins { alias(libs.plugins.spring.dependency.management) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } group = "io.sentry.sample.spring-boot-4-webflux" diff --git a/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts index 7d83c62b2b9..ac2f15e32fa 100644 --- a/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts @@ -6,6 +6,8 @@ plugins { alias(libs.plugins.spring.dependency.management) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } group = "io.sentry.sample.spring-boot-4" diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-log4j2/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-log4j2/build.gradle.kts index 06314c2b28f..dd8e2fcaa83 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-log4j2/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-log4j2/build.gradle.kts @@ -6,6 +6,8 @@ plugins { alias(libs.plugins.spring.dependency.management) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } group = "io.sentry.sample.spring-boot-jakarta-log4j2" diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts index 883c622d6ee..d442c49dae6 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts @@ -6,6 +6,8 @@ plugins { alias(libs.plugins.spring.dependency.management) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } group = "io.sentry.sample.spring-boot-jakarta" diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts index e6d7d9c31ba..847ae9ef888 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts @@ -7,6 +7,8 @@ plugins { alias(libs.plugins.spring.dependency.management) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } group = "io.sentry.sample.spring-boot-jakarta" diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts index e3591289cdb..de238c334c9 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts @@ -6,6 +6,8 @@ plugins { alias(libs.plugins.spring.dependency.management) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } group = "io.sentry.sample.spring-boot-jakarta" diff --git a/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts index a5ccb8d3224..0b5b9a3a27b 100644 --- a/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts @@ -7,6 +7,8 @@ plugins { alias(libs.plugins.shadow) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } // Spring scans this app's own bytecode with its repackaged ASM at startup, and the oldest version diff --git a/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts index 3b7f56523df..71712648d78 100644 --- a/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts @@ -8,6 +8,8 @@ plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) id("io.sentry.systemtest") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } // Spring scans this app's own bytecode with its repackaged ASM at startup, and the oldest version diff --git a/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts index e9d4b2f6905..cbf037a36a1 100644 --- a/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts @@ -6,6 +6,8 @@ plugins { alias(libs.plugins.spring.dependency.management) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } group = "io.sentry.sample.spring-boot-webflux-jakarta" diff --git a/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts index 0294f940e9c..017f80f803a 100644 --- a/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts @@ -7,6 +7,8 @@ plugins { alias(libs.plugins.shadow) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } // Spring scans this app's own bytecode with its repackaged ASM at startup, and the oldest version diff --git a/sentry-samples/sentry-samples-spring-boot/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot/build.gradle.kts index 15b90447529..535becc6b77 100644 --- a/sentry-samples/sentry-samples-spring-boot/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot/build.gradle.kts @@ -7,6 +7,8 @@ plugins { alias(libs.plugins.shadow) alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.spring) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } // Spring scans this app's own bytecode with its repackaged ASM at startup, and the oldest version diff --git a/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts index 022b9fbb0c6..26eef22346a 100644 --- a/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts @@ -8,6 +8,8 @@ plugins { id("war") alias(libs.plugins.gretty) id("io.sentry.systemtest") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } application { mainClass.set("io.sentry.samples.spring.jakarta.Main") } diff --git a/sentry-samples/sentry-samples-spring/build.gradle.kts b/sentry-samples/sentry-samples-spring/build.gradle.kts index 8ae94a2e367..be52f729b1b 100644 --- a/sentry-samples/sentry-samples-spring/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring/build.gradle.kts @@ -8,6 +8,8 @@ plugins { id("war") alias(libs.plugins.gretty) id("io.sentry.systemtest") + id("io.sentry.spotless") + id("io.sentry.jdk-target") } // Spring scans this app's own bytecode with its repackaged ASM at startup, and the oldest version diff --git a/sentry-servlet-jakarta/build.gradle.kts b/sentry-servlet-jakarta/build.gradle.kts index b9d6ffc2ec4..48185d85939 100644 --- a/sentry-servlet-jakarta/build.gradle.kts +++ b/sentry-servlet-jakarta/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts index 08ac7d45284..0d1d9760090 100644 --- a/sentry-servlet/build.gradle.kts +++ b/sentry-servlet/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-spotlight/build.gradle.kts b/sentry-spotlight/build.gradle.kts index 072cb360e61..2023b08d6f5 100644 --- a/sentry-spotlight/build.gradle.kts +++ b/sentry-spotlight/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) id("io.sentry.animalsniffer.android") alias(libs.plugins.buildconfig) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-spring-7/build.gradle.kts b/sentry-spring-7/build.gradle.kts index c848c9416a0..27341bbdf86 100644 --- a/sentry-spring-7/build.gradle.kts +++ b/sentry-spring-7/build.gradle.kts @@ -10,6 +10,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) alias(libs.plugins.springboot4) apply false + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } // Published code targets Java 17. Test code is not published and follows the toolchain. diff --git a/sentry-spring-boot-4-starter/build.gradle.kts b/sentry-spring-boot-4-starter/build.gradle.kts index 7ad300d4790..eb887a0fa0b 100644 --- a/sentry-spring-boot-4-starter/build.gradle.kts +++ b/sentry-spring-boot-4-starter/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.springboot4) apply false + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } // Published code targets Java 17. Test code is not published and follows the toolchain. diff --git a/sentry-spring-boot-4/build.gradle.kts b/sentry-spring-boot-4/build.gradle.kts index 657651d36ec..fe2c1492b28 100644 --- a/sentry-spring-boot-4/build.gradle.kts +++ b/sentry-spring-boot-4/build.gradle.kts @@ -11,6 +11,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) alias(libs.plugins.springboot4) apply false + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } // Published code targets Java 17. Test code is not published and follows the toolchain. diff --git a/sentry-spring-boot-jakarta/build.gradle.kts b/sentry-spring-boot-jakarta/build.gradle.kts index 9451cf95117..2545071d097 100644 --- a/sentry-spring-boot-jakarta/build.gradle.kts +++ b/sentry-spring-boot-jakarta/build.gradle.kts @@ -11,6 +11,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) alias(libs.plugins.springboot3) apply false + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } // Published code targets Java 17. Test code is not published and follows the toolchain. diff --git a/sentry-spring-boot-starter-jakarta/build.gradle.kts b/sentry-spring-boot-starter-jakarta/build.gradle.kts index 63594df7a2e..71749d10741 100644 --- a/sentry-spring-boot-starter-jakarta/build.gradle.kts +++ b/sentry-spring-boot-starter-jakarta/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.springboot3) apply false + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } // Published code targets Java 17. Test code is not published and follows the toolchain. diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index 641b335becb..a408f89e450 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -8,6 +8,9 @@ plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-spring-boot/build.gradle.kts b/sentry-spring-boot/build.gradle.kts index 168aa1da8b7..f9bebf15012 100644 --- a/sentry-spring-boot/build.gradle.kts +++ b/sentry-spring-boot/build.gradle.kts @@ -10,6 +10,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-spring-jakarta/build.gradle.kts b/sentry-spring-jakarta/build.gradle.kts index 138ad1e5f16..0f063296aff 100644 --- a/sentry-spring-jakarta/build.gradle.kts +++ b/sentry-spring-jakarta/build.gradle.kts @@ -10,6 +10,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) alias(libs.plugins.springboot3) apply false + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } // Published code targets Java 17. Test code is not published and follows the toolchain. diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index 71eb6d1f15e..483f661af64 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -10,6 +10,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") { diff --git a/sentry-system-test-support/build.gradle.kts b/sentry-system-test-support/build.gradle.kts index ecfdc6011f8..88b504e3ff1 100644 --- a/sentry-system-test-support/build.gradle.kts +++ b/sentry-system-test-support/build.gradle.kts @@ -5,6 +5,8 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) id("com.apollographql.apollo") version "4.1.1" + id("io.sentry.spotless") + id("io.sentry.jdk-target") } tasks.withType().configureEach { diff --git a/sentry-test-support/build.gradle.kts b/sentry-test-support/build.gradle.kts index 2539beccb5f..b332f035958 100644 --- a/sentry-test-support/build.gradle.kts +++ b/sentry-test-support/build.gradle.kts @@ -4,6 +4,8 @@ plugins { alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) + id("io.sentry.spotless") + id("io.sentry.jdk-target") } tasks.withType().configureEach { diff --git a/sentry/build.gradle.kts b/sentry/build.gradle.kts index 9cbcf5bf2c0..f7453645349 100644 --- a/sentry/build.gradle.kts +++ b/sentry/build.gradle.kts @@ -9,6 +9,9 @@ plugins { alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) id("io.sentry.animalsniffer.android") + id("io.sentry.spotless") + id("io.sentry.jdk-target") + id("io.sentry.publish") } tasks.named("compileKotlin") {