diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 783835b..ba00d34 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -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 - Ballerina Crypto' @@ -54,8 +43,6 @@ def stripBallerinaExtensionVersion(String extVersion) { } } -apply plugin: 'io.ballerina.plugin' - ballerina { packageOrganization = packageOrg module = packageName diff --git a/build.gradle b/build.gradle index be8428c..0dd666a 100644 --- a/build.gradle +++ b/build.gradle @@ -16,18 +16,12 @@ */ plugins { - id "com.github.spotbugs" version "${githubSpotbugsVersion}" - id "com.github.johnrengelman.shadow" version "${githubShadowVersion}" - 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.bouncycastleVersion = project.bouncycastleVersion -ext.ballerinaLangVersion = project.ballerinaLangVersion -ext.stdlibTimeVersion = project.stdlibTimeVersion -ext.stdlibIoVersion = project.stdlibIoVersion - allprojects { group = project.group version = project.version @@ -65,8 +59,14 @@ subprojects { configurations { ballerinaStdLibs + jbalTools } dependencies { + /* JBallerina Tools */ + jbalTools ("org.ballerinalang:jballerina-tools:${ballerinaLangVersion}") { + transitive = false + } + /* Standard libraries */ ballerinaStdLibs "io.ballerina.stdlib:time-ballerina:${stdlibTimeVersion}" ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIoVersion}" diff --git a/gradle.properties b/gradle.properties index 7b24caa..67a7b78 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,13 @@ org.gradle.caching=true group=io.ballerina.stdlib version=2.8.0-SNAPSHOT -puppycrawlCheckstyleVersion=10.12.0 +checkstylePluginVersion=10.12.0 bouncycastleVersion=1.78 -githubSpotbugsVersion=6.0.18 -githubShadowVersion=7.1.2 -undercouchDownloadVersion=5.4.0 -researchgateReleaseVersion=2.8.0 -ballerinaGradlePluginVersion=2.0.1 +spotbugsPluginVersion=6.0.18 +shadowJarPluginVersion=7.1.2 +downloadPluginVersion=5.4.0 +releasePluginVersion=2.8.0 +ballerinaGradlePluginVersion=2.3.0 nativeImageVersion=22.2.0 ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5 diff --git a/native/build.gradle b/native/build.gradle index 55e1105..4c7a24b 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -25,7 +25,7 @@ description = 'Ballerina - Crypto 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: 'time-native', version: "${stdlibTimeVersion}" diff --git a/settings.gradle b/settings.gradle index 40d2087..2dfaa98 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.2" }