more jitpack improvements

Author: MastaP

.github/workflows/release.yml

@@ -30,30 +30,24 @@ jobs:
           java-version: '11'
           distribution: 'temurin'
 
-      - name: Update version in build.gradle.kts
-        run: |
-          # Remove -SNAPSHOT suffix and set the release version
-          sed -i "s/version = \".*\"/version = \"${{ github.event.inputs.version }}\"/" build.gradle.kts
-          
-          # Show the updated version
-          echo "Updated version to:"
-          grep "^version = " build.gradle.kts
-          
       - name: Build with Gradle
         run: |
           chmod +x ./gradlew
-          ./gradlew clean build -x test
+          # Pass version as property instead of modifying file
+          ./gradlew clean build -Pversion=${{ github.event.inputs.version }} -x test
+          
+          echo "Building version ${{ github.event.inputs.version }}"
           
       - name: Run tests
-        run: ./gradlew test
+        run: ./gradlew test -Pversion=${{ github.event.inputs.version }}
 
       - name: Build JAR artifacts
         run: |
-          ./gradlew jar
-          ./gradlew androidJar
-          ./gradlew jvmJar
-          ./gradlew sourcesJar
-          ./gradlew javadocJar
+          ./gradlew jar -Pversion=${{ github.event.inputs.version }}
+          ./gradlew androidJar -Pversion=${{ github.event.inputs.version }}
+          ./gradlew jvmJar -Pversion=${{ github.event.inputs.version }}
+          ./gradlew sourcesJar -Pversion=${{ github.event.inputs.version }}
+          ./gradlew javadocJar -Pversion=${{ github.event.inputs.version }}
           
       - name: List built artifacts
         run: |

build.gradle.kts

@@ -7,7 +7,8 @@ plugins {
 }
 
 group = "com.github.unicitynetwork"
-version = "1.1-SNAPSHOT"
+// JitPack will override this with the tag version via -Pversion
+version = project.findProperty("version") ?: "1.1-SNAPSHOT"
 
 repositories {
     mavenCentral()
@@ -111,40 +112,66 @@ publishing {
 
             from(components["java"])
 
-            // Add Android JAR as the main artifact (default)
-            artifact(tasks["androidJar"]) {
-                classifier = null
-            }
+            // Replace the default JAR with Android JAR as the main artifact
+            artifacts.clear()
+            artifact(tasks["androidJar"])
 
             // Add JVM JAR as a classifier variant
             artifact(tasks["jvmJar"]) {
                 classifier = "jvm"
             }
 
+            // Add sources and javadoc
+            artifact(tasks["sourcesJar"])
+            artifact(tasks["javadocJar"])
+            
             pom {
                 name.set("Unicity State Transition SDK")
                 description.set("Unicity State Transition SDK for Android and JVM")
+                url.set("https://github.com/unicitynetwork/java-state-transition-sdk")
+                
+                licenses {
+                    license {
+                        name.set("MIT License")
+                        url.set("https://opensource.org/licenses/MIT")
+                    }
+                }
 
-                // Android-compatible dependencies for main artifact
+                developers {
+                    developer {
+                        id.set("unicitynetwork")
+                        name.set("Unicity Network")
+                    }
+                }
+                
+                // Modify existing dependencies to use Android Guava
                 withXml {
-                    val dependenciesNode = asNode().appendNode("dependencies")
+                    val root = asNode()
+                    val dependenciesNodes = root.children().filter { node ->
+                        (node as? groovy.util.Node)?.name()?.toString()?.endsWith("dependencies") == true
+                    }
 
-                    configurations["implementation"].dependencies.forEach { dep ->
-                        if (dep.group != "com.google.guava") {
-                            val dependencyNode = dependenciesNode.appendNode("dependency")
-                            dependencyNode.appendNode("groupId", dep.group)
-                            dependencyNode.appendNode("artifactId", dep.name)
-                            dependencyNode.appendNode("version", dep.version)
-                            dependencyNode.appendNode("scope", "compile")
+                    dependenciesNodes.forEach { dependencies ->
+                        val depNode = dependencies as groovy.util.Node
+                        
+                        // Find and update Guava dependency
+                        depNode.children().forEach { dep ->
+                            val dependency = dep as groovy.util.Node
+                            val groupIdNode = dependency.children().find { 
+                                (it as? groovy.util.Node)?.name()?.toString()?.endsWith("groupId") == true 
+                            } as? groovy.util.Node
+                            val artifactIdNode = dependency.children().find { 
+                                (it as? groovy.util.Node)?.name()?.toString()?.endsWith("artifactId") == true 
+                            } as? groovy.util.Node
+                            
+                            if (groupIdNode?.text() == "com.google.guava" && artifactIdNode?.text() == "guava") {
+                                val versionNode = dependency.children().find { 
+                                    (it as? groovy.util.Node)?.name()?.toString()?.endsWith("version") == true 
+                                } as? groovy.util.Node
+                                versionNode?.setValue("33.0.0-android")
+                            }
                         }
                     }
-                    
-                    // Add Android-specific Guava for main artifact
-                    val guavaDep = dependenciesNode.appendNode("dependency")
-                    guavaDep.appendNode("groupId", "com.google.guava")
-                    guavaDep.appendNode("artifactId", "guava")
-                    guavaDep.appendNode("version", "33.0.0-android")
-                    guavaDep.appendNode("scope", "compile")
                 }
             }
         }