From f75c696bb553d2cb9c19d11fbbc6a225aefd4357 Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Fri, 31 Jan 2025 16:21:37 +0530 Subject: [PATCH 1/3] Update the Ballerina Gradle Plugin version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index af30ab03..f6ce49a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ shadowJarPluginVersion=8.1.1 downloadPluginVersion=5.4.0 releasePluginVersion=2.6.0 puppycrawlCheckstyleVersion=10.12.0 -ballerinaGradlePluginVersion=2.0.1 +ballerinaGradlePluginVersion=2.3.0 ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5 From 917a851ae4b86b3d8fc76538c7795a2d755c3736 Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Fri, 31 Jan 2025 16:31:59 +0530 Subject: [PATCH 2/3] Fix build scripts --- ballerina/build.gradle | 17 ++--------------- build.gradle | 7 +++++++ gradle.properties | 5 ++--- native/build.gradle | 2 +- test-utils/build.gradle | 2 +- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 024c4e0d..5914cf90 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -16,19 +16,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 - Log 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 2eb4ea0e..f0cba85b 100644 --- a/build.gradle +++ b/build.gradle @@ -62,8 +62,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:observe-ballerina:${observeVersion}" diff --git a/gradle.properties b/gradle.properties index f6ce49a7..da7441da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,15 @@ org.gradle.caching=true group=io.ballerina.stdlib version=2.11.0-SNAPSHOT +ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5 + checkstylePluginVersion=10.12.0 spotbugsPluginVersion=6.0.18 shadowJarPluginVersion=8.1.1 downloadPluginVersion=5.4.0 releasePluginVersion=2.6.0 -puppycrawlCheckstyleVersion=10.12.0 ballerinaGradlePluginVersion=2.3.0 -ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5 - #stdlib dependencies stdlibIoVersion=1.7.0-20250127-170200-0d36f73 observeVersion=1.4.0-20250130-102700-e04cefe diff --git a/native/build.gradle b/native/build.gradle index e865a8a2..3f261713 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}" checkstyle project(":checkstyle") - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" } spotbugsMain { diff --git a/test-utils/build.gradle b/test-utils/build.gradle index 767af4ff..411ea003 100644 --- a/test-utils/build.gradle +++ b/test-utils/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation group: 'io.ballerina.stdlib', name: 'io-native', version: "${stdlibIoVersion}" implementation project(":log-native") checkstyle project(":checkstyle") - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" } spotbugsMain { From 846ce6f9f9812cf1456468b423a17611c0d45b58 Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Fri, 31 Jan 2025 16:36:14 +0530 Subject: [PATCH 3/3] Fix build scripts --- settings.gradle | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/settings.gradle b/settings.gradle index e9cd199a..eca70c49 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,6 +13,18 @@ pluginManagement { 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") + } + } } }