Updated licenses in ProjectBuilder, changed from withType to maybeCreate

Author: mtctx

README.md

@@ -106,7 +106,7 @@ unipub {
         inceptionYear = "2025"
         url = "https://github.com/example/awesome-lib"
 
-        licenses = listOf(License.APACHE_2_0)
+        licenses(License.APACHE_2_0)
 
         scm {
             url = "https://github.com/example/awesome-lib"
@@ -153,10 +153,7 @@ unipub {
         url = "https://github.com/corporate/awesome-library"
 
         // Multiple licenses
-        licenses = listOf(
-            License.APACHE_2_0,
-            License.MIT
-        )
+        licenses(License.APACHE_2_0, License.MIT)
 
         scm {
             url = "https://github.com/corporate/awesome-library"

build.gradle.kts

@@ -25,7 +25,7 @@ plugins {
 }
 
 group = "dev.mtctx.unipub"
-version = "1.0.12"
+version = "1.0.13"
 
 repositories {
     mavenCentral()

src/main/kotlin/dev/mtctx/unipub/UniPub.kt

@@ -31,7 +31,6 @@ import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.register
-import org.gradle.kotlin.dsl.withType
 import org.gradle.plugins.signing.SigningExtension
 import java.io.File
 import java.nio.file.Paths
@@ -156,69 +155,69 @@ class UniPub : Plugin<Project> {
                 }
             }
 
-            publications.withType<MavenPublication> {
-                groupId = projectInfo.groupId
-                artifactId = projectInfo.id
-                version = projectInfo.version
-
-                artifactInfos.forEach { artifactInfo ->
-                    when (artifactInfo) {
-                        is ArtifactInfo.Component -> {
-                            val component = components.findByName(artifactInfo.componentName)
-                            if (component != null) {
-                                from(component)
-                            } else {
-                                logger.warn("Component '${artifactInfo.componentName}' not found during publication")
-                            }
-                        }
+            val publication = publications.maybeCreate("mavenJava", MavenPublication::class.java)
+
+            publication.groupId = projectInfo.groupId
+            publication.artifactId = projectInfo.id
+            publication.version = projectInfo.version
 
-                        is ArtifactInfo.Task ->
-                            try {
-                                artifact(artifactInfo.task)
-                            } catch (e: UnknownTaskException) {
-                                logger.error("Task not found: ${artifactInfo.task.name}")
-                                logger.trace("Stacktrace: ", e)
-                            }
-
-                        is ArtifactInfo.File ->
-                            artifact(artifactInfo.file) {
-                                artifactInfo.classifier?.let { classifier = it }
-                            }
-
-                        is ArtifactInfo.Custom ->
-                            artifactInfo.configure(this)
+            artifactInfos.forEach { artifactInfo ->
+                when (artifactInfo) {
+                    is ArtifactInfo.Component -> {
+                        val component = components.findByName(artifactInfo.componentName)
+                        if (component != null) {
+                            publication.from(component)
+                        } else {
+                            logger.warn("Component '${artifactInfo.componentName}' not found during publication")
+                        }
                     }
+
+                    is ArtifactInfo.Task ->
+                        try {
+                            publication.artifact(artifactInfo.task)
+                        } catch (e: UnknownTaskException) {
+                            logger.error("Task not found: ${artifactInfo.task.name}")
+                            logger.trace("Stacktrace: ", e)
+                        }
+
+                    is ArtifactInfo.File ->
+                        publication.artifact(artifactInfo.file) {
+                            artifactInfo.classifier?.let { classifier = it }
+                        }
+
+                    is ArtifactInfo.Custom ->
+                        artifactInfo.configure(publication)
                 }
+            }
 
-                pom {
-                    name.set(projectInfo.name)
-                    description.set(projectInfo.description)
-                    inceptionYear.set(projectInfo.inceptionYear)
-                    url.set(projectInfo.url)
-                    licenses {
-                        projectInfo.licenses.forEach { licenseInfo ->
-                            license {
-                                name.set(licenseInfo.name)
-                                url.set(licenseInfo.url)
-                                distribution.set(licenseInfo.distribution.value)
-                            }
+            publication.pom {
+                name.set(projectInfo.name)
+                description.set(projectInfo.description)
+                inceptionYear.set(projectInfo.inceptionYear)
+                url.set(projectInfo.url)
+                licenses {
+                    projectInfo.licenses.forEach { licenseInfo ->
+                        license {
+                            name.set(licenseInfo.name)
+                            url.set(licenseInfo.url)
+                            distribution.set(licenseInfo.distribution.value)
                         }
                     }
-                    developers {
-                        developerInfos.forEach { developerInfo ->
-                            developer {
-                                name.set(developerInfo.name)
-                                email.set(developerInfo.email)
-                                organization.set(developerInfo.organization)
-                                organizationUrl.set(developerInfo.organizationUrl)
-                            }
+                }
+                developers {
+                    developerInfos.forEach { developerInfo ->
+                        developer {
+                            name.set(developerInfo.name)
+                            email.set(developerInfo.email)
+                            organization.set(developerInfo.organization)
+                            organizationUrl.set(developerInfo.organizationUrl)
                         }
                     }
-                    scm {
-                        url.set(projectInfo.scm.url)
-                        connection.set(projectInfo.scm.connection)
-                        developerConnection.set(projectInfo.scm.developerConnection)
-                    }
+                }
+                scm {
+                    url.set(projectInfo.scm.url)
+                    connection.set(projectInfo.scm.connection)
+                    developerConnection.set(projectInfo.scm.developerConnection)
                 }
             }
         }

src/main/kotlin/dev/mtctx/unipub/dsl/DSL.kt

@@ -56,9 +56,11 @@ class ProjectBuilder {
     var inceptionYear: String = ""
     var groupId: String = ""
     var url: String = ""
-    var licenses: List<License> = emptyList()
+    private var licenses: MutableList<License> = mutableListOf()
     private var scmBuilder: ScmBuilder? = null
 
+    fun licenses(vararg licenses: License) = this.licenses.addAll(licenses)
+
     fun scm(block: ScmBuilder.() -> Unit) {
         val builder = ScmBuilder()
         builder.block()