Skip to content

Commit 9dda974

Browse files
committed
Fix2
1 parent 87753f4 commit 9dda974

File tree

3 files changed

+22
-8
lines changed

3 files changed

+22
-8
lines changed

kotlin-jupyter-publish/src/main/kotlin/org/jetbrains/kotlinx/jupyter/plugin/ApiPublishGradlePlugin.kt

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jetbrains.kotlinx.jupyter.plugin
22

3+
import de.marcphilipp.gradle.nexus.NexusPublishPlugin
34
import org.gradle.api.Plugin
45
import org.gradle.api.Project
56
import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
@@ -11,6 +12,7 @@ class ApiPublishGradlePlugin : Plugin<Project> {
1112
target.pluginManager.run {
1213
apply(DokkaPlugin::class.java)
1314
apply(MavenPublishPlugin::class.java)
15+
apply(NexusPublishPlugin::class.java)
1416
apply(SigningPlugin::class.java)
1517
}
1618
}

kotlin-jupyter-publish/src/main/kotlin/org/jetbrains/kotlinx/jupyter/publishing/nexusUtil.kt

+12-8
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@ fun getNexusPassword(): String? {
1717
return System.getenv("SONATYPE_PASSWORD")
1818
}
1919

20+
fun Project.configureNexusPublish() {
21+
extensions.configure<NexusPublishExtension>("nexusPublishing") {
22+
repositories {
23+
sonatype {
24+
username.set(getNexusUser())
25+
password.set(getNexusPassword())
26+
}
27+
}
28+
}
29+
}
30+
2031
fun Project.applyNexusPlugin() {
2132
pluginManager.run {
2233
apply(NexusStagingPlugin::class.java)
@@ -30,12 +41,5 @@ fun Project.applyNexusPlugin() {
3041
repositoryDescription = "kotlin-jupyter project, v. ${project.version}"
3142
}
3243

33-
extensions.configure<NexusPublishExtension>("nexusPublishing") {
34-
repositories {
35-
sonatype {
36-
username.set(getNexusUser())
37-
password.set(getNexusPassword())
38-
}
39-
}
40-
}
44+
configureNexusPublish()
4145
}

kotlin-jupyter-publish/src/main/kotlin/org/jetbrains/kotlinx/jupyter/publishing/publication.kt

+8
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,20 @@ fun Project.addPublication(configuration: ArtifactPublication.() -> Unit) {
109109
}
110110

111111
val thisProjectName = project.name
112+
val thisProject = project
112113

113114
if (rootProject.findProperty("isMainProject") == true) {
114115
rootProject.tasks {
115116
named("publishLocal") {
116117
dependsOn(":$thisProjectName:publishAllPublicationsToLocalBuildRepository")
117118
}
119+
120+
if (settings.publishToSonatype) {
121+
thisProject.configureNexusPublish()
122+
named("publishToSonatype") {
123+
dependsOn(":$thisProjectName:publishToSonatype")
124+
}
125+
}
118126
}
119127
}
120128

0 commit comments

Comments
 (0)