Use nmcp plugin

Author: egorikftp

.github/workflows/cli-release.yml

@@ -46,17 +46,8 @@ jobs:
           echo "IS_SNAPSHOT=$IS_SNAPSHOT" >> $GITHUB_ENV
           echo "PRE_RELEASE_FLAG=$PRE_RELEASE_FLAG" >> $GITHUB_ENV
 
-      #      - name: Build CLI distribution
-      #        run: ./gradlew buildCLI
-
-      - name: Publish to Maven Central
-        if: env.IS_SNAPSHOT == 'false'
-        run: ./gradlew :tools:cli:publish
-        env:
-          OSSRH_USERNAME: ${{ secrets.ORG_MAVEN_CENTRAL_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.ORG_MAVEN_CENTRAL_PASSWORD }}
-          PGP_KEY: ${{ secrets.PGP_KEY }}
-          PGP_PASS: ${{ secrets.PGP_PAS }}
+      - name: Build CLI distribution
+        run: ./gradlew buildCLI
 
       - name: Clean up existing release
         run: |
@@ -71,6 +62,15 @@ jobs:
         run: |
           gh release create ${{ env.RELEASE_TAG }} tools/cli/build/distributions/*.zip --generate-notes ${{ env.PRE_RELEASE_FLAG }}
 
+      - name: Publish to Maven Central
+        if: env.IS_SNAPSHOT == 'false'
+        run: ./gradlew publishAggregationToCentralPortal
+        env:
+          OSSRH_USERNAME: ${{ secrets.ORG_MAVEN_CENTRAL_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.ORG_MAVEN_CENTRAL_PASSWORD }}
+          PGP_KEY: ${{ secrets.PGP_KEY }}
+          PGP_PASS: ${{ secrets.PGP_PAS }}
+
       - name: Update Homebrew formula
         uses: mislav/bump-homebrew-formula-action@v3
         if: env.IS_SNAPSHOT == 'false'
@@ -82,31 +82,3 @@ jobs:
           download-url: https://github.com/ComposeGears/Valkyrie/releases/download/${{ env.RELEASE_TAG }}/valkyrie-cli-${{ env.VERSION_NAME }}.zip
           commit-message: |
             Bump {{formulaName}} {{version}}
-
-#      - name: Clean up existing release
-#        run: |
-#          gh release view ${{ env.RELEASE_TAG }} && gh release delete ${{ env.RELEASE_TAG }} -y --cleanup-tag
-#
-#      - name: Clean up previous snapshot release
-#        if: env.IS_SNAPSHOT == 'false'
-#        run: |
-#          gh release view cli-${{ env.VERSION_NAME }}-SNAPSHOT && gh release delete cli-${{ env.VERSION_NAME }}-SNAPSHOT -y --cleanup-tag
-#
-#      - name: Create GitHub release
-#        run: |
-#          gh release create ${{ env.RELEASE_TAG }} tools/cli/build/distributions/*.zip --generate-notes ${{ env.PRE_RELEASE_FLAG }}
-#
-#      - name: Update Homebrew formula
-#        uses: mislav/bump-homebrew-formula-action@v3
-#        if: env.IS_SNAPSHOT == 'false'
-#        with:
-#          formula-name: valkyrie
-#          formula-path: Formula/valkyrie.rb
-#          tag-name: ${{ env.RELEASE_TAG }}
-#          homebrew-tap: ComposeGears/homebrew-repo
-#          download-url: https://github.com/ComposeGears/Valkyrie/releases/download/${{ env.RELEASE_TAG }}/valkyrie-cli-${{ env.VERSION_NAME }}.zip
-#          commit-message: |
-#            Bump {{formulaName}} {{version}}
-#        env:
-#          COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}
-

build.gradle.kts

@@ -18,6 +18,7 @@ plugins {
     alias(libs.plugins.buildconfig) apply false
     alias(libs.plugins.shadow) apply false
     alias(libs.plugins.spotless) apply false
+    alias(libs.plugins.nmcp)
 }
 
 allprojects {
@@ -87,3 +88,14 @@ allprojects {
         useJUnitPlatform()
     }
 }
+
+nmcpAggregation {
+    centralPortal {
+        username = System.getenv("OSSRH_USERNAME")
+        password = System.getenv("OSSRH_PASSWORD")
+        publishingType = "USER_MANAGED"
+    }
+
+    // Publish all projects that apply the 'maven-publish' plugin
+    publishAllProjectsProbablyBreakingProjectIsolation()
+}

gradle/libs.versions.toml

@@ -59,6 +59,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
+nmcp = "com.gradleup.nmcp.aggregation:1.3.0"
 shadow = "com.gradleup.shadow:9.2.2"
 spotless = "com.diffplug.spotless:8.0.0"
 

tools/cli/build.gradle.kts

@@ -9,6 +9,11 @@ plugins {
     application
 }
 
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
 val baseName = "valkyrie"
 val versionName = cli.versions.cli.version.get()
 
@@ -126,11 +131,13 @@ publishing {
             version = versionName
 
             from(components["shadow"])
+            artifact(tasks["sourcesJar"])
+            artifact(tasks["javadocJar"])
 
             pom {
                 name = "Valkyrie CLI"
                 description = "CLI tool for converting SVG/XML to Compose ImageVector and managing icon packs"
-                url = "https://github.com/composegears/valkyrie"
+                url = "https://github.com/ComposeGears/Valkyrie"
 
                 licenses {
                     license {
@@ -142,18 +149,16 @@ publishing {
                 scm {
                     connection = "scm:git:git://github.com/composegears/valkyrie.git"
                     developerConnection = "scm:git:ssh://github.com:composegears/valkyrie.git"
-                    url = "https://github.com/composegears/valkyrie"
+                    url = "https://github.com/ComposeGears/Valkyrie"
                 }
-            }
-        }
-    }
-    repositories {
-        maven {
-            url = uri("https://central.sonatype.com/publishing/deployments")
 
-            credentials {
-                username = System.getenv("OSSRH_USERNAME")
-                password = System.getenv("OSSRH_PASSWORD")
+                developers {
+                    developer {
+                        id = "composegears"
+                        name = "ComposeGears"
+                        url = "https://github.com/ComposeGears"
+                    }
+                }
             }
         }
     }