- test different conf for jitpack to create individual artifacts

bisq-network · Nov 7, 2024 · 12964e4 · 12964e4
1 parent 54e65fb
commit 12964e4
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 35 deletions.
diff --git a/account/build.gradle.kts b/account/build.gradle.kts
@@ -1,9 +1,10 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
+version = rootProject.version
+
 dependencies {
     implementation(project(":i18n"))
     implementation(project(":persistence"))

diff --git a/application/build.gradle.kts b/application/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     id("bisq.java-library")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {

diff --git a/bonded-roles/build.gradle.kts b/bonded-roles/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {

diff --git a/...ic/maven-publisher/src/main/kotlin/bisq/gradle/maven_publisher/LocalMavenPublishPlugin.kt b/...ic/maven-publisher/src/main/kotlin/bisq/gradle/maven_publisher/LocalMavenPublishPlugin.kt
@@ -75,8 +75,9 @@ class LocalMavenPublishPlugin : Plugin<Project> {
                 project.extensions.configure<PublishingExtension>("publishing") {
                     publications {
 //                        val publicationName = if (group == DEFAULT_GROUP) "mavenJava" else "mavenJava_${group}"
-                        val publicationName = "mavenJava"
-                        create(publicationName, MavenPublication::class) {
+                        var publicationName = "mavenJava"
+                        var existingPublication = findByName(publicationName) ?: create(publicationName, MavenPublication::class)
+                        (existingPublication as MavenPublication).apply {
                             from(project.components["java"])  // Adjust if publishing other types (like Kotlin)
                             artifactId = project.name
                             groupId = group
@@ -85,7 +86,9 @@ class LocalMavenPublishPlugin : Plugin<Project> {
                             setupPublication(project, group, protoSourcesJar)
                         }
                         if (group != DEFAULT_GROUP) {
-                            create("mavenJava_bisqAlias", MavenPublication::class) {
+                            publicationName = "mavenJava_bisqAlias"
+                            existingPublication = findByName(publicationName) ?: create(publicationName, MavenPublication::class)
+                            (existingPublication as MavenPublication).apply {
                                 groupId = "bisq"
                                 artifactId = project.name
                                 version = rootVersion
@@ -146,12 +149,16 @@ class LocalMavenPublishPlugin : Plugin<Project> {
     }
 
     private fun loadRootVersion(project: Project) {        val rootPropertiesFile = File(getRootGradlePropertiesFile(project), "gradle.properties")
-        val rootProperties = Properties()
-        if (rootPropertiesFile.exists()) {
-            rootProperties.load(rootPropertiesFile.inputStream())
-        }
+        if (project.version != "unspecified") {
+            rootVersion = project.version as String
+        } else {
+            val rootProperties = Properties()
+            if (rootPropertiesFile.exists()) {
+                rootProperties.load(rootPropertiesFile.inputStream())
+            }
 
-        rootVersion = rootProperties.getProperty("version", "unspecified")
+            rootVersion = rootProperties.getProperty("version", "unspecified")
+        }
     }
 
     private fun getRootGradlePropertiesFile(project: Project): File {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,18 +1,8 @@
 plugins {
     java
-    id("maven-publish") // for jitpack
+    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
-group = "bisq"
-version = project.version
-//sourceCompatibility = 1.8 // java 8
-//targetCompatibility = 1.8
-
-//java {
-//    withJavadocJar()
-//    withSourcesJar()
-//}
-
 tasks.register("buildAll") {
     group = "build"
     description = "Build the entire project leaving it ready to work with."

diff --git a/chat/build.gradle.kts b/chat/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -3,7 +3,6 @@ plugins {
     id("bisq.java-conventions")
     id("bisq.java-integration-tests")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 

diff --git a/contract/build.gradle.kts b/contract/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {

diff --git a/i18n/build.gradle.kts b/i18n/build.gradle.kts
@@ -1,4 +1,3 @@
 plugins {
     id("bisq.java-library")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
diff --git a/identity/build.gradle.kts b/identity/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {

diff --git a/offer/build.gradle.kts b/offer/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {

diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {

diff --git a/security/build.gradle.kts b/security/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {

diff --git a/settings/build.gradle.kts b/settings/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {

diff --git a/support/build.gradle.kts b/support/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {

diff --git a/trade/build.gradle.kts b/trade/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {

diff --git a/user/build.gradle.kts b/user/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("bisq.java-library")
     id("bisq.protobuf")
-    id("bisq.gradle.maven_publisher.LocalMavenPublishPlugin")
 }
 
 dependencies {