Skip to content

Commit

Permalink
Merge pull request #492 from ballerina-platform/ballerina-plugin-update
Browse files Browse the repository at this point in the history
Update Ballerina Gradle Plugin Version
  • Loading branch information
Nuvindu authored Jan 31, 2025
2 parents 936dbeb + bc0cdee commit 7dc0440
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 32 deletions.
17 changes: 2 additions & 15 deletions ballerina/build.gradle
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 - XSLT Ballerina Generator'
Expand All @@ -54,8 +43,6 @@ def stripBallerinaExtensionVersion(String extVersion) {
}
}

apply plugin: 'io.ballerina.plugin'

ballerina {
packageOrganization = packageOrg
module = packageName
Expand Down
16 changes: 12 additions & 4 deletions build.gradle
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,12 +63,20 @@ subprojects {

configurations {
ballerinaStdLibs
jbalTools
}

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

/* Standard libraries */
ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIoVersion}"
}
}

def moduleVersion = project.version.replace("-SNAPSHOT", "")

release {
Expand Down
16 changes: 8 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
org.gradle.caching=true
group=io.ballerina.stdlib
version=2.8.0-SNAPSHOT
ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5

jakartaActivationVersion=1.2.2
axiomVersion=1.4.0
slf4jVersion=1.7.30
puppycrawlCheckstyleVersion=10.12.0
checkStyleToolVersion=10.12.0
githubSpotbugsVersion=6.0.18
githubJohnrengelmanShadowVersion=8.1.1
underCouchDownloadVersion=5.4.0
researchgateReleaseVersion=2.8.0
ballerinaGradlePluginVersion=2.0.1
checkstylePluginVersion=10.12.0
spotbugsPluginVersion=6.0.18
shadowJarPluginVersion=8.1.1
downloadPluginVersion=5.4.0
releasePluginVersion=2.8.0
ballerinaGradlePluginVersion=2.3.0
saxonHeVersion=11.4
xmlResolverVersion=4.5.2

ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5
stdlibIoVersion=1.7.0-20250127-170200-0d36f73
12 changes: 7 additions & 5 deletions native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
*
*/

apply plugin: "java"
apply plugin: "com.github.spotbugs"
apply plugin: "checkstyle"
plugins {
id "java"
id "com.github.spotbugs"
id "checkstyle"
}

description = 'Ballerina - Xslt Java Utils'

Expand Down Expand Up @@ -45,7 +47,7 @@ dependencies {
transitive = false
}
checkstyle project(":checkstyle")
checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}"
}

spotbugsMain {
Expand Down Expand Up @@ -82,7 +84,7 @@ task validateSpotbugs() {
}

checkstyle {
toolVersion "${checkStyleToolVersion}"
toolVersion "${checkstylePluginVersion}"
configFile file("${rootDir}/build-config/checkstyle/build/checkstyle.xml")
configProperties = ["suppressionFile": file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
}
Expand Down
21 changes: 21 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,27 @@
* in the user manual at https://docs.gradle.org/6.3/userguide/multi_project_builds.html
*/

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

0 comments on commit 7dc0440

Please sign in to comment.