Restructure the gradle build configurations of the package (#221)

* Restructure the gradle build configurations
ballerina-platform · May 31, 2024 · e517042 · e517042
1 parent 4eae2fa
commit e517042
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -16,8 +16,8 @@ observabilityIncluded = true
 graalvmCompatible = true
 
 [[platform.java17.dependency]]
-path = "../native/build/libs/azure-service-bus-native-3.7.0.jar"
 groupId = "org.ballerinax"
 artifactId = "asb-native"
 module = "asb-native" 
 version = "3.7.0"
+path = "../native/build/libs/asb-native-3.7.0.jar"
diff --git a/ballerina/build.gradle b/ballerina/build.gradle
@@ -24,7 +24,7 @@ plugins {
 
 description = 'Ballerina - Azure Service Bus Ballerina Connector'
 
-def packageName = "azure-service-bus"
+def packageName = "asb"
 def packageOrg = "ballerinax"
 def tomlVersion = stripBallerinaExtensionVersion("${project.version}")
 def ballerinaTomlFilePlaceHolder = new File("${project.rootDir}/build-config/resources/Ballerina.toml")
@@ -83,4 +83,8 @@ clean {
 
 build.dependsOn copyToLib
 build.dependsOn ":${packageName}-native:build"
+
 test.dependsOn ":${packageName}-native:build"
+
+publish.dependsOn build
+publishToMavenLocal.dependsOn build
diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
@@ -16,8 +16,8 @@ observabilityIncluded = true
 graalvmCompatible = true
 
 [[platform.java17.dependency]]
-path = "../native/build/libs/azure-service-bus-native-@project.version@.jar"
 groupId = "org.ballerinax"
 artifactId = "asb-native"
 module = "asb-native" 
 version = "@project.version@"
+path = "../native/build/libs/asb-native-@project.version@.jar"
diff --git a/build.gradle b/build.gradle
@@ -60,8 +60,8 @@ allprojects {
 }
 
 task build {
-    dependsOn(":azure-service-bus-native:build")
-    dependsOn(":azure-service-bus-ballerina:build")
+    dependsOn(":asb-native:build")
+    dependsOn(":asb-ballerina:build")
 }
 
 def moduleVersion = project.version.replace("-SNAPSHOT", "")

diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ spotbugsPluginVersion=5.0.14
 shadowJarPluginVersion=8.1.1
 downloadPluginVersion=5.4.0
 releasePluginVersion=2.8.0
-ballerinaGradlePluginVersion=2.2.1
+ballerinaGradlePluginVersion=2.2.4
 
 ballerinaLangVersion=2201.8.0
 azureServiceBusVersion=7.14.3

diff --git a/native/build.gradle b/native/build.gradle
@@ -71,7 +71,8 @@ spotbugsMain {
         it.excludeFilter = excludeFile
     }
     reports {
-        text.enabled = true
+        xml.enabled = false
+        html.enabled = true
     }
 }
 

diff --git a/settings.gradle b/settings.gradle
@@ -41,7 +41,7 @@ plugins {
     id "com.gradle.enterprise" version "3.13.2"
 }
 
-def projectName = 'azure-service-bus'
+def projectName = 'asb'
 rootProject.name = "ballerinax-${projectName}"
 
 include ":checkstyle"