diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 0a8c33a8..a951f409 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -19,19 +19,8 @@ import org.apache.tools.ant.taskdefs.condition.Os 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 - SQL Ballerina Generator' @@ -59,8 +48,6 @@ def stripBallerinaExtensionVersion(String extVersion) { } } -apply plugin: 'io.ballerina.plugin' - ballerina { packageOrganization = packageOrg module = packageName diff --git a/build.gradle b/build.gradle index e8e20c07..c6232531 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-base" + id "com.github.johnrengelman.shadow" + id "de.undercouch.download" + id "net.researchgate.release" } allprojects { diff --git a/compiler-plugin-tests/build.gradle b/compiler-plugin-tests/build.gradle index 012f45ee..a8d7cf81 100644 --- a/compiler-plugin-tests/build.gradle +++ b/compiler-plugin-tests/build.gradle @@ -31,7 +31,7 @@ configurations { dependencies { checkstyle project(':checkstyle') - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" jacocoRuntime "org.jacoco:org.jacoco.agent:${jacoco.toolVersion}:runtime" @@ -121,7 +121,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 dfd6ccaf..bd361fce 100644 --- a/compiler-plugin/build.gradle +++ b/compiler-plugin/build.gradle @@ -26,7 +26,7 @@ description = 'Ballerina - SQL 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-tools-api', version: "${ballerinaLangVersion}" @@ -39,7 +39,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/gradle.properties b/gradle.properties index 55e68794..ec758a10 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,48 +1,35 @@ group=io.ballerina.stdlib version=1.15.0-SNAPSHOT +ballerinaLangVersion=2201.11.0-20241121-075100-c4c87cbc + +checkstylePluginVersion=10.12.1 +spotbugsPluginVersion=6.0.18 +downloadPluginVersion=5.4.0 +shadowJarPluginVersion=8.1.1 +releasePluginVersion=2.8.0 +ballerinaGradlePluginVersion=2.0.1 -puppycrawlCheckstyleVersion=10.12.1 hikkariLibVersion=3.3.1 hsqlDriverVersion=2.7.1 h2Version=1.4.200 atomikosLibVersion=5.0.8 -checkstyleToolVersion=10.12.1 -githubSpotbugsVersion=6.0.18 -githubJohnrengelmanShadowVersion=8.1.1 -underCouchDownloadVersion=5.4.0 -researchgateReleaseVersion=2.8.0 testngVersion=7.6.1 -ballerinaGradlePluginVersion=2.0.1 -ballerinaLangVersion=2201.11.0-20241121-075100-c4c87cbc - -# Direct Dependencies # Level 01 stdlibIoVersion=1.7.0-20241121-173300-0fbd5d4 stdlibTimeVersion=2.6.0-20241122-120400-97742a7 - -# Level 02 -stdlibLogVersion=2.11.0-20241122-150100-2e1a3ca -stdlibOsVersion=1.9.0-20241122-071800-1fae486 - -# Level 03 -stdlibFileVersion=1.11.0-20241122-180900-dff344c - -# Ballerinax Observer -observeVersion=1.4.0-20241122-184200-c596093 -observeInternalVersion=1.4.0-20241122-185200-9e5b1bb - -# Transitive Dependencies -# Level 01 -stdlibConstraintVersion=1.6.0-20241122-133100-98689e2 stdlibUrlVersion=2.5.0-20241122-120400-67af694 # Level 02 +stdlibConstraintVersion=1.6.0-20241122-133100-98689e2 stdlibCryptoVersion=2.8.0-20241122-130800-24f1267 +stdlibLogVersion=2.11.0-20241122-150100-2e1a3ca +stdlibOsVersion=1.9.0-20241122-071800-1fae486 stdlibTaskVersion=2.6.0-20241122-124800-cb84357 # Level 03 stdlibCacheVersion=3.9.0-20241122-182900-c956a97 +stdlibFileVersion=1.11.0-20241122-180900-dff344c stdlibMimeVersion=2.11.0-20241125-094600-bbddf94 stdlibUuidVersion=1.9.0-20241125-110300-5eb185d @@ -57,3 +44,7 @@ stdlibHttpVersion=2.13.0-20241126-181000-6585cc5 # Level 06 stdlibTransactionVersion=1.11.0-20241127-113000-c3f53c6 + +# Ballerinax Observer +observeVersion=1.4.0-20241122-184200-c596093 +observeInternalVersion=1.4.0-20241122-185200-9e5b1bb diff --git a/native/build.gradle b/native/build.gradle index c95e08c8..2056a244 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -32,7 +32,7 @@ dependencies { jacocoRuntime "org.jacoco:org.jacoco.agent:${jacoco.toolVersion}:runtime" 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}" implementation group: 'io.ballerina.stdlib', name: 'io-native', version: "${stdlibIoVersion}" @@ -114,7 +114,7 @@ task validateSpotbugs() { } checkstyle { - toolVersion "${checkstyleToolVersion}" + toolVersion "${checkstylePluginVersion}" configFile file("${rootDir}/build-config/checkstyle/build/checkstyle.xml") configProperties = ["suppressionFile": file("${rootDir}/build-config/checkstyle/build/suppressions.xml")] } diff --git a/settings.gradle b/settings.gradle index 50f9f817..2c5b294e 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-base" 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" } diff --git a/test-utils/build.gradle b/test-utils/build.gradle index f9c906db..e11c358f 100644 --- a/test-utils/build.gradle +++ b/test-utils/build.gradle @@ -25,7 +25,7 @@ description = 'Ballerina - SQL test 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}" implementation project(":sql-native") @@ -66,7 +66,7 @@ task validateSpotbugs() { } checkstyle { - toolVersion "${checkstyleToolVersion}" + toolVersion "${checkstylePluginVersion}" configFile file("${rootDir}/build-config/checkstyle/build/checkstyle.xml") configProperties = ["suppressionFile": file("${rootDir}/build-config/checkstyle/build/suppressions.xml")] }