diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 3d5460c4..ee34b337 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -18,19 +18,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 - JWT Ballerina Generator' @@ -55,8 +44,6 @@ def stripBallerinaExtensionVersion(String extVersion) { } } -apply plugin: 'io.ballerina.plugin' - ballerina { packageOrganization = packageOrg module = packageName diff --git a/build.gradle b/build.gradle index e0b024ee..083e782a 100644 --- a/build.gradle +++ b/build.gradle @@ -17,23 +17,12 @@ */ 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" } -ext.puppycrawlCheckstyleVersion = project.puppycrawlCheckstyleVersion -ext.ballerinaLangVersion = project.ballerinaLangVersion -ext.stdlibCacheVersion = project.stdlibCacheVersion -ext.stdlibCryptoVersion = project.stdlibCryptoVersion -ext.stdlibLogVersion = project.stdlibLogVersion -ext.stdlibTimeVersion = project.stdlibTimeVersion -// Transitive dependencies -ext.stdlibTaskVersion = project.stdlibTaskVersion -ext.stdlibIoVersion = project.stdlibIoVersion -ext.stdlibConstraintVersion = project.stdlibConstraintVersion - allprojects { group = project.group version = project.version @@ -71,8 +60,14 @@ subprojects { configurations { ballerinaStdLibs + jbalTools } dependencies { + /* JBallerina Tools */ + jbalTools ("org.ballerinalang:jballerina-tools:${ballerinaLangVersion}") { + transitive = false + } + /* Standard libraries */ ballerinaStdLibs "io.ballerina.stdlib:cache-ballerina:${stdlibCacheVersion}" ballerinaStdLibs "io.ballerina.stdlib:crypto-ballerina:${stdlibCryptoVersion}" diff --git a/gradle.properties b/gradle.properties index 417d0a23..f1639b7a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,15 @@ org.gradle.caching=true group=io.ballerina.stdlib version=2.14.0-SNAPSHOT -puppycrawlCheckstyleVersion=10.12.0 -ballerinaGradlePluginVersion=2.0.1 -githubJohnrengelmanShadowVersion=8.1.1 -underCouchDownloadVersion=5.4.0 -researchgateReleaseVersion=2.8.0 -githubSpotbugsVersion=6.0.18 - ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5 + +checkstylePluginVersion=10.12.0 +ballerinaGradlePluginVersion=2.3.0 +shadowJarPluginVersion=8.1.1 +downloadPluginVersion=5.4.0 +releasePluginVersion=2.8.0 +spotbugsPluginVersion=6.0.18 + stdlibCacheVersion=3.9.0-20250127-173100-ebe1e73 stdlibCryptoVersion=2.8.0-20250127-170800-6c52ac3 stdlibLogVersion=2.11.0-20250131-134300-052ff7f diff --git a/native/build.gradle b/native/build.gradle index fc4c8574..e0aa61db 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -25,7 +25,7 @@ description = 'Ballerina - JWT Java Utils' dependencies { checkstyle project(':checkstyle') - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}" implementation group: 'io.ballerina.stdlib', name: 'crypto-native', version: "${stdlibCryptoVersion}" diff --git a/settings.gradle b/settings.gradle index b0961c06..8140976c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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.13.2" }