Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructure the gradle build configurations of the package #221

Merged
merged 22 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 5 additions & 1 deletion ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -83,4 +83,8 @@ clean {

build.dependsOn copyToLib
build.dependsOn ":${packageName}-native:build"

test.dependsOn ":${packageName}-native:build"

publish.dependsOn build
publishToMavenLocal.dependsOn build
2 changes: 1 addition & 1 deletion build-config/resources/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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", "")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ spotbugsMain {
it.excludeFilter = excludeFile
}
reports {
text.enabled = true
xml.enabled = false
html.enabled = true
}
}

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading