Skip to content

Commit 53ce636

Browse files
committed
Migrate to bintray and update versions
1 parent 50dce63 commit 53ce636

File tree

2 files changed

+24
-31
lines changed

2 files changed

+24
-31
lines changed

build.gradle.kts

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ plugins {
88
application
99
`maven-publish`
1010
signing
11-
id("org.jetbrains.dokka") version "1.4.30"
11+
id("org.jetbrains.dokka") version "1.4.32"
1212
id("com.avast.gradle.docker-compose") version "0.14.3"
1313
id("com.github.ben-manes.versions") version "0.38.0"
14+
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
1415
}
1516

1617
group = "org.radarbase"
@@ -28,9 +29,6 @@ application {
2829

2930
repositories {
3031
mavenCentral()
31-
// Temporary until Dokka is fully published on maven central.
32-
// https://github.com/Kotlin/kotlinx.html/issues/81
33-
maven(url = "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
3432
}
3533

3634
sourceSets {
@@ -236,28 +234,6 @@ publishing {
236234
}
237235
}
238236
}
239-
240-
repositories {
241-
fun Project.propertyOrEnv(propertyName: String, envName: String): String? {
242-
return if (hasProperty(propertyName)) {
243-
property(propertyName)?.toString()
244-
} else {
245-
System.getenv(envName)
246-
}
247-
}
248-
249-
maven {
250-
name = "OSSRH"
251-
credentials {
252-
username = propertyOrEnv("ossrh.user", "OSSRH_USER")
253-
password = propertyOrEnv("ossrh.password", "OSSRH_PASSWORD")
254-
}
255-
256-
val releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
257-
val snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/")
258-
url = if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl
259-
}
260-
}
261237
}
262238

263239
signing {
@@ -268,7 +244,24 @@ signing {
268244
}
269245

270246
tasks.withType<Sign> {
271-
onlyIf { gradle.taskGraph.hasTask("${project.path}:publish") }
247+
onlyIf { gradle.taskGraph.hasTask(project.tasks["publish"]) }
248+
}
249+
250+
fun Project.propertyOrEnv(propertyName: String, envName: String): String? {
251+
return if (hasProperty(propertyName)) {
252+
property(propertyName)?.toString()
253+
} else {
254+
System.getenv(envName)
255+
}
256+
}
257+
258+
nexusPublishing {
259+
repositories {
260+
sonatype {
261+
username.set(propertyOrEnv("ossrh.user", "OSSRH_USER"))
262+
password.set(propertyOrEnv("ossrh.password", "OSSRH_PASSWORD"))
263+
}
264+
}
272265
}
273266

274267
fun isNonStable(version: String): Boolean {

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ kotlinVersion=1.4.32
22
kotlin.code.style=official
33

44
avroVersion=1.10.2
5-
jacksonVersion=2.12.2
5+
jacksonVersion=2.12.3
66
hadoopVersion=3.3.0
77
jCommanderVersion=1.81
88
almworksVersion=1.1.2
99
junitVersion=5.7.1
10-
minioVersion=8.2.0
11-
jedisVersion=3.5.2
10+
minioVersion=8.2.1
11+
jedisVersion=3.6.0
1212
slf4jVersion=1.7.30
13-
azureStorageVersion=12.10.2
13+
azureStorageVersion=12.11.0
1414
radarSchemasVersion=0.6.0
1515
mockitoVersion=3.8.0
1616
dokkaVersion=1.4.30

0 commit comments

Comments
 (0)