From fc165d480f31e080d006c13fe3db9ade6cfe86a0 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Thu, 22 Oct 2020 17:05:50 +0200 Subject: [PATCH 1/3] Remove duplicated Novoda plugin config. --- build.gradle.kts | 26 +++++++++++++++++++++ sentry-android-core/build.gradle.kts | 25 -------------------- sentry-android-ndk/build.gradle.kts | 25 -------------------- sentry-android-timber/build.gradle.kts | 25 -------------------- sentry-android/build.gradle.kts | 26 --------------------- sentry-log4j2/build.gradle.kts | 26 --------------------- sentry-logback/build.gradle.kts | 26 --------------------- sentry-servlet/build.gradle.kts | 25 -------------------- sentry-spring-boot-starter/build.gradle.kts | 25 -------------------- sentry-spring/build.gradle.kts | 25 -------------------- sentry/build.gradle.kts | 26 --------------------- 11 files changed, 26 insertions(+), 254 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f77b13fa45..8d18fe0252 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,6 @@ import com.diffplug.spotless.LineEnding +import com.novoda.gradle.release.PublishExtension +import com.novoda.gradle.release.ReleasePlugin import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent @@ -79,6 +81,30 @@ subprojects { if (file.length() == 0L) throw IllegalStateException("Distribution file: $distributionFilePath is empty") } } + + apply() + + configure { + userOrg = Config.Sentry.userOrg + groupId = project.group.toString() + publishVersion = project.version.toString() + desc = Config.Sentry.description + website = Config.Sentry.website + repoName = Config.Sentry.javaRepoName + setLicences(Config.Sentry.licence) + setLicenceUrls(Config.Sentry.licenceUrl) + issueTracker = Config.Sentry.issueTracker + repository = Config.Sentry.repository + sign = Config.Deploy.sign + artifactId = project.name + uploadName = "${project.group}:${project.name}" + devId = Config.Sentry.userOrg + devName = Config.Sentry.devName + devEmail = Config.Sentry.devEmail + scmConnection = Config.Sentry.scmConnection + scmDevConnection = Config.Sentry.scmDevConnection + scmUrl = Config.Sentry.scmUrl + } } } diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts index 17eaca4aaf..0596335113 100644 --- a/sentry-android-core/build.gradle.kts +++ b/sentry-android-core/build.gradle.kts @@ -1,4 +1,3 @@ -import com.novoda.gradle.release.PublishExtension import org.jetbrains.kotlin.config.KotlinCompilerVersion plugins { @@ -6,7 +5,6 @@ plugins { kotlin("android") jacoco id(Config.QualityPlugins.errorProne) - id(Config.Deploy.novodaBintray) id(Config.QualityPlugins.gradleVersions) } @@ -94,26 +92,3 @@ dependencies { testImplementation(Config.TestLibs.mockitoInline) testImplementation(Config.TestLibs.awaitility) } - -// TODO: move thse blocks to parent gradle file, DRY -configure { - userOrg = Config.Sentry.userOrg - groupId = project.group.toString() - publishVersion = project.version.toString() - desc = Config.Sentry.description - website = Config.Sentry.website - repoName = Config.Sentry.androidRepoName - setLicences(Config.Sentry.licence) - setLicenceUrls(Config.Sentry.licenceUrl) - issueTracker = Config.Sentry.issueTracker - repository = Config.Sentry.repository - sign = Config.Deploy.sign - artifactId = project.name - uploadName = "${project.group}:${project.name}" - devId = Config.Sentry.userOrg - devName = Config.Sentry.devName - devEmail = Config.Sentry.devEmail - scmConnection = Config.Sentry.scmConnection - scmDevConnection = Config.Sentry.scmDevConnection - scmUrl = Config.Sentry.scmUrl -} diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts index 04cdd9421a..cfb35bdff7 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -1,11 +1,9 @@ -import com.novoda.gradle.release.PublishExtension import org.jetbrains.kotlin.config.KotlinCompilerVersion plugins { id("com.android.library") kotlin("android") jacoco - id(Config.Deploy.novodaBintray) id(Config.NativePlugins.nativeBundleExport) id(Config.QualityPlugins.gradleVersions) } @@ -121,26 +119,3 @@ val initNative = tasks.register("initNative") { tasks.named("preBuild") { dependsOn(initNative) } - -// TODO: move thse blocks to parent gradle file, DRY -configure { - userOrg = Config.Sentry.userOrg - groupId = project.group.toString() - publishVersion = project.version.toString() - desc = Config.Sentry.description - website = Config.Sentry.website - repoName = Config.Sentry.androidRepoName - setLicences(Config.Sentry.licence) - setLicenceUrls(Config.Sentry.licenceUrl) - issueTracker = Config.Sentry.issueTracker - repository = Config.Sentry.repository - sign = Config.Deploy.sign - artifactId = project.name - uploadName = "${project.group}:${project.name}" - devId = Config.Sentry.userOrg - devName = Config.Sentry.devName - devEmail = Config.Sentry.devEmail - scmConnection = Config.Sentry.scmConnection - scmDevConnection = Config.Sentry.scmDevConnection - scmUrl = Config.Sentry.scmUrl -} diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 02f1650f50..aad8ad5d59 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/sentry-android-timber/build.gradle.kts @@ -1,4 +1,3 @@ -import com.novoda.gradle.release.PublishExtension import io.gitlab.arturbosch.detekt.Detekt import io.gitlab.arturbosch.detekt.extensions.DetektExtension import org.jetbrains.kotlin.config.KotlinCompilerVersion @@ -7,7 +6,6 @@ plugins { id("com.android.library") kotlin("android") jacoco - id(Config.Deploy.novodaBintray) id(Config.QualityPlugins.gradleVersions) id(Config.QualityPlugins.detektPlugin) } @@ -79,29 +77,6 @@ dependencies { testImplementation(Config.TestLibs.mockitoInline) } -// TODO: move thse blocks to parent gradle file, DRY -configure { - userOrg = Config.Sentry.userOrg - groupId = project.group.toString() - publishVersion = project.version.toString() - desc = Config.Sentry.description - website = Config.Sentry.website - repoName = Config.Sentry.androidRepoName - setLicences(Config.Sentry.licence) - setLicenceUrls(Config.Sentry.licenceUrl) - issueTracker = Config.Sentry.issueTracker - repository = Config.Sentry.repository - sign = Config.Deploy.sign - artifactId = project.name - uploadName = "${project.group}:${project.name}" - devId = Config.Sentry.userOrg - devName = Config.Sentry.devName - devEmail = Config.Sentry.devEmail - scmConnection = Config.Sentry.scmConnection - scmDevConnection = Config.Sentry.scmDevConnection - scmUrl = Config.Sentry.scmUrl -} - tasks.withType { // Target version of the generated JVM bytecode. It is used for type resolution. jvmTarget = JavaVersion.VERSION_1_8.toString() diff --git a/sentry-android/build.gradle.kts b/sentry-android/build.gradle.kts index 8fb63b88b3..00b139dea9 100644 --- a/sentry-android/build.gradle.kts +++ b/sentry-android/build.gradle.kts @@ -1,9 +1,6 @@ -import com.novoda.gradle.release.PublishExtension - plugins { id("com.android.library") kotlin("android") - id(Config.Deploy.novodaBintray) id(Config.QualityPlugins.gradleVersions) } @@ -33,26 +30,3 @@ dependencies { api(project(":sentry-android-core")) api(project(":sentry-android-ndk")) } - -// TODO: move these blocks to parent gradle file, DRY -configure { - userOrg = Config.Sentry.userOrg - groupId = project.group.toString() - publishVersion = project.version.toString() - desc = Config.Sentry.description - website = Config.Sentry.website - repoName = Config.Sentry.androidRepoName - setLicences(Config.Sentry.licence) - setLicenceUrls(Config.Sentry.licenceUrl) - issueTracker = Config.Sentry.issueTracker - repository = Config.Sentry.repository - sign = Config.Deploy.sign - artifactId = project.name - uploadName = "${project.group}:${project.name}" - devId = Config.Sentry.userOrg - devName = Config.Sentry.devName - devEmail = Config.Sentry.devEmail - scmConnection = Config.Sentry.scmConnection - scmDevConnection = Config.Sentry.scmDevConnection - scmUrl = Config.Sentry.scmUrl -} diff --git a/sentry-log4j2/build.gradle.kts b/sentry-log4j2/build.gradle.kts index 210003f1f6..30fadae5ec 100644 --- a/sentry-log4j2/build.gradle.kts +++ b/sentry-log4j2/build.gradle.kts @@ -1,11 +1,8 @@ -import com.novoda.gradle.release.PublishExtension - plugins { `java-library` kotlin("jvm") jacoco id(Config.QualityPlugins.errorProne) - id(Config.Deploy.novodaBintray) id(Config.QualityPlugins.gradleVersions) id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } @@ -78,26 +75,3 @@ val generateBuildConfig by tasks tasks.withType().configureEach { dependsOn(generateBuildConfig) } - -// TODO: move these blocks to parent gradle file, DRY -configure { - userOrg = Config.Sentry.userOrg - groupId = project.group.toString() - publishVersion = project.version.toString() - desc = Config.Sentry.description - website = Config.Sentry.website - repoName = Config.Sentry.javaRepoName - setLicences(Config.Sentry.licence) - setLicenceUrls(Config.Sentry.licenceUrl) - issueTracker = Config.Sentry.issueTracker - repository = Config.Sentry.repository - sign = Config.Deploy.sign - artifactId = project.name - uploadName = "${project.group}:${project.name}" - devId = Config.Sentry.userOrg - devName = Config.Sentry.devName - devEmail = Config.Sentry.devEmail - scmConnection = Config.Sentry.scmConnection - scmDevConnection = Config.Sentry.scmDevConnection - scmUrl = Config.Sentry.scmUrl -} diff --git a/sentry-logback/build.gradle.kts b/sentry-logback/build.gradle.kts index 4787de1b6f..294cc9741a 100644 --- a/sentry-logback/build.gradle.kts +++ b/sentry-logback/build.gradle.kts @@ -1,11 +1,8 @@ -import com.novoda.gradle.release.PublishExtension - plugins { `java-library` kotlin("jvm") jacoco id(Config.QualityPlugins.errorProne) - id(Config.Deploy.novodaBintray) id(Config.QualityPlugins.gradleVersions) id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } @@ -77,26 +74,3 @@ val generateBuildConfig by tasks tasks.withType().configureEach { dependsOn(generateBuildConfig) } - -// TODO: move these blocks to parent gradle file, DRY -configure { - userOrg = Config.Sentry.userOrg - groupId = project.group.toString() - publishVersion = project.version.toString() - desc = Config.Sentry.description - website = Config.Sentry.website - repoName = Config.Sentry.javaRepoName - setLicences(Config.Sentry.licence) - setLicenceUrls(Config.Sentry.licenceUrl) - issueTracker = Config.Sentry.issueTracker - repository = Config.Sentry.repository - sign = Config.Deploy.sign - artifactId = project.name - uploadName = "${project.group}:${project.name}" - devId = Config.Sentry.userOrg - devName = Config.Sentry.devName - devEmail = Config.Sentry.devEmail - scmConnection = Config.Sentry.scmConnection - scmDevConnection = Config.Sentry.scmDevConnection - scmUrl = Config.Sentry.scmUrl -} diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts index 00b2bc66a7..89cc04dacf 100644 --- a/sentry-servlet/build.gradle.kts +++ b/sentry-servlet/build.gradle.kts @@ -1,4 +1,3 @@ -import com.novoda.gradle.release.PublishExtension import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.springframework.boot.gradle.plugin.SpringBootPlugin @@ -8,7 +7,6 @@ plugins { kotlin("jvm") jacoco id(Config.QualityPlugins.errorProne) - id(Config.Deploy.novodaBintray) id(Config.QualityPlugins.gradleVersions) id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false } @@ -79,29 +77,6 @@ tasks { dependsOn(jacocoTestReport) } } - -// TODO: move these blocks to parent gradle file, DRY -configure { - userOrg = Config.Sentry.userOrg - groupId = project.group.toString() - publishVersion = project.version.toString() - desc = Config.Sentry.description - website = Config.Sentry.website - repoName = Config.Sentry.javaRepoName - setLicences(Config.Sentry.licence) - setLicenceUrls(Config.Sentry.licenceUrl) - issueTracker = Config.Sentry.issueTracker - repository = Config.Sentry.repository - sign = Config.Deploy.sign - artifactId = project.name - uploadName = "${project.group}:${project.name}" - devId = Config.Sentry.userOrg - devName = Config.Sentry.devName - devEmail = Config.Sentry.devEmail - scmConnection = Config.Sentry.scmConnection - scmDevConnection = Config.Sentry.scmDevConnection - scmUrl = Config.Sentry.scmUrl -} repositories { mavenCentral() } diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index 579dedc0cb..c8f0b07814 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -1,4 +1,3 @@ -import com.novoda.gradle.release.PublishExtension import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.springframework.boot.gradle.plugin.SpringBootPlugin @@ -8,7 +7,6 @@ plugins { kotlin("jvm") jacoco id(Config.QualityPlugins.errorProne) - id(Config.Deploy.novodaBintray) id(Config.QualityPlugins.gradleVersions) id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false @@ -101,26 +99,3 @@ val generateBuildConfig by tasks tasks.withType().configureEach { dependsOn(generateBuildConfig) } - -// TODO: move these blocks to parent gradle file, DRY -configure { - userOrg = Config.Sentry.userOrg - groupId = project.group.toString() - publishVersion = project.version.toString() - desc = Config.Sentry.description - website = Config.Sentry.website - repoName = Config.Sentry.javaRepoName - setLicences(Config.Sentry.licence) - setLicenceUrls(Config.Sentry.licenceUrl) - issueTracker = Config.Sentry.issueTracker - repository = Config.Sentry.repository - sign = Config.Deploy.sign - artifactId = project.name - uploadName = "${project.group}:${project.name}" - devId = Config.Sentry.userOrg - devName = Config.Sentry.devName - devEmail = Config.Sentry.devEmail - scmConnection = Config.Sentry.scmConnection - scmDevConnection = Config.Sentry.scmDevConnection - scmUrl = Config.Sentry.scmUrl -} diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index 9b8060c597..d0d58afe2c 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -1,4 +1,3 @@ -import com.novoda.gradle.release.PublishExtension import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.springframework.boot.gradle.plugin.SpringBootPlugin @@ -8,7 +7,6 @@ plugins { kotlin("jvm") jacoco id(Config.QualityPlugins.errorProne) - id(Config.Deploy.novodaBintray) id(Config.QualityPlugins.gradleVersions) id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false @@ -94,26 +92,3 @@ val generateBuildConfig by tasks tasks.withType().configureEach { dependsOn(generateBuildConfig) } - -// TODO: move these blocks to parent gradle file, DRY -configure { - userOrg = Config.Sentry.userOrg - groupId = project.group.toString() - publishVersion = project.version.toString() - desc = Config.Sentry.description - website = Config.Sentry.website - repoName = Config.Sentry.javaRepoName - setLicences(Config.Sentry.licence) - setLicenceUrls(Config.Sentry.licenceUrl) - issueTracker = Config.Sentry.issueTracker - repository = Config.Sentry.repository - sign = Config.Deploy.sign - artifactId = project.name - uploadName = "${project.group}:${project.name}" - devId = Config.Sentry.userOrg - devName = Config.Sentry.devName - devEmail = Config.Sentry.devEmail - scmConnection = Config.Sentry.scmConnection - scmDevConnection = Config.Sentry.scmDevConnection - scmUrl = Config.Sentry.scmUrl -} diff --git a/sentry/build.gradle.kts b/sentry/build.gradle.kts index 544e524521..1ba2464834 100644 --- a/sentry/build.gradle.kts +++ b/sentry/build.gradle.kts @@ -1,11 +1,8 @@ -import com.novoda.gradle.release.PublishExtension - plugins { `java-library` kotlin("jvm") jacoco id(Config.QualityPlugins.errorProne) - id(Config.Deploy.novodaBintray) id(Config.QualityPlugins.gradleVersions) id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion } @@ -80,26 +77,3 @@ val generateBuildConfig by tasks tasks.withType().configureEach { dependsOn(generateBuildConfig) } - -// TODO: move thse blocks to parent gradle file, DRY -configure { - userOrg = Config.Sentry.userOrg - groupId = project.group.toString() - publishVersion = project.version.toString() - desc = Config.Sentry.description - website = Config.Sentry.website - repoName = Config.Sentry.javaRepoName - setLicences(Config.Sentry.licence) - setLicenceUrls(Config.Sentry.licenceUrl) - issueTracker = Config.Sentry.issueTracker - repository = Config.Sentry.repository - sign = Config.Deploy.sign - artifactId = project.name - uploadName = "${project.group}:${project.name}" - devId = Config.Sentry.userOrg - devName = Config.Sentry.devName - devEmail = Config.Sentry.devEmail - scmConnection = Config.Sentry.scmConnection - scmDevConnection = Config.Sentry.scmDevConnection - scmUrl = Config.Sentry.scmUrl -} From ba75cc57dc9241c8b502a2b4f13c616ff83af952 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Thu, 22 Oct 2020 17:33:00 +0200 Subject: [PATCH 2/3] Support separate repositories for Android and Java projects. --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8d18fe0252..d799c47c08 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -90,7 +90,7 @@ subprojects { publishVersion = project.version.toString() desc = Config.Sentry.description website = Config.Sentry.website - repoName = Config.Sentry.javaRepoName + repoName = if (project.name.contains("android")) Config.Sentry.androidRepoName else Config.Sentry.javaRepoName setLicences(Config.Sentry.licence) setLicenceUrls(Config.Sentry.licenceUrl) issueTracker = Config.Sentry.issueTracker From 982ec7fa4354f39b3dbe00dd4908b152fc7a3710 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Fri, 23 Oct 2020 09:50:47 +0200 Subject: [PATCH 3/3] Rename variables. --- build.gradle.kts | 2 +- buildSrc/src/main/java/Config.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d799c47c08..ea147dfea0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -90,7 +90,7 @@ subprojects { publishVersion = project.version.toString() desc = Config.Sentry.description website = Config.Sentry.website - repoName = if (project.name.contains("android")) Config.Sentry.androidRepoName else Config.Sentry.javaRepoName + repoName = if (project.name.contains("android")) Config.Sentry.androidBintrayRepoName else Config.Sentry.javaBintrayRepoName setLicences(Config.Sentry.licence) setLicenceUrls(Config.Sentry.licenceUrl) issueTracker = Config.Sentry.issueTracker diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 32a3cffb82..95545b6196 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -102,8 +102,8 @@ object Config { val description = "SDK for sentry.io" val website = "https://sentry.io" val userOrg = "getsentry" - val androidRepoName = "sentry-android" - val javaRepoName = "sentry-java" + val androidBintrayRepoName = "sentry-android" + val javaBintrayRepoName = "sentry-java" val licence = "MIT" val licenceUrl = "http://www.opensource.org/licenses/mit-license.php" val issueTracker = "https://github.com/getsentry/sentry-java/issues"