Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea
.gradle
build
build
.kmp
1 change: 1 addition & 0 deletions src/main/kotlin/nmcp/NmcpAggregationExtension.kt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ abstract class NmcpAggregationExtension(private val project: Project) {
project.registerPublishTask(
taskName = "publishAggregationToCentralPortal",
inputFile = zipTaskProvider.flatMap { it.archiveFile },
artifactId = project.provider { "${project.name}" },
spec = spec
)
}
Expand Down
7 changes: 7 additions & 0 deletions src/main/kotlin/nmcp/NmcpExtension.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import nmcp.internal.withRequiredPlugin
import org.gradle.api.Action
import org.gradle.api.Project
import org.gradle.api.publish.PublishingExtension
import org.gradle.api.publish.maven.MavenPublication
import org.gradle.api.tasks.bundling.Zip

@GExtension(pluginId = "com.gradleup.nmcp")
Expand Down Expand Up @@ -80,9 +81,15 @@ open class NmcpExtension(private val project: Project) {
it.archiveFileName.set("publication$capitalized.zip")
}

val artifactId = if (publication is MavenPublication) {
project.provider { publication.artifactId }
} else {
project.provider { "${project.name}"}
}
val publishTaskProvider = project.registerPublishTask(
taskName = "publish${capitalized}PublicationToCentralPortal",
inputFile = zipTaskProvider.flatMap { it.archiveFile },
artifactId = artifactId,
spec = spec
)

Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/nmcp/internal/task/publish.kt
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,10 @@ private fun verifyStatus(
internal fun Project.registerPublishTask(
taskName: String,
inputFile: Provider<RegularFile>,
artifactId: Provider<String>,
spec: CentralPortalOptions
): TaskProvider<PublishTask> {
val defaultPublicationName = "${project.name}-${project.version}.zip"
val defaultPublicationName = artifactId.map { "${project.group}:${it}:${project.version}.zip" }
return registerPublishTask(
taskName = taskName,
inputFile = inputFile,
Expand Down