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

Update Ballerina Gradle Plugin Version
ballerina-platform · Jan 31, 2025 · 8aea9c2 · 8aea9c2
2 parents 3217a75 + 8c38e20
commit 8aea9c2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/ballerina/build.gradle b/ballerina/build.gradle
@@ -16,22 +16,10 @@
  */
 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 - Random Ballerina Generator'
 
 def packageName = "random"
@@ -54,8 +42,6 @@ def stripBallerinaExtensionVersion(String extVersion) {
     }
 }
 
-apply plugin: 'io.ballerina.plugin'
-
 ballerina {
     packageOrganization = packageOrg
     module = packageName

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@
  */
 
 plugins {
-    id "com.github.spotbugs-base"
+    id "com.github.spotbugs"
     id "com.github.johnrengelman.shadow"
     id "de.undercouch.download"
     id "net.researchgate.release"
@@ -64,9 +64,15 @@ subprojects {
 
     configurations {
         ballerinaStdLibs
+        jbalTools
     }
 
     dependencies {
+        /* JBallerina Tools */
+        jbalTools ("org.ballerinalang:jballerina-tools:${ballerinaLangVersion}") {
+            transitive = false
+        }
+
         /* Standard libraries */
         ballerinaStdLibs "io.ballerina.stdlib:time-ballerina:${project.stdlibTimeVersion}"
     }

diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ spotbugsPluginVersion=6.0.18
 shadowJarPluginVersion=7.1.2
 downloadPluginVersion=5.4.0
 releasePluginVersion=2.6.0
-ballerinaGradlePluginVersion=2.0.1
+ballerinaGradlePluginVersion=2.3.0
 
 ballerinaLangVersion=2201.11.0-20250127-101700-a4b67fe5
 

diff --git a/settings.gradle b/settings.gradle
@@ -9,10 +9,22 @@
 
 pluginManagement {
     plugins {
-        id "com.github.spotbugs-base" version "${spotbugsPluginVersion}"
+        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")
+            }
+        }
     }
 }