Merge pull request #127 from warunalakshitha/syncJava21

Migrate to Java 21
ballerina-platform · Nov 18, 2024 · 506db7f · 506db7f
2 parents 6abe582 + 48b62df
commit 506db7f
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -132,7 +132,7 @@ This repository only contains the source code for the module.
 
 ### Set up the prerequisites
 
-1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations).
+1. Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations).
 
    * [Oracle](https://www.oracle.com/java/technologies/downloads/)
 

diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -9,10 +9,10 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.11.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "constraint-native"
 version = "1.6.0"

diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -5,7 +5,7 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.11.0-20241111-172200-095db58f"
+distribution-version = "2201.11.0-20241117-133400-a3054b77"
 
 [[package]]
 org = "ballerina"

diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
@@ -9,10 +9,10 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.11.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "constraint-native"
 version = "@toml.version@"

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@
  */
 
 plugins {
-    id "com.github.spotbugs" version "5.0.14"
+    id "com.github.spotbugs" version "6.0.18"
     id "com.github.johnrengelman.shadow" version "7.1.2"
     id "de.undercouch.download" version "5.4.0"
     id "net.researchgate.release" version "2.8.0"

diff --git a/compiler-plugin-tests/build.gradle b/compiler-plugin-tests/build.gradle
@@ -55,8 +55,11 @@ checkstyle {
 checkstyleTest.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsTest {
-    effort "max"
-    reportLevel "low"
+    def classLoader = plugins["com.github.spotbugs"].class.classLoader
+    def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence")
+    def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort")
+    effort = SpotBugsEffort.MAX
+    reportLevel = SpotBugsConfidence.LOW
     reportsDir = file("$project.buildDir/reports/spotbugs")
     reports {
         html.enabled true

diff --git a/compiler-plugin/build.gradle b/compiler-plugin/build.gradle
@@ -47,8 +47,11 @@ checkstyle {
 checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsMain {
-    effort "max"
-    reportLevel "low"
+    def classLoader = plugins["com.github.spotbugs"].class.classLoader
+    def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence")
+    def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort")
+    effort = SpotBugsEffort.MAX
+    reportLevel = SpotBugsConfidence.LOW
     reportsDir = file("$project.buildDir/reports/spotbugs")
     reports {
         html.enabled true

diff --git a/gradle.properties b/gradle.properties
@@ -6,8 +6,9 @@ slf4jVersion=1.7.30
 testngVersion=7.6.1
 ballerinaGradlePluginVersion=2.2.3
 jacocoVersion=0.8.10
+githubSpotbugsVersion=6.0.18
 
-ballerinaLangVersion=2201.11.0-20241111-172200-095db58f
+ballerinaLangVersion=2201.11.0-20241117-133400-a3054b77
 
 # Test dependency
-stdlibTimeVersion=2.6.0-20241106-140700-1bb5302
+stdlibTimeVersion=2.6.0-20241113-073800-201b904
diff --git a/native/build.gradle b/native/build.gradle
@@ -42,8 +42,11 @@ checkstyle {
 checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsMain {
-    effort "max"
-    reportLevel "low"
+    def classLoader = plugins["com.github.spotbugs"].class.classLoader
+    def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence")
+    def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort")
+    effort = SpotBugsEffort.MAX
+    reportLevel = SpotBugsConfidence.LOW
     reportsDir = file("$project.buildDir/reports/spotbugs")
     reports {
         html.enabled true

diff --git a/native/src/main/java/io/ballerina/stdlib/constraint/Constraints.java b/native/src/main/java/io/ballerina/stdlib/constraint/Constraints.java
@@ -18,12 +18,12 @@
 
 package io.ballerina.stdlib.constraint;
 
-import io.ballerina.runtime.api.TypeTags;
 import io.ballerina.runtime.api.types.AnnotatableType;
 import io.ballerina.runtime.api.types.ArrayType;
 import io.ballerina.runtime.api.types.IntersectionType;
 import io.ballerina.runtime.api.types.RecordType;
 import io.ballerina.runtime.api.types.Type;
+import io.ballerina.runtime.api.types.TypeTags;
 import io.ballerina.runtime.api.types.UnionType;
 import io.ballerina.runtime.api.utils.TypeUtils;
 import io.ballerina.runtime.api.utils.ValueUtils;

diff --git a/native/src/main/java/io/ballerina/stdlib/constraint/annotations/TypeAnnotations.java b/native/src/main/java/io/ballerina/stdlib/constraint/annotations/TypeAnnotations.java
@@ -18,12 +18,12 @@
 
 package io.ballerina.stdlib.constraint.annotations;
 
-import io.ballerina.runtime.api.TypeTags;
 import io.ballerina.runtime.api.types.AnnotatableType;
 import io.ballerina.runtime.api.types.ArrayType;
 import io.ballerina.runtime.api.types.IntersectionType;
 import io.ballerina.runtime.api.types.RecordType;
 import io.ballerina.runtime.api.types.Type;
+import io.ballerina.runtime.api.types.TypeTags;
 import io.ballerina.runtime.api.utils.TypeUtils;
 import io.ballerina.runtime.api.values.BArray;
 import io.ballerina.runtime.api.values.BDecimal;