Skip to content

Commit f9fe910

Browse files
committed
chore: fix maven publishing
1 parent e1a5b95 commit f9fe910

File tree

6 files changed

+20
-16
lines changed

6 files changed

+20
-16
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ nmcp {
3434
val composeBuild: String? by project
3535
if (composeBuild.toBoolean()) {
3636
project(":compose:desktop")
37-
project(":compose:html")
37+
// project(":compose:html")
3838
}
3939

4040
username = mavenCentralUsername
4141
password = mavenCentralPassword
42-
publicationType = "USER_MANAGED"
42+
publicationType = "AUTOMATIC"
4343
}
4444
}

compose/desktop/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ plugins {
1212
// alias(libs.plugins.detekt)
1313
}
1414

15+
description = "Compose Desktop App!"
16+
1517
kotlin {
1618
sourceSets {
1719
commonMain.dependencies {

compose/html/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ plugins {
66
// alias(libs.plugins.kobwebx.markdown)
77
}
88

9+
description = "Compose HTML App"
10+
911
kotlin {
1012
sourceSets {
1113
commonMain {

gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,7 @@ val Project.signingPassword
134134
get() = providers.gradleProperty("signingPassword")
135135

136136
val Project.hasSigningKey
137-
get() =
138-
signingKeyId.orNull.isNullOrBlank().not() &&
139-
signingKey.orNull.isNullOrBlank().not() &&
140-
signingPassword.orNull.isNullOrBlank().not()
137+
get() = signingKey.orNull.isNullOrBlank().not() && signingPassword.orNull.isNullOrBlank().not()
141138

142139
val Project.mavenCentralUsername
143140
get() = providers.gradleProperty("mavenCentralUsername")

gradle/build-logic/src/main/kotlin/plugins/publishing.gradle.kts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package plugins
22

33
import common.*
44
import common.libs
5+
import nmcp.NmcpPublishTask
56
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
67

78
plugins {
@@ -97,23 +98,22 @@ publishing {
9798
}
9899
}
99100

100-
nmcp {
101-
publishAllPublications {
102-
username = mavenCentralUsername
103-
password = mavenCentralPassword
104-
}
105-
}
106-
107101
signing {
108102
setRequired { hasSigningKey }
109103
if (hasSigningKey) {
110104
useInMemoryPgpKeys(signingKeyId.orNull, signingKey.orNull, signingPassword.orNull)
111-
// useGpgCmd()
112105
}
113106
sign(publishing.publications)
114107
// gradle.taskGraph.allTasks.any { it.name.startsWith("publish") }
115108
}
116109

110+
nmcp {
111+
publishAllPublications {
112+
username = mavenCentralUsername
113+
password = mavenCentralPassword
114+
}
115+
}
116+
117117
fun MavenPublication.configurePom() {
118118
pom {
119119
name = provider { "${project.group}:${project.name}" }
@@ -149,7 +149,10 @@ tasks {
149149
// Suppressing publication validation errors
150150
withType<GenerateModuleMetadata> { suppressedValidationErrors.add("enforced-platform") }
151151

152-
withType<Sign>().configureEach { onlyIf { hasSigningKey } }
152+
// For maven central portal publications (Might need fix in nmcp)
153+
withType<NmcpPublishTask>().configureEach { mustRunAfter(withType<Sign>()) }
154+
155+
withType<PublishToMavenRepository>().configureEach { mustRunAfter(withType<Sign>()) }
153156

154157
// For publishing kotlin native binaries
155158
withType<PublishToMavenRepository>().configureEach { mustRunAfter(withType<KotlinNativeLink>()) }

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if (nativeBuild.toBoolean()) {
3737

3838
if (composeBuild.toBoolean()) {
3939
include(":compose:desktop")
40-
include(":compose:html")
40+
// include(":compose:html")
4141
}
4242

4343
// includeBuild("misc/build") {

0 commit comments

Comments
 (0)