From 2fc796063d3487a53c1568c848722ad2b0037e28 Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Fri, 31 Jan 2025 15:09:53 +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 655ada2b..29045eec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ shadowJarPluginVersion=8.1.1 downloadPluginVersion=5.4.0 releasePluginVersion=2.8.0 -ballerinaGradlePluginVersion=2.0.1 +ballerinaGradlePluginVersion=2.3.0 ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5 stdlibTaskVersion=2.6.0-20250127-171400-af6480d From 83316cff65cbe9696aa1bf743f7800d71124766b Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Fri, 31 Jan 2025 15:43:22 +0530 Subject: [PATCH 2/3] Fix build scripts --- build.gradle | 34 ++++++++++-------------------- compiler-plugin-tests/build.gradle | 4 ++-- compiler-plugin/build.gradle | 2 +- gradle.properties | 2 +- native/build.gradle | 2 +- settings.gradle | 21 ++++++++++++++++++ 6 files changed, 37 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 04f19671..e3089d31 100644 --- a/build.gradle +++ b/build.gradle @@ -16,31 +16,12 @@ */ 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 "com.github.spotbugs" + id "com.github.johnrengelman.shadow" + id "de.undercouch.download" + id "net.researchgate.release" } -ext.ballerinaLangVersion = project.ballerinaLangVersion -ext.stdlibTaskVersion = project.stdlibTaskVersion -ext.stdlibLogVersion = project.stdlibLogVersion -ext.stdlibIoVersion = project.stdlibIoVersion -ext.puppycrawlCheckstyleVersion = project.puppycrawlCheckstyleVersion -ext.testngVersion = project.testngVersion -ext.slf4jVersion = project.slf4jVersion -ext.commonsVfsVersion = project.commonsVfsVersion -ext.commonsNetVersion = project.commonsNetVersion -ext.jschVersion = project.jschVersion -ext.mockFtpServerVersion = project.mockFtpServerVersion -ext.sshdMinaVersion = project.sshdMinaVersion -ext.ftpServerVersion = project.ftpServerVersion -ext.sshdCoreVersion = project.sshdCoreVersion -ext.ftpletApiVersion = project.ftpletApiVersion -ext.minaCoreVersion = project.minaCoreVersion -ext.aopallianceVersion = project.aopallianceVersion -ext.jclSlf4jVersion = project.jclSlf4jVersion - allprojects { group = project.group version = project.version @@ -81,8 +62,15 @@ subprojects { configurations { ballerinaStdLibs + jbalTools } + dependencies { + /* JBallerina Tools */ + jbalTools ("org.ballerinalang:jballerina-tools:${ballerinaLangVersion}") { + transitive = false + } + /* Standard libraries */ ballerinaStdLibs "io.ballerina.stdlib:log-ballerina:${stdlibLogVersion}" ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIoVersion}" diff --git a/compiler-plugin-tests/build.gradle b/compiler-plugin-tests/build.gradle index 04b497a1..e2a057a9 100644 --- a/compiler-plugin-tests/build.gradle +++ b/compiler-plugin-tests/build.gradle @@ -27,7 +27,7 @@ description = 'Ballerina - FTP Compiler Plugin Tests' dependencies { checkstyle project(':checkstyle') - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" testImplementation project(":ftp-compiler-plugin") testImplementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}" @@ -42,7 +42,7 @@ tasks.withType(Checkstyle) { } checkstyle { - toolVersion "${project.puppycrawlCheckstyleVersion}" + toolVersion "${project.checkstylePluginVersion}" configFile rootProject.file("build-config/checkstyle/build/checkstyle.xml") configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")] } diff --git a/compiler-plugin/build.gradle b/compiler-plugin/build.gradle index f7a00506..90e5e07f 100644 --- a/compiler-plugin/build.gradle +++ b/compiler-plugin/build.gradle @@ -25,7 +25,7 @@ description = 'Ballerina - FTP Compiler Plugin' dependencies { checkstyle project(':checkstyle') - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-parser', version: "${ballerinaLangVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-tools-api', version: "${ballerinaLangVersion}" diff --git a/gradle.properties b/gradle.properties index 29045eec..f174d684 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.caching=true group=io.ballerina.stdlib version=2.12.0-SNAPSHOT -puppycrawlCheckstyleVersion=10.12.0 +checkstylePluginVersion=10.12.0 testngVersion=7.6.1 slf4jVersion=1.7.30 commonsVfsVersion=2.8.0 diff --git a/native/build.gradle b/native/build.gradle index e30cd703..bcc75a86 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -24,7 +24,7 @@ description = 'Ballerina - FTP Java Utils' dependencies { checkstyle project(':checkstyle') - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}" diff --git a/settings.gradle b/settings.gradle index 40c80dbe..c4935c53 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" } From 4f21fefa3db3c0eda4b54f78d65842b9bff4324f Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Fri, 31 Jan 2025 15:45:11 +0530 Subject: [PATCH 3/3] Fix build scripts --- ballerina/build.gradle | 20 ++------------------ gradle.properties | 1 + settings.gradle | 1 + 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index faf7bf4b..78baf6e3 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -17,23 +17,9 @@ 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 'com.github.psxpaul.execfork' version '0.2.0' + id 'com.github.psxpaul.execfork' + id 'io.ballerina.plugin' } description = 'Ballerina - Ballerina FTP Library' @@ -61,8 +47,6 @@ def stripBallerinaExtensionVersion(String extVersion) { } } -apply plugin: 'io.ballerina.plugin' - ballerina { packageOrganization = packageOrg module = packageName diff --git a/gradle.properties b/gradle.properties index f174d684..a23570fe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,6 +22,7 @@ spotbugsPluginVersion=6.0.18 shadowJarPluginVersion=8.1.1 downloadPluginVersion=5.4.0 releasePluginVersion=2.8.0 +execForkPluginVersion=0.2.0 ballerinaGradlePluginVersion=2.3.0 diff --git a/settings.gradle b/settings.gradle index c4935c53..bbb199a0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,6 +14,7 @@ pluginManagement { id "de.undercouch.download" version "${downloadPluginVersion}" id "net.researchgate.release" version "${releasePluginVersion}" id "io.ballerina.plugin" version "${ballerinaGradlePluginVersion}" + id "com.github.psxpaul.execfork" version "${execForkPluginVersion}" } repositories {