Skip to content

Commit 06dd6a3

Browse files
marandanetomarandaneto
authored
Support mavenCentral sync (getsentry/sentry-android#278)
1 parent 42a7ba7 commit 06dd6a3

9 files changed

Lines changed: 133 additions & 13 deletions

File tree

‎.appveyor.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ environment:
44
ANDROID_HOME: "C:\\android-sdk-windows"
55
ANDROID_NDK_HOME: "C:\\android-sdk-windows\\ndk-bundle"
66
ANDROID_BUILD_VERSION: 29
7-
ANDROID_TOOLS_VERSION: 29.0.2
7+
ANDROID_TOOLS_VERSION: 29.0.3
88
GRADLE_OPTS: -Dorg.gradle.daemon=false
99
SDK_TOOLS_URL: https://dl.google.com/android/repository/sdk-tools-windows-4333796.zip
1010
install:
@@ -19,10 +19,11 @@ cache:
1919
- "%USERPROFILE%\\.gradle\\wrapper"
2020
- "%USERPROFILE%\\.m2\\repository"
2121
build_script:
22-
- cmd: gradlew.bat build
22+
- cmd: gradlew.bat build bintrayUpload -PbintrayUser=BINTRAY_USERNAME -PbintrayKey=BINTRAY_KEY -PmavenCentralUser=MAVEN_USER -PmavenCentralPassword=MAVEN_PASS
2323
artifacts:
2424
- path: '**\libs\*sentry*.jar'
2525
- path: '**\outputs\aar\*sentry*.aar'
26+
- path: '**\outputs\aar\*sentry*.pom'
2627
on_finish:
2728
- ps: |
2829
$wc = New-Object 'System.Net.WebClient'

‎.travis.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@ install:
1919
- echo y | sdkmanager "cmake;3.10.2.4988404" >/dev/null
2020
before_script:
2121
- export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
22+
- chmod +x ./gradlew
23+
script:
24+
- ./gradlew build bintrayUpload -PbintrayUser=BINTRAY_USERNAME -PbintrayKey=BINTRAY_KEY -PmavenCentralUser=MAVEN_USER -PmavenCentralPassword=MAVEN_PASS
2225
android:
2326
components:
2427
- platform-tools
25-
- build-tools-29.0.2
28+
- build-tools-29.0.3
2629
- android-29
2730
os: linux
2831
dist: trusty

‎build.gradle.kts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,14 @@ buildscript {
3131
classpath(Config.NativePlugins.nativeBundlePlugin)
3232

3333
// add classpath of sentry android gradle plugin
34-
// classpath("io.sentry:sentry-android-gradle-plugin:{version}}")
34+
// classpath("io.sentry:sentry-android-gradle-plugin:{version}")
3535
}
3636
}
3737

