Skip to content

Commit 74ace72

Browse files
committed
migrates to sonotype publications
Signed-off-by: Oleh Dokuka <[email protected]>
1 parent d4462ea commit 74ace72

File tree

6 files changed

+36
-51
lines changed

6 files changed

+36
-51
lines changed

build.gradle.kts

Lines changed: 31 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import com.jfrog.bintray.gradle.*
18-
import com.jfrog.bintray.gradle.tasks.*
19-
import org.gradle.api.publish.maven.internal.artifact.*
17+
import org.gradle.api.publish.maven.internal.artifact.FileBasedMavenArtifact
2018
import org.jetbrains.kotlin.gradle.dsl.*
2119
import org.jetbrains.kotlin.gradle.plugin.mpp.*
2220
import org.jetbrains.kotlin.konan.target.*
@@ -41,7 +39,6 @@ plugins {
4139
id("com.github.ben-manes.versions")
4240

4341
//needed to add classpath to script
44-
id("com.jfrog.bintray") apply false
4542
id("com.jfrog.artifactory") apply false
4643
}
4744

@@ -291,51 +288,23 @@ if (bintrayUser != null && bintrayKey != null) {
291288
val sonatypePassword: String? by project
292289
if (sonatypeUsername != null && sonatypePassword != null) {
293290
subprojects {
294-
plugins.withId("com.jfrog.bintray") {
295-
extensions.configure<BintrayExtension> {
296-
user = bintrayUser
297-
key = bintrayKey
298-
println("Bintray: ${publicationNames.contentToString()}")
299-
setPublications(*publicationNames)
300-
301-
publish = true
302-
override = true
303-
pkg.apply {
304-
305-
repo = "RSocket"
306-
name = "rsocket-kotlinx"
307-
308-
setLicenses("Apache-2.0")
309-
310-
issueTrackerUrl = "https://github.com/rsocket/rsocket-kotlin/issues"
311-
websiteUrl = "https://github.com/rsocket/rsocket-kotlin"
312-
vcsUrl = "https://github.com/rsocket/rsocket-kotlin.git"
313-
314-
githubRepo = "rsocket/rsocket-kotlin"
315-
githubReleaseNotesFile = "README.md"
316-
317-
version.apply {
318-
name = project.version.toString()
319-
vcsTag = project.version.toString()
320-
released = java.util.Date().toString()
321-
322-
// gpg.sign = true
323-
324-
// mavenCentralSync.apply {
325-
// user = sonatypeUsername
326-
// password = sonatypePassword
327-
// }
291+
plugins.withType<MavenPublishPlugin> {
292+
plugins.withType<SigningPlugin> {
293+
extensions.configure<SigningExtension> {
294+
//requiring signature if there is a publish task that is not to MavenLocal
295+
isRequired = gradle.taskGraph.allTasks.any {
296+
it.name.toLowerCase()
297+
.contains("publish") && !it.name.contains("MavenLocal")
328298
}
329-
}
330-
}
331299

332-
//workaround for https://github.com/bintray/gradle-bintray-plugin/issues/229
333-
tasks.withType<BintrayUploadTask> {
334-
val names = publicationNames
335-
names.forEach { dependsOn("publish${it.capitalize()}PublicationToMavenLocal") }
336-
doFirst {
300+
val signingKey: String? by project
301+
val signingPassword: String? by project
302+
303+
useInMemoryPgpKeys(signingKey, signingPassword)
304+
val names = publicationNames
337305
val publishing: PublishingExtension by project.extensions
338-
publishing.publications
306+
afterEvaluate {
307+
publishing.publications
339308
.filterIsInstance<MavenPublication>()
340309
.filter { it.name in names }
341310
.forEach { publication ->
@@ -345,7 +314,23 @@ if (bintrayUser != null && bintrayKey != null) {
345314
override fun getDefaultExtension() = "module"
346315
})
347316
}
317+
sign(publication)
348318
}
319+
320+
}
321+
}
322+
323+
extensions.configure<PublishingExtension> {
324+
repositories {
325+
maven {
326+
name = "sonatype"
327+
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2")
328+
credentials {
329+
username = sonatypeUsername
330+
password = sonatypePassword
331+
}
332+
}
333+
}
349334
}
350335
}
351336
}

rsocket-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ plugins {
1818
kotlin("multiplatform")
1919
id("kotlinx-atomicfu")
2020

21+
signing
2122
id("maven-publish")
22-
id("com.jfrog.bintray")
2323
id("com.jfrog.artifactory")
2424
}
2525

rsocket-transport-ktor/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
plugins {
1818
kotlin("multiplatform")
1919

20+
signing
2021
id("maven-publish")
21-
id("com.jfrog.bintray")
2222
id("com.jfrog.artifactory")
2323
}
2424

rsocket-transport-ktor/rsocket-transport-ktor-client/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
plugins {
1818
kotlin("multiplatform")
1919

20+
signing
2021
id("maven-publish")
21-
id("com.jfrog.bintray")
2222
id("com.jfrog.artifactory")
2323
}
2424

rsocket-transport-ktor/rsocket-transport-ktor-server/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
plugins {
1818
kotlin("multiplatform")
1919

20+
signing
2021
id("maven-publish")
21-
id("com.jfrog.bintray")
2222
id("com.jfrog.artifactory")
2323
}
2424

rsocket-transport-local/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
plugins {
1818
kotlin("multiplatform")
1919

20+
signing
2021
id("maven-publish")
21-
id("com.jfrog.bintray")
2222
id("com.jfrog.artifactory")
2323
}
2424

0 commit comments

Comments
 (0)