Skip to content

Commit

Permalink
Merge pull request #1423 from ballerina-platform/ballerina-plugin-update
Browse files Browse the repository at this point in the history
Update Ballerina Gradle Plugin Version
  • Loading branch information
Nuvindu authored Jan 31, 2025
2 parents b8faf08 + 4f21fef commit 643b23a
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 47 deletions.
20 changes: 2 additions & 18 deletions ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -61,8 +47,6 @@ def stripBallerinaExtensionVersion(String extVersion) {
}
}

apply plugin: 'io.ballerina.plugin'

ballerina {
packageOrganization = packageOrg
module = packageName
Expand Down
34 changes: 11 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions compiler-plugin-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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")]
}
Expand Down
2 changes: 1 addition & 1 deletion compiler-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
5 changes: 3 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,8 +22,9 @@ spotbugsPluginVersion=6.0.18
shadowJarPluginVersion=8.1.1
downloadPluginVersion=5.4.0
releasePluginVersion=2.8.0
execForkPluginVersion=0.2.0

ballerinaGradlePluginVersion=2.0.1
ballerinaGradlePluginVersion=2.3.0

ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5
stdlibTaskVersion=2.6.0-20250127-171400-af6480d
Expand Down
2 changes: 1 addition & 1 deletion native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
22 changes: 22 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,28 @@
* 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}"
id "com.github.psxpaul.execfork" version "${execForkPluginVersion}"
}

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"
}
Expand Down

0 comments on commit 643b23a

Please sign in to comment.