3838
allprojects {
3939
repositories {
4040
google()
4141
jcenter()
42-
maven {
43-
setUrl("https://dl.bintray.com/getsentry/sentry-android")
44-
}
4542
mavenCentral()
4643
}
4744
group = Config.Sentry.group

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,14 @@ object Config {
5858
val userOrg = "getsentry"
5959
val repoName = "sentry-android"
6060
val licence = "MIT"
61+
val licenceUrl = "http://www.opensource.org/licenses/mit-license.php"
6162
val issueTracker = "https://github.com/getsentry/sentry-android/issues"
6263
val repository = "https://github.com/getsentry/sentry-android"
6364
val devName = "Sentry Team and Contributors"
6465
val devEmail = "accounts@sentry.io"
65-
val devUser = "getsentry"
66+
val scmConnection = "scm:git:git://github.com/getsentry/sentry-android.git"
67+
val scmDevConnection = "scm:git:ssh://github.com:getsentry/sentry-android.git"
68+
val scmUrl = "https://github.com/getsentry/sentry-android/tree/master"
6669
}
6770

6871
object CompileOnly {
@@ -76,9 +79,10 @@ object Config {
7679
}
7780

7881
object Deploy {
79-
val novodaBintrayPlugin = "com.novoda:bintray-release:0.9.2"
82+
val novodaBintrayPlugin = "com.novoda:bintray-release:develop-39"
8083
val novodaBintray = "com.novoda.bintray-release"
8184
val sign = true
85+
val mavenCentralSync = true
8286
}
8387

8488
object NativePlugins {

‎gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ org.gradle.parallel=true
66

77
# Gradle will try to reuse outputs from previous builds for all builds
88
org.gradle.caching=true
9+
10+
# AndroidX required by AGP 3.6.x
11+
android.useAndroidX=true

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

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,33 @@ configure<PublishExtension> {
106106
issueTracker = Config.Sentry.issueTracker
107107
repository = Config.Sentry.repository
108108
sign = Config.Deploy.sign
109-
artifactId = "sentry-android-core"
109+
mavenCentralSync = Config.Deploy.mavenCentralSync
110+
artifactId = project.name
111+
}
112+
113+
afterEvaluate {
114+
(publishing.publications.all {
115+
(this as MavenPublication).apply {
116+
pom {
117+
licenses {
118+
license {
119+
name.set(Config.Sentry.licence)
120+
url.set(Config.Sentry.licenceUrl)
121+
}
122+
}
123+
developers {
124+
developer {
125+
id.set(Config.Sentry.userOrg)
126+
name.set(Config.Sentry.devName)
127+
email.set(Config.Sentry.devEmail)
128+
}
129+
}
130+
scm {
131+
connection.set(Config.Sentry.scmConnection)
132+
developerConnection.set(Config.Sentry.scmDevConnection)
133+
url.set(Config.Sentry.scmUrl)
134+
}
135+
}
136+
}
137+
})
110138
}

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

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,33 @@ configure<PublishExtension> {
134134
issueTracker = Config.Sentry.issueTracker
135135
repository = Config.Sentry.repository
136136
sign = Config.Deploy.sign
137-
artifactId = "sentry-android-ndk"
137+
mavenCentralSync = Config.Deploy.mavenCentralSync
138+
artifactId = project.name
139+
}
140+
141+
afterEvaluate {
142+
(publishing.publications.all {
143+
(this as MavenPublication).apply {
144+
pom {
145+
licenses {
146+
license {
147+
name.set(Config.Sentry.licence)
148+
url.set(Config.Sentry.licenceUrl)
149+
}
150+
}
151+
developers {
152+
developer {
153+
id.set(Config.Sentry.userOrg)
154+
name.set(Config.Sentry.devName)
155+
email.set(Config.Sentry.devEmail)
156+
}
157+
}
158+
scm {
159+
connection.set(Config.Sentry.scmConnection)
160+
developerConnection.set(Config.Sentry.scmDevConnection)
161+
url.set(Config.Sentry.scmUrl)
162+
}
163+
}
164+
}
165+
})
138166
}

‎sentry-android/build.gradle.kts‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,33 @@ configure<PublishExtension> {
4949
issueTracker = Config.Sentry.issueTracker
5050
repository = Config.Sentry.repository
5151
sign = Config.Deploy.sign
52-
artifactId = "sentry-android"
52+
mavenCentralSync = Config.Deploy.mavenCentralSync
53+
artifactId = project.name
54+
}
55+
56+
afterEvaluate {
57+
(publishing.publications.all {
58+
(this as MavenPublication).apply {
59+
pom {
60+
licenses {
61+
license {
62+
name.set(Config.Sentry.licence)
63+
url.set(Config.Sentry.licenceUrl)
64+
}
65+
}
66+
developers {
67+
developer {
68+
id.set(Config.Sentry.userOrg)
69+
name.set(Config.Sentry.devName)
70+
email.set(Config.Sentry.devEmail)
71+
}
72+
}
73+
scm {
74+
connection.set(Config.Sentry.scmConnection)
75+
developerConnection.set(Config.Sentry.scmDevConnection)
76+
url.set(Config.Sentry.scmUrl)
77+
}
78+
}
79+
}
80+
})
5381
}

‎sentry-core/build.gradle.kts‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,33 @@ configure<PublishExtension> {
6767
issueTracker = Config.Sentry.issueTracker
6868
repository = Config.Sentry.repository
6969
sign = Config.Deploy.sign
70-
artifactId = "sentry-core"
70+
mavenCentralSync = Config.Deploy.mavenCentralSync
71+
artifactId = project.name
72+
}
73+
74+
afterEvaluate {
75+
(publishing.publications.all {
76+
(this as MavenPublication).apply {
77+
pom {
78+
licenses {
79+
license {
80+
name.set(Config.Sentry.licence)
81+
url.set(Config.Sentry.licenceUrl)
82+
}
83+
}
84+
developers {
85+
developer {
86+
id.set(Config.Sentry.userOrg)
87+
name.set(Config.Sentry.devName)
88+
email.set(Config.Sentry.devEmail)
89+
}
90+
}
91+
scm {
92+
connection.set(Config.Sentry.scmConnection)
93+
developerConnection.set(Config.Sentry.scmDevConnection)
94+
url.set(Config.Sentry.scmUrl)
95+
}
96+
}
97+
}
98+
})
7199
}

0 commit comments

Comments
 (0)