Merge pull request #4 from StylianosGakis/stylianos/renamable-publica…

…tion-name Allow the publication name to be altered from the extension
GradleUp · Mar 30, 2024 · 0b27677 · 0b27677
2 parents e3c02f0 + 9a67540
commit 0b27677
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/src/main/kotlin/nmcp/NmcpAggregation.kt b/src/main/kotlin/nmcp/NmcpAggregation.kt
@@ -10,6 +10,7 @@ class NmcpAggregation(
     val username: Property<String>,
     val password: Property<String>,
     val publicationType: Property<String>,
+    val publicationName: Property<String>,
     ) {
     fun project(path: String) {
         project.dependencies.add(configuration.name, project.dependencies.project(mapOf("path" to  path)))

diff --git a/src/main/kotlin/nmcp/NmcpExtension.kt b/src/main/kotlin/nmcp/NmcpExtension.kt
@@ -72,6 +72,7 @@ class NmcpExtension(private val project: Project) {
             it.username.set(spec.username)
             it.password.set(spec.password)
             it.publicationType.set(spec.publicationType)
+            it.publicationName.set(spec.publicationName.orElse("${project.name}-${project.version}.zip"))
         }
 
         publishAllPublicationsToCentralPortal.configure {
@@ -86,6 +87,7 @@ class NmcpExtension(private val project: Project) {
             project.objects.property(String::class.java),
             project.objects.property(String::class.java),
             project.objects.property(String::class.java),
+            project.objects.property(String::class.java),
         )
         action.execute(spec)
 
@@ -141,6 +143,7 @@ class NmcpExtension(private val project: Project) {
             project.objects.property(String::class.java),
             project.objects.property(String::class.java),
             project.objects.property(String::class.java),
+            project.objects.property(String::class.java),
         )
 
         action.execute(aggregation)
@@ -164,6 +167,7 @@ class NmcpExtension(private val project: Project) {
             it.username.set(aggregation.username)
             it.password.set(aggregation.password)
             it.publicationType.set(aggregation.publicationType)
+            it.publicationName.set(aggregation.publicationName)
         }
     }
 
@@ -180,6 +184,7 @@ class NmcpExtension(private val project: Project) {
             project.objects.property(String::class.java),
             project.objects.property(String::class.java),
             project.objects.property(String::class.java),
+            project.objects.property(String::class.java),
         )
         action.execute(spec)
 
@@ -199,6 +204,7 @@ class NmcpExtension(private val project: Project) {
             aggregation.username.set(spec.username)
             aggregation.password.set(spec.password)
             aggregation.publicationType.set(spec.publicationType)
+            aggregation.publicationName.set(spec.publicationName)
         }
     }
 }
diff --git a/src/main/kotlin/nmcp/NmcpPublishTask.kt b/src/main/kotlin/nmcp/NmcpPublishTask.kt
@@ -29,6 +29,9 @@ abstract class NmcpPublishTask : DefaultTask() {
     @get:Optional
     abstract val publicationType: Property<String>
 
+    @get:Input
+    abstract val publicationName: Property<String>
+
     @TaskAction
     fun taskAction() {
         val username = username.get()
@@ -48,7 +51,7 @@ abstract class NmcpPublishTask : DefaultTask() {
         val body = MultipartBody.Builder()
             .addFormDataPart(
                 "bundle",
-                "publication.zip",
+                publicationName.get(),
                 inputFile.get().asFile.asRequestBody("application/zip".toMediaType())
             )
             .build()

diff --git a/src/main/kotlin/nmcp/NmcpSpec.kt b/src/main/kotlin/nmcp/NmcpSpec.kt
@@ -6,4 +6,5 @@ class NmcpSpec(
     val username: Property<String>,
     val password: Property<String>,
     val publicationType: Property<String>,
+    val publicationName: Property<String>,
 )