Fix gradle plugin maven publication coordinates

johnsonlee · Oct 6, 2021 · ed56a9d · ed56a9d
1 parent d15d76c
commit ed56a9d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/main/kotlin/io/johnsonlee/gradle/publish/AbstractLibraryPublishPlugin.kt b/src/main/kotlin/io/johnsonlee/gradle/publish/AbstractLibraryPublishPlugin.kt
@@ -91,11 +91,19 @@ abstract class AbstractLibraryPublishPlugin : Plugin<Project> {
 
     fun MavenPublication.configure(project: Project) {
         artifactId = project.name
+        configureGroupId(project)
+        configureVersion(project)
+    }
+
+    fun MavenPublication.configureGroupId(project: Project) {
         groupId = listOf(project.group, project.rootProject.group)
                 .map(Any::toString)
                 .filterNot { it == project.rootProject.name || it.startsWith("${project.rootProject.name}.") }
                 .firstOrNull(String::isNotBlank)
                 ?: throw GradleException("group id of $project has not been configured")
+    }
+
+    fun MavenPublication.configureVersion(project: Project) {
         version = listOf(project.version, project.rootProject.version)
                 .map(Any::toString)
                 .firstOrNull { it != DEFAULT_VERSION }

diff --git a/src/main/kotlin/io/johnsonlee/gradle/publish/GradlePluginPublishPlugin.kt b/src/main/kotlin/io/johnsonlee/gradle/publish/GradlePluginPublishPlugin.kt
@@ -28,6 +28,8 @@ class GradlePluginPublishPlugin : AbstractLibraryPublishPlugin() {
             }
 
             withType<MavenPublication>().configureEach {
+                configureGroupId(project)
+                configureVersion(project)
                 artifact(javadocJar)
                 artifact(sourcesJar)
                 config.invoke(this)