Skip to content

Commit 935c2e8

Browse files
committed
chore: nmcp and jte plugin changes
1 parent 24e0c23 commit 935c2e8

File tree

8 files changed

+30
-34
lines changed

8 files changed

+30
-34
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ The next version will be based on the semantic version scope (`major`, `minor`,
291291
$ export ORG_GRADLE_PROJECT_signingInMemoryKey=$(gpg --export-secret-keys --armor ${ORG_GRADLE_PROJECT_signingInMemoryKeyId} | grep -v '\-\-' | grep -v '^=.' | tr -d '\n')
292292

293293
# For aggregated publication (preferred) to Central
294-
$ ./gradlew publishAggregatedPublicationToCentralPortal
294+
$ ./gradlew publishAggregationToCentralPortal
295295

296296
# For all publications (separate publications)
297297
$ ./gradlew publishAllPublicationsToCentralPortal

build.gradle.kts

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ plugins {
88

99
description = "Kotlin Multiplatform Playground!"
1010

11+
nmcp {
12+
centralPortal {
13+
username = mavenCentralUsername
14+
password = mavenCentralPassword
15+
publishingType = "AUTOMATIC"
16+
}
17+
}
18+
1119
dependencies {
1220
dokka(project(":shared"))
1321
dokka(project(":meta:ksp:processor"))
@@ -17,26 +25,16 @@ dependencies {
1725
dokka(project(":backend:profiling"))
1826
dokka(project(":backend:security"))
1927
dokka(project(":web"))
20-
}
21-
22-
nmcp {
23-
publishAggregation {
24-
project(":shared")
25-
project(":dep-mgmt:bom")
26-
project(":dep-mgmt:catalog")
27-
project(":meta:ksp:processor")
28-
project(":meta:compiler:plugin")
29-
project(":backend:jvm")
30-
project(":backend:data")
31-
project(":backend:profiling")
32-
project(":backend:security")
33-
project(":web")
34-
// project(":backend:native")
35-
// project(":compose:cmp")
36-
// project(":compose:html")
3728

38-
username = mavenCentralUsername
39-
password = mavenCentralPassword
40-
publicationType = "AUTOMATIC"
41-
}
29+
// nmcpAggregation(project(":shared"))
30+
// nmcpAggregation(project(":dep-mgmt:bom"))
31+
// nmcpAggregation(project(":dep-mgmt:catalog"))
32+
// nmcpAggregation(project(":meta:ksp:processor"))
33+
// nmcpAggregation(project(":meta:compiler:plugin"))
34+
// nmcpAggregation(project(":backend:jvm"))
35+
// nmcpAggregation(project(":backend:data"))
36+
// nmcpAggregation(project(":backend:profiling"))
37+
// nmcpAggregation(project(":backend:security"))
38+
// nmcpAggregation(project(":web"))
39+
// nmcpAggregation(// project(":backend:native")
4240
}

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ kotlin.native.ignoreDisabledTargets=true
3434
kotlin.native.enableKlibsCrossCompilation=true
3535
# kotlin.native.toolchain.enabled=false
3636
# kotlin.mpp.enableCInteropCommonization=true
37+
# kotlin.mpp.commonizerJvmArgs=-Xmx6g
3738

3839
## Dokka
3940
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

gradle/build-logic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ val dslJavaVersion = libs.versions.kotlin.dsl.jvmtarget
1919

2020
idea {
2121
module {
22-
isDownloadJavadoc = true
22+
isDownloadJavadoc = false
2323
isDownloadSources = true
2424
}
2525
}

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.publishing.gradle.kts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import com.google.cloud.tools.jib.gradle.JibExtension
22
import common.*
33
import java.time.Year
4-
import nmcp.NmcpPublishTask
54
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
65

76
plugins {
@@ -116,7 +115,7 @@ signing {
116115
}
117116

118117
nmcp {
119-
publishAllPublications {
118+
centralPortal {
120119
username = mavenCentralUsername
121120
password = mavenCentralPassword
122121
}
@@ -157,9 +156,6 @@ tasks {
157156
// Suppressing publication validation errors
158157
withType<GenerateModuleMetadata> { suppressedValidationErrors.add("enforced-platform") }
159158

160-
// For maven central portal publications - https://github.com/gradle/gradle/issues/26091
161-
withType<NmcpPublishTask>().configureEach { mustRunAfter(withType<Sign>()) }
162-
163159
withType<AbstractPublishToMaven>().configureEach { mustRunAfter(withType<Sign>()) }
164160

165161
// For publishing kotlin native binaries

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.root.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ plugins {
1212
com.github.`ben-manes`.versions
1313
dev.iurysouza.modulegraph
1414
com.dorongold.`task-tree`
15+
id("com.gradleup.nmcp.aggregation")
1516
// id("gg.jte.gradle")
1617
// com.autonomousapps.`dependency-analysis`
1718
}

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kotlin-jvmtarget = "21"
66
kotlin-dsl-jvmtarget = "21"
77
kotlin-api-version = "2.1"
88
kotlin-lang-version = "2.1"
9-
gradle = "8.14-rc-3"
9+
gradle = "8.14"
1010
java-vendor = "Oracle"
1111
java-jvmArguments = "--enable-preview"
1212
java-addModules = "jdk.incubator.vector"
@@ -56,7 +56,7 @@ kaml = "0.77.0"
5656
snakeyaml-engine-kmp = "3.1.1"
5757
konsist = "0.17.3"
5858
decoroutinator = "2.4.9"
59-
spring-boot = "3.4.4"
59+
spring-boot = "3.4.5"
6060
spring-depmgmt = "1.1.7"
6161
ktor = "3.1.2"
6262
ktor-cohort = "2.7.0"
@@ -79,7 +79,7 @@ cache4k = "0.14.0"
7979
intellij-coverage = "1.0.766"
8080
intellij-markdown = "0.7.3"
8181
jgit = "7.2.0.202503040940-r"
82-
jte = "3.2.0"
82+
jte = "3.2.1"
8383
jimfs = "1.3.0"
8484
sshj = "0.39.0"
8585
jsch = "0.2.25"
@@ -217,8 +217,8 @@ swagger-style = "https://unpkg.com/swagger-ui-themes@3.0.1/them
217217
# Plugin versions
218218
benmanes = "0.52.0"
219219
foojay-resolver = "0.10.0"
220-
gradle-develocity = "4.0"
221-
nmcp = "0.0.9"
220+
gradle-develocity = "4.0.1"
221+
nmcp = "0.1.1"
222222
nexus-publish = "2.0.0"
223223
vanniktech-publish = "0.31.0"
224224
gradle-publish = "1.3.1"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-rc-3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)