From d6a1e992e239462f2df2a485dffef6e27813162f Mon Sep 17 00:00:00 2001 From: Roman Zavarnitsyn Date: Tue, 4 Feb 2025 22:11:09 +0100 Subject: [PATCH] Centralize java-library config and mention javadoc/soruces to module files --- build.gradle.kts | 18 ++++++++++++++++++ .../replay/viewhierarchy/ViewHierarchyNode.kt | 1 - sentry-apache-http-client-5/build.gradle.kts | 5 ----- sentry-apollo-3/build.gradle.kts | 5 ----- sentry-apollo/build.gradle.kts | 5 ----- sentry-graphql-22/build.gradle.kts | 5 ----- sentry-graphql-core/build.gradle.kts | 5 ----- sentry-graphql/build.gradle.kts | 5 ----- sentry-jdbc/build.gradle.kts | 5 ----- sentry-jul/build.gradle.kts | 5 ----- sentry-kotlin-extensions/build.gradle.kts | 5 ----- sentry-log4j2/build.gradle.kts | 5 ----- sentry-logback/build.gradle.kts | 5 ----- sentry-okhttp/build.gradle.kts | 5 ----- sentry-openfeign/build.gradle.kts | 5 ----- .../build.gradle.kts | 5 ----- .../build.gradle.kts | 5 ----- .../build.gradle.kts | 5 ----- .../build.gradle.kts | 5 ----- .../build.gradle.kts | 5 ----- .../sentry-opentelemetry-core/build.gradle.kts | 5 ----- sentry-quartz/build.gradle.kts | 5 ----- sentry-servlet-jakarta/build.gradle.kts | 5 ----- sentry-servlet/build.gradle.kts | 5 ----- sentry-spring-boot-starter/build.gradle.kts | 5 ----- sentry-spring-boot/build.gradle.kts | 5 ----- sentry-spring/build.gradle.kts | 5 ----- sentry/build.gradle.kts | 5 ----- 28 files changed, 18 insertions(+), 131 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a1b81add3f..86d8765404 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,6 @@ import com.diffplug.spotless.LineEnding +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 @@ -184,6 +186,22 @@ subprojects { } } + 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() + + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + } + afterEvaluate { apply() diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ViewHierarchyNode.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ViewHierarchyNode.kt index 555190675e..1fba20d6f8 100644 --- a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ViewHierarchyNode.kt +++ b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ViewHierarchyNode.kt @@ -14,7 +14,6 @@ import io.sentry.android.replay.util.isMaskable import io.sentry.android.replay.util.isVisibleToUser import io.sentry.android.replay.util.toOpaque import io.sentry.android.replay.util.totalPaddingTopSafe -import java.util.Locale @TargetApi(26) internal sealed class ViewHierarchyNode( diff --git a/sentry-apache-http-client-5/build.gradle.kts b/sentry-apache-http-client-5/build.gradle.kts index a5d2dc358d..324569c63d 100644 --- a/sentry-apache-http-client-5/build.gradle.kts +++ b/sentry-apache-http-client-5/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.QualityPlugins.gradleVersions) } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-apollo-3/build.gradle.kts b/sentry-apollo-3/build.gradle.kts index 22583203ed..b3d2f7289e 100644 --- a/sentry-apollo-3/build.gradle.kts +++ b/sentry-apollo-3/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-apollo/build.gradle.kts b/sentry-apollo/build.gradle.kts index d05a31856b..3568254e81 100644 --- a/sentry-apollo/build.gradle.kts +++ b/sentry-apollo/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-graphql-22/build.gradle.kts b/sentry-graphql-22/build.gradle.kts index 5463456f8c..4cae7bc7b6 100644 --- a/sentry-graphql-22/build.gradle.kts +++ b/sentry-graphql-22/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-graphql-core/build.gradle.kts b/sentry-graphql-core/build.gradle.kts index ed1c197acd..20c0602489 100644 --- a/sentry-graphql-core/build.gradle.kts +++ b/sentry-graphql-core/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-graphql/build.gradle.kts b/sentry-graphql/build.gradle.kts index f0de17f288..2fec033ed7 100644 --- a/sentry-graphql/build.gradle.kts +++ b/sentry-graphql/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-jdbc/build.gradle.kts b/sentry-jdbc/build.gradle.kts index 239bd46cab..eb4b53a962 100644 --- a/sentry-jdbc/build.gradle.kts +++ b/sentry-jdbc/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() } diff --git a/sentry-jul/build.gradle.kts b/sentry-jul/build.gradle.kts index 009561801b..f59f14bbf4 100644 --- a/sentry-jul/build.gradle.kts +++ b/sentry-jul/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() } diff --git a/sentry-kotlin-extensions/build.gradle.kts b/sentry-kotlin-extensions/build.gradle.kts index c920b6cf33..9db72d89ca 100644 --- a/sentry-kotlin-extensions/build.gradle.kts +++ b/sentry-kotlin-extensions/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.QualityPlugins.detektPlugin) } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-log4j2/build.gradle.kts b/sentry-log4j2/build.gradle.kts index 933b28bfc9..1be24487c3 100644 --- a/sentry-log4j2/build.gradle.kts +++ b/sentry-log4j2/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() } diff --git a/sentry-logback/build.gradle.kts b/sentry-logback/build.gradle.kts index 255e35022f..48c81a452e 100644 --- a/sentry-logback/build.gradle.kts +++ b/sentry-logback/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() } diff --git a/sentry-okhttp/build.gradle.kts b/sentry-okhttp/build.gradle.kts index a30e2d0594..71e09d8778 100644 --- a/sentry-okhttp/build.gradle.kts +++ b/sentry-okhttp/build.gradle.kts @@ -11,11 +11,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() } diff --git a/sentry-openfeign/build.gradle.kts b/sentry-openfeign/build.gradle.kts index 0679c42f41..305b020a3b 100644 --- a/sentry-openfeign/build.gradle.kts +++ b/sentry-openfeign/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() } diff --git a/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts index 4d346b294f..88569f69b6 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts @@ -5,11 +5,6 @@ plugins { id("com.github.johnrengelman.shadow") version "7.1.2" } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - fun relocatePackages(shadowJar: ShadowJar) { // rewrite dependencies calling Logger.getLogger shadowJar.relocate("java.util.logging.Logger", "io.opentelemetry.javaagent.bootstrap.PatchLogger") diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts index 77ef8f56a8..97452cab95 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts @@ -9,11 +9,6 @@ plugins { id(Config.QualityPlugins.gradleVersions) } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() } diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts index a79bd6c94f..1465574c65 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts @@ -2,11 +2,6 @@ plugins { `java-library` } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - dependencies { api(projects.sentry) implementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap) diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts index 26a404e49c..efad0063a1 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts @@ -2,11 +2,6 @@ plugins { `java-library` } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - dependencies { api(projects.sentry) implementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap) diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts index 6eb8e6d6f1..447b0823f5 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts @@ -9,11 +9,6 @@ plugins { id(Config.QualityPlugins.gradleVersions) } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() } diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts index e46ff2783a..de2143f01d 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts @@ -9,11 +9,6 @@ plugins { id(Config.QualityPlugins.gradleVersions) } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() } diff --git a/sentry-quartz/build.gradle.kts b/sentry-quartz/build.gradle.kts index 8731f6a40b..605ae7a3b7 100644 --- a/sentry-quartz/build.gradle.kts +++ b/sentry-quartz/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-servlet-jakarta/build.gradle.kts b/sentry-servlet-jakarta/build.gradle.kts index 9066d228c7..6760e00c40 100644 --- a/sentry-servlet-jakarta/build.gradle.kts +++ b/sentry-servlet-jakarta/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts index 8d03ede152..593f346034 100644 --- a/sentry-servlet/build.gradle.kts +++ b/sentry-servlet/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index fcbdd0d9a6..d68f2c9332 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -11,11 +11,6 @@ plugins { id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-spring-boot/build.gradle.kts b/sentry-spring-boot/build.gradle.kts index f6a84d47f0..426cea26f6 100644 --- a/sentry-spring-boot/build.gradle.kts +++ b/sentry-spring-boot/build.gradle.kts @@ -12,11 +12,6 @@ plugins { id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index 8f7ed519d2..6873c1cada 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -13,11 +13,6 @@ plugins { id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion diff --git a/sentry/build.gradle.kts b/sentry/build.gradle.kts index 08efc550d5..4498e3bc2f 100644 --- a/sentry/build.gradle.kts +++ b/sentry/build.gradle.kts @@ -10,11 +10,6 @@ plugins { id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } -configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() }