Remove duplicated Novoda plugin config.

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<ReleasePlugin>()
+
+        configure<PublishExtension> {
+            userOrg = Config.Sentry.userOrg
+            groupId = project.group.toString()
+            publishVersion = project.version.toString()
+            desc = Config.Sentry.description
+            website = Config.Sentry.website
+            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
+            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
+        }
     }
 }
 

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"

sentry-android-core/build.gradle.kts

@@ -1,12 +1,10 @@
-import com.novoda.gradle.release.PublishExtension
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
     id("com.android.library")
     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<PublishExtension> {
-    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
-}

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<Exec>("initNative") {
 tasks.named("preBuild") {
     dependsOn(initNative)
 }
-
-// TODO: move thse blocks to parent gradle file, DRY
-configure<PublishExtension> {
-    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
-}

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<PublishExtension> {
-    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<Detekt> {
     // Target version of the generated JVM bytecode. It is used for type resolution.
     jvmTarget = JavaVersion.VERSION_1_8.toString()

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<PublishExtension> {
-    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
-}

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<JavaCompile>().configureEach {
     dependsOn(generateBuildConfig)
 }
-
-// TODO: move these blocks to parent gradle file, DRY
-configure<PublishExtension> {
-    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
-}

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<JavaCompile>().configureEach {
     dependsOn(generateBuildConfig)
 }
-
-// TODO: move these blocks to parent gradle file, DRY
-configure<PublishExtension> {
-    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
-}

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<PublishExtension> {
-    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()
 }

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<JavaCompile>().configureEach {
     dependsOn(generateBuildConfig)
 }
-
-// TODO: move these blocks to parent gradle file, DRY
-configure<PublishExtension> {
-    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
-}