From f5b5bd71a5945d282484f0a338afe81f1c508f25 Mon Sep 17 00:00:00 2001 From: Sasindu Alahakoon Date: Wed, 20 Nov 2024 13:17:29 +0530 Subject: [PATCH 1/6] [Automated] Update the native jar versions --- ballerina/Dependencies.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 5ade3d1..68c32a0 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -177,7 +177,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.4.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} From 7bbd2505e13ae6d384159cb948f381fbd8249edf Mon Sep 17 00:00:00 2001 From: Sasindu Alahakoon Date: Wed, 20 Nov 2024 13:32:51 +0530 Subject: [PATCH 2/6] Update version into 1.0.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 03c3742..ba444bc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.caching=true group=io.ballerina.lib -version=0.3.0-SNAPSHOT +version=1.0.0-SNAPSHOT ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87 checkstyleToolVersion=10.12.0 From 4f136578df199f918bc8d91de931fad1b22835ff Mon Sep 17 00:00:00 2001 From: Sasindu Alahakoon Date: Wed, 20 Nov 2024 13:42:33 +0530 Subject: [PATCH 3/6] Revert dependencies toml changes --- ballerina/Dependencies.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 68c32a0..5ade3d1 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -177,7 +177,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.0" +version = "2.5.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} From 06ef0b9ec8698ffca1f7f829694b2c43c0221c6c Mon Sep 17 00:00:00 2001 From: Sasindu Alahakoon Date: Wed, 20 Nov 2024 13:47:02 +0530 Subject: [PATCH 4/6] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 10 +++++----- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 10e878e..e61d259 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "data.jsondata" -version = "0.3.0" +version = "1.0.0" authors = ["Ballerina"] keywords = ["json", "json path", "json-transform", "json transform", "json to json", "json-convert", "json convert"] repository = "https://github.com/ballerina-platform/module-ballerina-data.jsondata" @@ -15,8 +15,8 @@ graalvmCompatible = true [[platform.java21.dependency]] groupId = "io.ballerina.lib" artifactId = "jsondata-native" -version = "0.3.0" -path = "../native/build/libs/data.jsondata-native-0.3.0-SNAPSHOT.jar" +version = "1.0.0" +path = "../native/build/libs/data.jsondata-native-1.0.0-SNAPSHOT.jar" [[platform.java21.dependency]] path = "./lib/json-path-2.9.0.jar" @@ -39,5 +39,5 @@ version = "2.4.7" [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "constraint-native" -version = "1.5.1" -path = "./lib/constraint-native-1.5.1-20240930-123400-5ecd396.jar" +version = "1.6.0" +path = "./lib/constraint-native-1.6.0-20241113-090900-d276ad5.jar" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 9dfea19..8d3f43a 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "constraint-compiler-plugin" class = "io.ballerina.lib.data.jsondata.compiler.JsondataCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/data.jsondata-compiler-plugin-0.3.0-SNAPSHOT.jar" +path = "../compiler-plugin/build/libs/data.jsondata-compiler-plugin-1.0.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 5ade3d1..4be0eb6 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.11.0-20241112-214900-6b80ab87" [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -22,7 +22,7 @@ modules = [ [[package]] org = "ballerina" name = "data.jsondata" -version = "0.3.0" +version = "1.0.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "file"}, @@ -42,7 +42,7 @@ modules = [ [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -57,7 +57,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -153,7 +153,7 @@ modules = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -177,7 +177,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} From 31056c4c3324b78b0d52e40e644b6ee488b61572 Mon Sep 17 00:00:00 2001 From: Sasindu Alahakoon Date: Wed, 20 Nov 2024 13:56:04 +0530 Subject: [PATCH 5/6] Fix test with union types --- ballerina/tests/from_json_string_test.bal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina/tests/from_json_string_test.bal b/ballerina/tests/from_json_string_test.bal index e46ea48..009ca20 100644 --- a/ballerina/tests/from_json_string_test.bal +++ b/ballerina/tests/from_json_string_test.bal @@ -1616,7 +1616,7 @@ isolated function testParseStringNegative4() returns Error? { Union|Error y = parseString(str); test:assertTrue(y is Error); - test:assertEquals((y).message(), "incompatible expected type 'ballerina/data.jsondata:0:Union' for value '{\"name\":\"John\"}'"); + test:assertEquals((y).message(), "incompatible expected type 'ballerina/data.jsondata:1:Union' for value '{\"name\":\"John\"}'"); table|Error z = parseString(str); test:assertTrue(z is Error); From 6625aa9ddabd2dfbe9b4c3fbd2ede2a1e281237c Mon Sep 17 00:00:00 2001 From: Sasindu Alahakoon Date: Wed, 20 Nov 2024 14:38:08 +0530 Subject: [PATCH 6/6] Update compatible ballerina version into u11 --- build-config/resources/Ballerina.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 05c32b8..f8fabf8 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -6,7 +6,7 @@ authors = ["Ballerina"] keywords = ["json", "json path", "json-transform", "json transform", "json to json", "json-convert", "json convert"] repository = "https://github.com/ballerina-platform/module-ballerina-data.jsondata" license = ["Apache-2.0"] -distribution = "2201.10.0" +distribution = "2201.11.0" export = ["data.jsondata"] [platform.java21]