Skip to content

Commit dd941d7

Browse files
maciejwalkowiakmaciejwalkowiak
authored
Remove duplicated Novoda plugin config. (getsentry#1007)
1 parent 0120409 commit dd941d7

12 files changed

Lines changed: 28 additions & 256 deletions

File tree

‎build.gradle.kts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import com.diffplug.spotless.LineEnding
2+
import com.novoda.gradle.release.PublishExtension
3+
import com.novoda.gradle.release.ReleasePlugin
24
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
35
import org.gradle.api.tasks.testing.logging.TestLogEvent
46

@@ -79,6 +81,30 @@ subprojects {
7981
if (file.length() == 0L) throw IllegalStateException("Distribution file: $distributionFilePath is empty")
8082
}
8183
}
84+
85+
apply<ReleasePlugin>()
86+
87+
configure<PublishExtension> {
88+
userOrg = Config.Sentry.userOrg
89+
groupId = project.group.toString()
90+
publishVersion = project.version.toString()
91+
desc = Config.Sentry.description
92+
website = Config.Sentry.website
93+
repoName = if (project.name.contains("android")) Config.Sentry.androidBintrayRepoName else Config.Sentry.javaBintrayRepoName
94+
setLicences(Config.Sentry.licence)
95+
setLicenceUrls(Config.Sentry.licenceUrl)
96+
issueTracker = Config.Sentry.issueTracker
97+
repository = Config.Sentry.repository
98+
sign = Config.Deploy.sign
99+
artifactId = project.name
100+
uploadName = "${project.group}:${project.name}"
101+
devId = Config.Sentry.userOrg
102+
devName = Config.Sentry.devName
103+
devEmail = Config.Sentry.devEmail
104+
scmConnection = Config.Sentry.scmConnection
105+
scmDevConnection = Config.Sentry.scmDevConnection
106+
scmUrl = Config.Sentry.scmUrl
107+
}
82108
}
83109
}
84110

