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.

Sign up for GitHub

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

Update Ballerina Gradle Plugin Version #70

Merged
merged 4 commits into from
Jan 31, 2025
Merged

Update Ballerina Gradle Plugin Version #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
635a649
Update the Ballerina Gradle Plugin version
ThisaruGuruge Jan 31, 2025
2d0eb01
Fix build scripts
ThisaruGuruge Jan 31, 2025
b0ae630
Fix build scripts
ThisaruGuruge Jan 31, 2025
3a9da3c
Fix build scripts
ThisaruGuruge Jan 31, 2025
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
17 changes: 2 additions & 15 deletions ballerina/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,8 @@

import org.apache.tools.ant.taskdefs.condition.Os

buildscript {
repositories {
maven {
url = 'https://maven.pkg.github.com/ballerina-platform/plugin-gradle'
credentials {
username System.getenv("packageUser")
password System.getenv("packagePAT")
}
}
}
dependencies {
classpath "io.ballerina:plugin-gradle:${project.ballerinaGradlePluginVersion}"
}
plugins {
id 'io.ballerina.plugin'
}

description = 'Ballerina - Data XML Module'
Expand Down Expand Up @@ -57,8 +46,6 @@ def stripBallerinaExtensionVersion(String extVersion) {
}
}

apply plugin: 'io.ballerina.plugin'

ballerina {
packageOrganization = packageOrg
module = packageName
Expand Down
14 changes: 10 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
*/

plugins {
id "com.github.spotbugs" version "${githubSpotbugsVersion}"
id "com.github.johnrengelman.shadow" version "${githubJohnrengelmanShadowVersion}"
id "de.undercouch.download" version "${underCouchDownloadVersion}"
id "net.researchgate.release" version "${researchgateReleaseVersion}"
id "com.github.spotbugs"
id "com.github.johnrengelman.shadow"
id "de.undercouch.download"
id "net.researchgate.release"
}

allprojects {
Expand Down Expand Up @@ -63,9 +63,15 @@ subprojects {

configurations {
ballerinaStdLibs
jbalTools
}

dependencies {
/* JBallerina Tools */
jbalTools ("org.ballerinalang:jballerina-tools:${ballerinaLangVersion}") {
transitive = false
}

/* Standard libraries */
ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIoVersion}"
ballerinaStdLibs "io.ballerina.stdlib:constraint-ballerina:${stdlibConstraintVersion}"
Expand Down
4 changes: 2 additions & 2 deletions compiler-plugin-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ description = 'Ballerina - Xmldata Compiler Plugin Tests'

dependencies {
checkstyle project(':checkstyle')
checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleToolVersion}"

implementation project(':data.xmldata-compiler-plugin')

Expand All @@ -41,7 +41,7 @@ tasks.withType(Checkstyle) {
}

checkstyle {
toolVersion "${project.puppycrawlCheckstyleVersion}"
toolVersion "${project.checkstyleToolVersion}"
configFile rootProject.file("build-config/checkstyle/build/checkstyle.xml")
configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
}
Expand Down
4 changes: 2 additions & 2 deletions compiler-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ description = 'Ballerina - Xmldata Compiler Plugin'

dependencies {
checkstyle project(':checkstyle')
checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleToolVersion}"

implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
implementation group: 'org.ballerinalang', name: 'ballerina-tools-api', version: "${ballerinaLangVersion}"
Expand All @@ -39,7 +39,7 @@ tasks.withType(Checkstyle) {
}

checkstyle {
toolVersion "${project.puppycrawlCheckstyleVersion}"
toolVersion "${project.checkstyleToolVersion}"
configFile rootProject.file("build-config/checkstyle/build/checkstyle.xml")
configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
}
Expand Down
11 changes: 5 additions & 6 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ version=1.2.0-SNAPSHOT
ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5

checkstyleToolVersion=10.12.0
puppycrawlCheckstyleVersion=10.12.0
testngVersion=7.6.1
slf4jVersion=2.0.7
githubSpotbugsVersion=6.0.18
githubJohnrengelmanShadowVersion=8.1.1
underCouchDownloadVersion=4.0.4
researchgateReleaseVersion=2.8.0
ballerinaGradlePluginVersion=2.0.1
spotbugsPluginVersion=6.0.18
shadowJarPluginVersion=8.1.1
downloadPluginVersion=4.0.4
releasePluginVersion=2.8.0
ballerinaGradlePluginVersion=2.3.0

stdlibIoVersion=1.7.0-20250127-170200-0d36f73
stdlibTimeVersion=2.6.0-20250127-170200-86bdc5a
Expand Down
2 changes: 1 addition & 1 deletion native/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ description = 'Ballerina - Data.XML Java Utils'
dependencies {
implementation 'junit:junit:4.13.1'
checkstyle project(':checkstyle')
checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleToolVersion}"
implementation 'org.apache.commons:commons-lang3:3.6'

implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
Expand Down
21 changes: 21 additions & 0 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,27 @@
* under the License.
*/

pluginManagement {
plugins {
id "com.github.spotbugs" version "${spotbugsPluginVersion}"
id "com.github.johnrengelman.shadow" version "${shadowJarPluginVersion}"
id "de.undercouch.download" version "${downloadPluginVersion}"
id "net.researchgate.release" version "${releasePluginVersion}"
id "io.ballerina.plugin" version "${ballerinaGradlePluginVersion}"
}

repositories {
gradlePluginPortal()
maven {
url = 'https://maven.pkg.github.com/ballerina-platform/*'
credentials {
username System.getenv("packageUser")
password System.getenv("packagePAT")
}
}
}
}

plugins {
id "com.gradle.enterprise" version "3.2"
}
Expand Down
Loading