diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 6908ca0b..c7cdff55 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -17,23 +17,10 @@ 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' } -apply plugin: 'io.ballerina.plugin' - description = 'Ballerina - I/O Ballerina Generator' def packageName = "io" diff --git a/build.gradle b/build.gradle index 83fc007c..b7f8c59c 100644 --- a/build.gradle +++ b/build.gradle @@ -16,10 +16,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 { @@ -57,6 +57,19 @@ allprojects { } } +subprojects { + configurations { + jbalTools + } + + dependencies { + /* JBallerina Tools */ + jbalTools ("org.ballerinalang:jballerina-tools:${ballerinaLangVersion}") { + transitive = false + } + } +} + def moduleVersion = project.version.replace("-SNAPSHOT", "") release { diff --git a/gradle.properties b/gradle.properties index fc83cffc..2bdcb98b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,12 @@ org.gradle.caching=true group=io.ballerina.stdlib version=1.7.0-SNAPSHOT ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5 -puppycrawlCheckstyleVersion=10.12.0 testngVersion=7.6.1 slf4jVersion=1.7.30 jacocoVersion=0.8.10 -githubSpotbugsVersion=6.0.18 -githubJohnrengelmanShadowVersion=8.1.1 -underCouchDownloadVersion=5.4.0 -researchgateReleaseVersion=2.8.0 +spotbugsPluginVersion=6.0.18 +shadowJarPluginVersion=8.1.1 +downloadPluginVersion=5.4.0 +releasePluginVersion=2.8.0 checkstyleToolVersion=10.12.0 -ballerinaGradlePluginVersion=2.0.1 +ballerinaGradlePluginVersion=2.3.0 diff --git a/native/build.gradle b/native/build.gradle index 943e79cb..36b219ff 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation group: 'commons-codec', name: 'commons-codec', version: '1.9' implementation 'org.testng:testng:7.6.1' checkstyle project(":checkstyle") - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleToolVersion}" } test { diff --git a/settings.gradle b/settings.gradle index 8424c30e..074298cc 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" } diff --git a/test-utils/build.gradle b/test-utils/build.gradle index 5ffd9e66..58748764 100644 --- a/test-utils/build.gradle +++ b/test-utils/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation project(":io-native") checkstyle project(":checkstyle") - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleToolVersion}" } spotbugsMain {