Fix maven builds (#78)

* fix the licenses for maven builds * fix the gradle syntax * use license instead of eula * avoid setting up the name and url within the pom object * remove eula for now * use gradle 8.4 * add the eula back
radixdlt · Oct 31, 2023 · e5fef1c · e5fef1c
1 parent 7ef54e1
commit e5fef1c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -355,7 +355,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 8.0.2
+          gradle-version: 8.4
           arguments: wrapper -p interop/kotlin/ret-kotlin
       - name: Build and publish Kotlin
         uses: gradle/gradle-build-action@v2
@@ -410,7 +410,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 8.0.2
+          gradle-version: 8.4
           arguments: wrapper -p interop/kotlin/ret-kotlin
       - name: Get GPG key to sign
         working-directory: interop/kotlin/ret-kotlin

diff --git a/interop/kotlin/build.gradle.kts b/interop/kotlin/build.gradle.kts
@@ -36,20 +36,18 @@ publishing {
             version = providers.gradleProperty("ret-version").getOrNull()
 
             from(components["java"])
-
-            licenses {
-                license {
-                    name = "Apache License, Version 2.0"
-                    url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+            pom {
+                licenses {
+                    license {
+                        name = "Apache License, Version 2.0"
+                        url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+                    }
+                    license {
+                        name = "Radix Eula"
+                        url = "https://www.radixdlt.com/terms/genericEULA"
+                    }
                 }
             }
-
-            pom.withXml {
-                def licensesNode = asNode().appendNode('licenses')
-                def licenseNode = licensesNode.appendNode('license')
-                licenseNode.appendNode('name', 'Radix Eula')
-                licenseNode.appendNode('url', 'https://www.radixdlt.com/terms/genericEULA')
-            }
         }
     }