Merge pull request #70 from ballerina-platform/ballerina-plugin-update

Update Ballerina Gradle Plugin Version
ballerina-platform · Jan 31, 2025 · f7bb2d0 · f7bb2d0
2 parents 206fad7 + 3a9da3c
commit f7bb2d0
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 30 deletions.
diff --git a/ballerina/build.gradle b/ballerina/build.gradle
@@ -17,19 +17,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 - Data XML Module'
@@ -57,8 +46,6 @@ def stripBallerinaExtensionVersion(String extVersion) {
     }
 }
 
-apply plugin: 'io.ballerina.plugin'
-
 ballerina {
     packageOrganization = packageOrg
     module = packageName

diff --git a/build.gradle b/build.gradle
@@ -17,10 +17,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 {
@@ -63,9 +63,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:constraint-ballerina:${stdlibConstraintVersion}"

diff --git a/compiler-plugin-test/build.gradle b/compiler-plugin-test/build.gradle
@@ -26,7 +26,7 @@ description = 'Ballerina - Xmldata Compiler Plugin Tests'
 
 dependencies {
     checkstyle project(':checkstyle')
-    checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
+    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleToolVersion}"
 
     implementation project(':data.xmldata-compiler-plugin')
 
@@ -41,7 +41,7 @@ tasks.withType(Checkstyle) {
 }
 
 checkstyle {
-    toolVersion "${project.puppycrawlCheckstyleVersion}"
+    toolVersion "${project.checkstyleToolVersion}"
     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
@@ -26,7 +26,7 @@ description = 'Ballerina - Xmldata Compiler Plugin'
 
 dependencies {
     checkstyle project(':checkstyle')
-    checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
+    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleToolVersion}"
 
     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.checkstyleToolVersion}"
     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
@@ -4,14 +4,13 @@ version=1.2.0-SNAPSHOT
 ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5
 
 checkstyleToolVersion=10.12.0
-puppycrawlCheckstyleVersion=10.12.0
 testngVersion=7.6.1
 slf4jVersion=2.0.7
-githubSpotbugsVersion=6.0.18
-githubJohnrengelmanShadowVersion=8.1.1
-underCouchDownloadVersion=4.0.4
-researchgateReleaseVersion=2.8.0
-ballerinaGradlePluginVersion=2.0.1
+spotbugsPluginVersion=6.0.18
+shadowJarPluginVersion=8.1.1
+downloadPluginVersion=4.0.4
+releasePluginVersion=2.8.0
+ballerinaGradlePluginVersion=2.3.0
 
 stdlibIoVersion=1.7.0-20250127-170200-0d36f73
 stdlibTimeVersion=2.6.0-20250127-170200-86bdc5a

diff --git a/native/build.gradle b/native/build.gradle
@@ -27,7 +27,7 @@ description = 'Ballerina - Data.XML Java Utils'
 dependencies {
     implementation 'junit:junit:4.13.1'
     checkstyle project(':checkstyle')
-    checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
+    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleToolVersion}"
     implementation 'org.apache.commons:commons-lang3:3.6'
 
     implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"

diff --git a/settings.gradle b/settings.gradle
@@ -16,6 +16,27 @@
  * under the License.
  */
 
+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"
 }