‎buildSrc/src/main/java/Config.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ object Config {
102102
val description = "SDK for sentry.io"
103103
val website = "https://sentry.io"
104104
val userOrg = "getsentry"
105-
val androidRepoName = "sentry-android"
106-
val javaRepoName = "sentry-java"
105+
val androidBintrayRepoName = "sentry-android"
106+
val javaBintrayRepoName = "sentry-java"
107107
val licence = "MIT"
108108
val licenceUrl = "http://www.opensource.org/licenses/mit-license.php"
109109
val issueTracker = "https://github.com/getsentry/sentry-java/issues"

‎sentry-android-core/build.gradle.kts‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import com.novoda.gradle.release.PublishExtension
21
import org.jetbrains.kotlin.config.KotlinCompilerVersion
32

43
plugins {
54
id("com.android.library")
65
kotlin("android")
76
jacoco
87
id(Config.QualityPlugins.errorProne)
9-
id(Config.Deploy.novodaBintray)
108
id(Config.QualityPlugins.gradleVersions)
119
}
1210

@@ -94,26 +92,3 @@ dependencies {
9492
testImplementation(Config.TestLibs.mockitoInline)
9593
testImplementation(Config.TestLibs.awaitility)
9694
}
97-
98-
// TODO: move thse blocks to parent gradle file, DRY
99-
configure<PublishExtension> {
100-
userOrg = Config.Sentry.userOrg
101-
groupId = project.group.toString()
102-
publishVersion = project.version.toString()
103-
desc = Config.Sentry.description
104-
website = Config.Sentry.website
105-
repoName = Config.Sentry.androidRepoName
106-
setLicences(Config.Sentry.licence)
107-
setLicenceUrls(Config.Sentry.licenceUrl)
108-
issueTracker = Config.Sentry.issueTracker
109-
repository = Config.Sentry.repository
110-
sign = Config.Deploy.sign
111-
artifactId = project.name
112-
uploadName = "${project.group}:${project.name}"
113-
devId = Config.Sentry.userOrg
114-
devName = Config.Sentry.devName
115-
devEmail = Config.Sentry.devEmail
116-
scmConnection = Config.Sentry.scmConnection
117-
scmDevConnection = Config.Sentry.scmDevConnection
118-
scmUrl = Config.Sentry.scmUrl
119-
}

‎sentry-android-ndk/build.gradle.kts‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import com.novoda.gradle.release.PublishExtension
21
import org.jetbrains.kotlin.config.KotlinCompilerVersion
32

43
plugins {
54
id("com.android.library")
65
kotlin("android")
76
jacoco
8-
id(Config.Deploy.novodaBintray)
97
id(Config.NativePlugins.nativeBundleExport)
108
id(Config.QualityPlugins.gradleVersions)
119
}
@@ -121,26 +119,3 @@ val initNative = tasks.register<Exec>("initNative") {
121119
tasks.named("preBuild") {
122120
dependsOn(initNative)
123121
}
124-
125-
// TODO: move thse blocks to parent gradle file, DRY
126-
configure<PublishExtension> {
127-
userOrg = Config.Sentry.userOrg
128-
groupId = project.group.toString()
129-
publishVersion = project.version.toString()
130-
desc = Config.Sentry.description
131-
website = Config.Sentry.website
132-
repoName = Config.Sentry.androidRepoName
133-
setLicences(Config.Sentry.licence)
134-
setLicenceUrls(Config.Sentry.licenceUrl)
135-
issueTracker = Config.Sentry.issueTracker
136-
repository = Config.Sentry.repository
137-
sign = Config.Deploy.sign
138-
artifactId = project.name
139-
uploadName = "${project.group}:${project.name}"
140-
devId = Config.Sentry.userOrg
141-
devName = Config.Sentry.devName
142-
devEmail = Config.Sentry.devEmail
143-
scmConnection = Config.Sentry.scmConnection
144-
scmDevConnection = Config.Sentry.scmDevConnection
145-
scmUrl = Config.Sentry.scmUrl
146-
}

‎sentry-android-timber/build.gradle.kts‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.novoda.gradle.release.PublishExtension
21
import io.gitlab.arturbosch.detekt.Detekt
32
import io.gitlab.arturbosch.detekt.extensions.DetektExtension
43
import org.jetbrains.kotlin.config.KotlinCompilerVersion
@@ -7,7 +6,6 @@ plugins {
76
id("com.android.library")
87
kotlin("android")
98
jacoco
10-
id(Config.Deploy.novodaBintray)
119
id(Config.QualityPlugins.gradleVersions)
1210
id(Config.QualityPlugins.detektPlugin)
1311
}
@@ -79,29 +77,6 @@ dependencies {
7977
testImplementation(Config.TestLibs.mockitoInline)
8078
}
8179

82-
// TODO: move thse blocks to parent gradle file, DRY
83-
configure<PublishExtension> {
84-
userOrg = Config.Sentry.userOrg
85-
groupId = project.group.toString()
86-
publishVersion = project.version.toString()
87-
desc = Config.Sentry.description
88-
website = Config.Sentry.website
89-
repoName = Config.Sentry.androidRepoName
90-
setLicences(Config.Sentry.licence)
91-
setLicenceUrls(Config.Sentry.licenceUrl)
92-
issueTracker = Config.Sentry.issueTracker
93-
repository = Config.Sentry.repository
94-
sign = Config.Deploy.sign
95-
artifactId = project.name
96-
uploadName = "${project.group}:${project.name}"
97-
devId = Config.Sentry.userOrg
98-
devName = Config.Sentry.devName
99-
devEmail = Config.Sentry.devEmail
100-
scmConnection = Config.Sentry.scmConnection
101-
scmDevConnection = Config.Sentry.scmDevConnection
102-
scmUrl = Config.Sentry.scmUrl
103-
}
104-
10580
tasks.withType<Detekt> {
10681
// Target version of the generated JVM bytecode. It is used for type resolution.
10782
jvmTarget = JavaVersion.VERSION_1_8.toString()

‎sentry-android/build.gradle.kts‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import com.novoda.gradle.release.PublishExtension
2-
31
plugins {
42
id("com.android.library")
53
kotlin("android")
6-
id(Config.Deploy.novodaBintray)
74
id(Config.QualityPlugins.gradleVersions)
85
}
96

@@ -33,26 +30,3 @@ dependencies {
3330
api(project(":sentry-android-core"))
3431
api(project(":sentry-android-ndk"))
3532
}
36-
37-
// TODO: move these blocks to parent gradle file, DRY
38-
configure<PublishExtension> {
39-
userOrg = Config.Sentry.userOrg
40-
groupId = project.group.toString()
41-
publishVersion = project.version.toString()
42-
desc = Config.Sentry.description
43-
website = Config.Sentry.website
44-
repoName = Config.Sentry.androidRepoName
45-
setLicences(Config.Sentry.licence)
46-
setLicenceUrls(Config.Sentry.licenceUrl)
47-
issueTracker = Config.Sentry.issueTracker
48-
repository = Config.Sentry.repository
49-
sign = Config.Deploy.sign
50-
artifactId = project.name
51-
uploadName = "${project.group}:${project.name}"
52-
devId = Config.Sentry.userOrg
53-
devName = Config.Sentry.devName
54-
devEmail = Config.Sentry.devEmail
55-
scmConnection = Config.Sentry.scmConnection
56-
scmDevConnection = Config.Sentry.scmDevConnection
57-
scmUrl = Config.Sentry.scmUrl
58-
}

‎sentry-log4j2/build.gradle.kts‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import com.novoda.gradle.release.PublishExtension
2-
31
plugins {
42
`java-library`
53
kotlin("jvm")
64
jacoco
75
id(Config.QualityPlugins.errorProne)
8-
id(Config.Deploy.novodaBintray)
96
id(Config.QualityPlugins.gradleVersions)
107
id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion
118
}
@@ -78,26 +75,3 @@ val generateBuildConfig by tasks
7875
tasks.withType<JavaCompile>().configureEach {
7976
dependsOn(generateBuildConfig)
8077
}
81-
82-
// TODO: move these blocks to parent gradle file, DRY
83-
configure<PublishExtension> {
84-
userOrg = Config.Sentry.userOrg
85-
groupId = project.group.toString()
86-
publishVersion = project.version.toString()
87-
desc = Config.Sentry.description
88-
website = Config.Sentry.website
89-
repoName = Config.Sentry.javaRepoName
90-
setLicences(Config.Sentry.licence)
91-
setLicenceUrls(Config.Sentry.licenceUrl)
92-
issueTracker = Config.Sentry.issueTracker
93-
repository = Config.Sentry.repository
94-
sign = Config.Deploy.sign
95-
artifactId = project.name
96-
uploadName = "${project.group}:${project.name}"
97-
devId = Config.Sentry.userOrg
98-
devName = Config.Sentry.devName
99-
devEmail = Config.Sentry.devEmail
100-
scmConnection = Config.Sentry.scmConnection
101-
scmDevConnection = Config.Sentry.scmDevConnection
102-
scmUrl = Config.Sentry.scmUrl
103-
}

‎sentry-logback/build.gradle.kts‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import com.novoda.gradle.release.PublishExtension
2-
31
plugins {
42
`java-library`
53
kotlin("jvm")
64
jacoco
75
id(Config.QualityPlugins.errorProne)
8-
id(Config.Deploy.novodaBintray)
96
id(Config.QualityPlugins.gradleVersions)
107
id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion
118
}
@@ -77,26 +74,3 @@ val generateBuildConfig by tasks
7774
tasks.withType<JavaCompile>().configureEach {
7875
dependsOn(generateBuildConfig)
7976
}
80-
81-
// TODO: move these blocks to parent gradle file, DRY
82-
configure<PublishExtension> {
83-
userOrg = Config.Sentry.userOrg
84-
groupId = project.group.toString()
85-
publishVersion = project.version.toString()
86-
desc = Config.Sentry.description
87-
website = Config.Sentry.website
88-
repoName = Config.Sentry.javaRepoName
89-
setLicences(Config.Sentry.licence)
90-
setLicenceUrls(Config.Sentry.licenceUrl)
91-
issueTracker = Config.Sentry.issueTracker
92-
repository = Config.Sentry.repository
93-
sign = Config.Deploy.sign
94-
artifactId = project.name
95-
uploadName = "${project.group}:${project.name}"
96-
devId = Config.Sentry.userOrg
97-
devName = Config.Sentry.devName
98-
devEmail = Config.Sentry.devEmail
99-
scmConnection = Config.Sentry.scmConnection
100-
scmDevConnection = Config.Sentry.scmDevConnection
101-
scmUrl = Config.Sentry.scmUrl
102-
}

‎sentry-servlet/build.gradle.kts‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.novoda.gradle.release.PublishExtension
21
import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
32
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
43
import org.springframework.boot.gradle.plugin.SpringBootPlugin
@@ -8,7 +7,6 @@ plugins {
87
kotlin("jvm")
98
jacoco
109
id(Config.QualityPlugins.errorProne)
11-
id(Config.Deploy.novodaBintray)
1210
id(Config.QualityPlugins.gradleVersions)
1311
id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false
1412
}
@@ -79,29 +77,6 @@ tasks {
7977
dependsOn(jacocoTestReport)
8078
}
8179
}
82-
83-
// TODO: move these blocks to parent gradle file, DRY
84-
configure<PublishExtension> {
85-
userOrg = Config.Sentry.userOrg
86-
groupId = project.group.toString()
87-
publishVersion = project.version.toString()
88-
desc = Config.Sentry.description
89-
website = Config.Sentry.website
90-
repoName = Config.Sentry.javaRepoName
91-
setLicences(Config.Sentry.licence)
92-
setLicenceUrls(Config.Sentry.licenceUrl)
93-
issueTracker = Config.Sentry.issueTracker
94-
repository = Config.Sentry.repository
95-
sign = Config.Deploy.sign
96-
artifactId = project.name
97-
uploadName = "${project.group}:${project.name}"
98-
devId = Config.Sentry.userOrg
99-
devName = Config.Sentry.devName
100-
devEmail = Config.Sentry.devEmail
101-
scmConnection = Config.Sentry.scmConnection
102-
scmDevConnection = Config.Sentry.scmDevConnection
103-
scmUrl = Config.Sentry.scmUrl
104-
}
10580
repositories {
10681
mavenCentral()
10782
}

‎sentry-spring-boot-starter/build.gradle.kts‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.novoda.gradle.release.PublishExtension
21
import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
32
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
43
import org.springframework.boot.gradle.plugin.SpringBootPlugin
@@ -8,7 +7,6 @@ plugins {
87
kotlin("jvm")
98
jacoco
109
id(Config.QualityPlugins.errorProne)
11-
id(Config.Deploy.novodaBintray)
1210
id(Config.QualityPlugins.gradleVersions)
1311
id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion
1412
id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false
@@ -101,26 +99,3 @@ val generateBuildConfig by tasks
10199
tasks.withType<JavaCompile>().configureEach {
102100
dependsOn(generateBuildConfig)
103101
}
104-
105-
// TODO: move these blocks to parent gradle file, DRY
106-
configure<PublishExtension> {
107-
userOrg = Config.Sentry.userOrg
108-
groupId = project.group.toString()
109-
publishVersion = project.version.toString()
110-
desc = Config.Sentry.description
111-
website = Config.Sentry.website
112-
repoName = Config.Sentry.javaRepoName
113-
setLicences(Config.Sentry.licence)
114-
setLicenceUrls(Config.Sentry.licenceUrl)
115-
issueTracker = Config.Sentry.issueTracker
116-
repository = Config.Sentry.repository
117-
sign = Config.Deploy.sign
118-
artifactId = project.name
119-
uploadName = "${project.group}:${project.name}"
120-
devId = Config.Sentry.userOrg
121-
devName = Config.Sentry.devName
122-
devEmail = Config.Sentry.devEmail
123-
scmConnection = Config.Sentry.scmConnection
124-
scmDevConnection = Config.Sentry.scmDevConnection
125-
scmUrl = Config.Sentry.scmUrl
126-
}

0 commit comments

Comments
 (0)