From 2b53371d38fe328d8c865b60f4b6c682f97f69bb Mon Sep 17 00:00:00 2001 From: NipunaMadhushan Date: Fri, 7 Feb 2025 17:29:33 +0530 Subject: [PATCH 1/2] Update ballerina gradle plugin version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 55250f7..df3af9f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ githubJohnrengelmanShadowVersion=8.1.1 underCouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 ballerinaTomlParserVersion=1.2.2 -ballerinaGradlePluginVersion=2.0.1 +ballerinaGradlePluginVersion=2.3.0 puppycrawlCheckstyleVersion=10.12.1 openTelemetryVersion=1.0.0 gsonVersion=2.8.9 From 7daa0bf811bcb2a8ae79dd81b101141e1f21b838 Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Fri, 7 Feb 2025 17:38:05 +0530 Subject: [PATCH 2/2] Fix build scripts --- ballerina/build.gradle | 20 ++++---------------- build.gradle | 8 ++++---- gradle.properties | 11 ++++++----- native/build.gradle | 2 +- settings.gradle | 21 +++++++++++++++++++++ 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 2c19062..2082457 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -17,7 +17,9 @@ import org.apache.tools.ant.taskdefs.condition.Os -apply plugin: 'io.ballerina.plugin' +plugins { + id 'io.ballerina.plugin' +} description = 'Ballerina - Observability' @@ -28,21 +30,6 @@ def tomlVersion = stripBallerinaExtensionVersion("${project.version}") def ballerinaTomlFilePlaceHolder = new File("${project.rootDir}/build-config/resources/Ballerina.toml") def ballerinaTomlFile = new File("$project.projectDir/Ballerina.toml") -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}" - } -} - def stripBallerinaExtensionVersion(String extVersion) { if (extVersion.matches(project.ext.timestampedVersionRegex)) { def splitVersion = extVersion.split('-'); @@ -120,6 +107,7 @@ publishing { updateTomlFiles.dependsOn copyStdlibs build.dependsOn(":observe-native:build") +test.dependsOn(":observe-native:build") build.dependsOn(":observe-ballerina:generatePomFileForMavenPublication") build.finalizedBy(":observe-ballerina-tests:build") test.finalizedBy(":observe-ballerina-tests:build") diff --git a/build.gradle b/build.gradle index 0a7f796..74fdf86 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" + id "com.github.johnrengelman.shadow" + id "de.undercouch.download" + id "net.researchgate.release" } allprojects { diff --git a/gradle.properties b/gradle.properties index df3af9f..286f87e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,13 +16,14 @@ org.gradle.caching=true group=io.ballerina.stdlib version=1.4.0-SNAPSHOT ballerinaLangVersion=2201.11.0 -githubSpotbugsVersion=6.0.18 -githubJohnrengelmanShadowVersion=8.1.1 -underCouchDownloadVersion=5.4.0 -researchgateReleaseVersion=2.8.0 + +spotbugsPluginVersion=6.0.18 +shadowJarPluginVersion=8.1.1 +downloadPluginVersion=5.4.0 +releasePluginVersion=2.8.0 ballerinaTomlParserVersion=1.2.2 ballerinaGradlePluginVersion=2.3.0 -puppycrawlCheckstyleVersion=10.12.1 +checkstylePluginVersion=10.12.1 openTelemetryVersion=1.0.0 gsonVersion=2.8.9 diff --git a/native/build.gradle b/native/build.gradle index fc1a0e9..216413e 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -25,7 +25,7 @@ description = 'Ballerina - Observability Natives' 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 ab1a3ec..d3b04e0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,6 +7,27 @@ * in the user manual at https://docs.gradle.org/7.2/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" }