Merge branch 'warunalakshitha-syncJava21' into danesh-dev

.github/CODEOWNERS

@@ -4,4 +4,4 @@
 # See: https://help.github.com/articles/about-codeowners/
 
 # These owners will be the default owners for everything in the repo.
-*       @daneshk @sahanhe
+*       @daneshk @lnash94 @shafreenAnfar

README.md

@@ -24,7 +24,7 @@ This repository only contains the source code for the package.
 
 ### 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/)
    * [OpenJDK](https://adoptium.net/)
 

ballerina/Ballerina.toml

@@ -9,17 +9,17 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.10.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "persist.googlesheets-native"
 version = "1.4.0"
-path = "../native/build/libs/persist.googlesheets-native-1.4.0-SNAPSHOT.jar"
+path = "../native/build/libs/persist.googlesheets-native-1.4.0.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "persist-native"
 version = "1.4.0"
-path = "./lib/persist-native-1.4.0-20240808-102300-3b855e5.jar"
+path = "./lib/persist-native-1.4.0.jar"

ballerina/Dependencies.toml

@@ -5,7 +5,7 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.10.0-20240806-083400-aabac46a"
+distribution-version = "2201.10.0"
 
 [[package]]
 org = "ballerina"

build-config/resources/Ballerina.toml

@@ -9,16 +9,16 @@ icon = "icon.png"
 license = ["Apache-2.0"]
 distribution = "2201.10.0"
 
-[platform.java17]
+[platform.java21]
 graalvmCompatible = true
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "persist.googlesheets-native"
 version = "@toml.version@"
 path = "../native/build/libs/persist.googlesheets-native-@project.version@.jar"
 
-[[platform.java17.dependency]]
+[[platform.java21.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "persist-native"
 version = "@persist.version@"

build.gradle

@@ -86,6 +86,7 @@ subprojects {
         ballerinaStdLibs "io.ballerina.stdlib:uuid-ballerina:${stdlibUuidVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:cache-ballerina:${stdlibCacheVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:oauth2-ballerina:${stdlibOAuth2Version}"
+        ballerinaStdLibs "io.ballerina.lib:data.jsondata-ballerina:${stdlibDataJsonDataVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:auth-ballerina:${stdlibAuthVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:jwt-ballerina:${stdlibJwtVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:http-ballerina:${stdlibHttpVersion}"

gradle.properties

@@ -1,62 +1,62 @@
 group=io.ballerina.stdlib
-version=1.4.0-SNAPSHOT
+version=1.4.1-SNAPSHOT
 
 puppycrawlCheckstyleVersion=10.12.1
 checkstyleToolVersion=10.12.1
-githubSpotbugsVersion=5.0.14
+githubSpotbugsVersion=6.0.18
 githubJohnrengelmanShadowVersion=8.1.1
 underCouchDownloadVersion=5.4.0
 researchgateReleaseVersion=2.8.0
 testngVersion=7.6.1
 gsonVersion=2.10
 ballerinaGradlePluginVersion=2.0.1
 
-ballerinaLangVersion=2201.10.0-20240806-083400-aabac46a
+ballerinaLangVersion=2201.11.0-20241117-133400-a3054b77
 
 # Direct Dependencies
 
 # Level 01
-stdlibIoVersion=1.6.1
-stdlibTimeVersion=2.4.0
-stdlibUrlVersion=2.4.0
+stdlibIoVersion=1.6.2-20241112-233100-995cf5f
+stdlibTimeVersion=2.6.0-20241113-073800-201b904
+stdlibUrlVersion=2.4.1-20241113-073900-335ff51
 
 # Level 02
-stdlibLogVersion=2.10.0-20240807-203000-b85cfb9
-stdlibOsVersion=1.8.0
+stdlibLogVersion=2.10.1-20241113-120000-4577868
+stdlibOsVersion=1.8.1-20241113-122000-cca973b
 
 # Level 03
-stdlibFileVersion=1.10.0-20240807-205900-a4d66bb
+stdlibFileVersion=1.10.1-20241113-151700-e1a2e38
 
 # Level 05
-stdlibHttpVersion=2.12.0-20240809-111500-91b1ccd
+stdlibHttpVersion=2.13.0-20241114-182900-7e9f66a
 
 # Level 08
-stdlibPersistVersion=1.4.0-20240808-102300-3b855e5
+stdlibPersistVersion=1.4.1-20241113-122000-306cc63
 
 # Ballerinax Observer
-observeVersion=1.3.0-20240807-093200-e29ca7a
-observeInternalVersion=1.3.0-20240807-094500-91e2d3a
+observeVersion=1.4.0-20241113-092000-b83ae74
+observeInternalVersion=1.3.1-20241113-101700-265054d
 
 # Transitive Dependencies
 # Level 01
-stdlibConstraintVersion=1.5.0
+stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5
 
 #Level 02
-stdlibCryptoVersion=2.7.2
-stdlibTaskVersion=2.5.0
+stdlibCryptoVersion=2.7.3-20241113-081400-d015a39
+stdlibTaskVersion=2.5.1-20241113-123500-f905281
 
 # Level 03
-stdlibCacheVersion=3.8.0
-stdlibMimeVersion=2.10.0-20240807-205100-2728cdc
-stdlibUuidVersion=1.8.0
+stdlibCacheVersion=3.8.1-20241113-125700-b75a1bf
+stdlibMimeVersion=2.10.2-20241113-154200-d953747
+stdlibUuidVersion=1.8.1-20241113-154400-443c67b
 
 # Level 04
-stdlibAuthVersion=2.12.0-20240807-214700-37b31bb
-stdlibJwtVersion=2.13.0-20240809-095500-b9d03ed
-stdlibOAuth2Version=2.12.0-20240807-220200-7f7294b
-
+stdlibAuthVersion=2.12.1-20241113-162300-ded40eb
+stdlibJwtVersion=2.13.1-20241113-162400-b59ccfa
+stdlibOAuth2Version=2.12.1-20241113-162400-4c6ddfe
+stdlibDataJsonDataVersion=0.3.0-20241114-143900-285d739
 # Level 06
-stdlibTransactionVersion=1.10.0-20240809-131000-44ec1bf
+stdlibTransactionVersion=1.10.1-20241116-112500-189a4e5
 
 # Connectors
 googleSheetsConnector=3.5.0

native/build.gradle

@@ -43,7 +43,7 @@ tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
 
 jacoco {
     toolVersion = "0.8.6"
@@ -77,8 +77,11 @@ jacocoTestReport {
 
 spotbugsMain {
     ignoreFailures = true
-    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")
     def excludeFile = file("${rootDir}/build-config/spotbugs-exclude.xml")
     if (excludeFile.exists()) {

native/src/main/java/io/ballerina/stdlib/persist/googlesheets/Utils.java

@@ -19,11 +19,11 @@
 package io.ballerina.stdlib.persist.googlesheets;
 
 import io.ballerina.runtime.api.Environment;
-import io.ballerina.runtime.api.PredefinedTypes;
 import io.ballerina.runtime.api.creators.TypeCreator;
 import io.ballerina.runtime.api.creators.ValueCreator;
 import io.ballerina.runtime.api.types.Field;
 import io.ballerina.runtime.api.types.MapType;
+import io.ballerina.runtime.api.types.PredefinedTypes;
 import io.ballerina.runtime.api.types.RecordType;
 import io.ballerina.runtime.api.types.Type;
 import io.ballerina.runtime.api.utils.StringUtils;