From 3635b5d7248aef0968a9bfb4959e7fe577e55915 Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Wed, 6 Nov 2024 14:05:34 +0530 Subject: [PATCH 1/9] [Automated] Update native jar versions in toml files --- ballerina/Ballerina.toml | 10 +++++----- ballerina/Dependencies.toml | 31 +++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 01555db0..127e90a5 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" authors = ["Ballerina"] keywords = ["io", "json", "xml", "csv", "file"] repository = "https://github.com/ballerina-platform/module-ballerina-io" @@ -15,11 +15,11 @@ graalvmCompatible = true [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "io-native" -path = "../native/build/libs/io-native-1.6.1.jar" -version = "1.6.1" +path = "../native/build/libs/io-native-1.6.2-SNAPSHOT.jar" +version = "1.6.2" [[platform.java17.dependency]] -path = "../test-utils/build/libs/io-test-utils-1.6.1.jar" +path = "../test-utils/build/libs/io-test-utils-1.6.2-SNAPSHOT.jar" scope = "testOnly" -version = "1.6.1" +version = "1.6.2-SNAPSHOT" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index bbe26e6e..16951e30 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.0" +distribution-version = "2201.11.0-20241101-105200-f94714be" [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.float"}, @@ -31,6 +31,26 @@ modules = [ {org = "ballerina", packageName = "jballerina.java", moduleName = "jballerina.java"} ] +[[package]] +org = "ballerina" +name = "lang.__internal" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + +[[package]] +org = "ballerina" +name = "lang.array" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.__internal"} +] + [[package]] org = "ballerina" name = "lang.error" @@ -52,6 +72,12 @@ modules = [ {org = "ballerina", packageName = "lang.float", moduleName = "lang.float"} ] +[[package]] +org = "ballerina" +name = "lang.object" +version = "0.0.0" +scope = "testOnly" + [[package]] org = "ballerina" name = "lang.regexp" @@ -104,6 +130,7 @@ version = "0.0.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, {org = "ballerina", name = "lang.error"} ] modules = [ From 526319316d3b4a490e524b8068f3d233bab76af4 Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Wed, 6 Nov 2024 14:24:27 +0530 Subject: [PATCH 2/9] Update ballerina lang version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7a58ba44..eb1c526e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.caching=true group=io.ballerina.stdlib version=1.6.2-SNAPSHOT -ballerinaLangVersion=2201.8.0 +ballerinaLangVersion=2201.11.0-20241101-105200-f94714be puppycrawlCheckstyleVersion=10.12.0 testngVersion=7.6.1 slf4jVersion=1.7.30 From f6b504e1f9b022109f18a144a2fdd1746693b8d0 Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Wed, 6 Nov 2024 14:24:47 +0530 Subject: [PATCH 3/9] Mark missing types as external-dependencies --- ballerina/constants.bal | 3 +++ ballerina/io_error.bal | 4 ++++ ballerina/types.bal | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ballerina/constants.bal b/ballerina/constants.bal index 85b591d5..8760a377 100644 --- a/ballerina/constants.bal +++ b/ballerina/constants.bal @@ -14,6 +14,8 @@ // specific language governing permissions and limitations // under the License. +import ballerina/jballerina.java; + # The format, which will be used to represent the CSV. # # DEFAULT - The default value is the format specified by the CSVChannel. Precedence will be given to the field @@ -22,6 +24,7 @@ # CSV - Field separator will be "," and the record separator will be a new line. # # TDF - Field separator will be a tab and the record separator will be a new line. +@java:ExternalDependency public type Format DEFAULT|CSV|TDF; # The default value is the format specified by the CSVChannel. Precedence will be given to the field separator and record separator. diff --git a/ballerina/io_error.bal b/ballerina/io_error.bal index a8c215c0..78ca1cdd 100644 --- a/ballerina/io_error.bal +++ b/ballerina/io_error.bal @@ -14,16 +14,20 @@ // specific language governing permissions and limitations // under the License. +import ballerina/jballerina.java; + # Represents IO module related errors. public type Error distinct error; # This will return when connection timed out happen when try to connect to a remote host. +@java:ExternalDependency public type ConnectionTimedOutError distinct Error; # Represents generic IO error. The detail record contains the information related to the error. public type GenericError distinct Error; # This will get returned due to file permission issues. +@java:ExternalDependency public type AccessDeniedError distinct Error; # This will get returned if the file is not available in the given file path. diff --git a/ballerina/types.bal b/ballerina/types.bal index 4657e7ab..49402fb5 100644 --- a/ballerina/types.bal +++ b/ballerina/types.bal @@ -17,7 +17,7 @@ import ballerina/jballerina.java; # The iterator for the stream returned in `readFileCsvAsStream` function. - +@java:ExternalDependency public class CsvIterator { private boolean isClosed = false; public isolated function next() returns record {|anydata value;|}|error? { From c4c62ac196c7f35123747dc10db7d27becfa9176 Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Mon, 11 Nov 2024 10:46:22 +0530 Subject: [PATCH 4/9] [Automated] Update native jar versions in toml files --- ballerina/Dependencies.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 16951e30..90d4329b 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.11.0-20241101-105200-f94714be" +distribution-version = "2201.11.0-20241111-101700-af28a18f" [[package]] org = "ballerina" From f21b7dbb98950880d7c2133880bf54bdfe2d8795 Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Mon, 11 Nov 2024 13:46:31 +0530 Subject: [PATCH 5/9] [Automated] Update native jar versions in toml files --- ballerina/Dependencies.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 90d4329b..16951e30 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.11.0-20241111-101700-af28a18f" +distribution-version = "2201.11.0-20241101-105200-f94714be" [[package]] org = "ballerina" From db4fffc23288ee7d8d34e7ab279f5f7465940517 Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Mon, 11 Nov 2024 13:47:18 +0530 Subject: [PATCH 6/9] [Automated] Update native jar versions in toml files --- ballerina/Dependencies.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 16951e30..90d4329b 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.11.0-20241101-105200-f94714be" +distribution-version = "2201.11.0-20241111-101700-af28a18f" [[package]] org = "ballerina" From 9002d3907c29432d92a5671fb7f35848417f2102 Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Mon, 18 Nov 2024 15:47:53 +0530 Subject: [PATCH 7/9] Remove deadcode annotation --- ballerina/constants.bal | 3 --- 1 file changed, 3 deletions(-) diff --git a/ballerina/constants.bal b/ballerina/constants.bal index 8760a377..85b591d5 100644 --- a/ballerina/constants.bal +++ b/ballerina/constants.bal @@ -14,8 +14,6 @@ // specific language governing permissions and limitations // under the License. -import ballerina/jballerina.java; - # The format, which will be used to represent the CSV. # # DEFAULT - The default value is the format specified by the CSVChannel. Precedence will be given to the field @@ -24,7 +22,6 @@ import ballerina/jballerina.java; # CSV - Field separator will be "," and the record separator will be a new line. # # TDF - Field separator will be a tab and the record separator will be a new line. -@java:ExternalDependency public type Format DEFAULT|CSV|TDF; # The default value is the format specified by the CSVChannel. Precedence will be given to the field separator and record separator. From 904e66d48ff0e477578ccd3112c6317c239fc8b7 Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Mon, 18 Nov 2024 15:48:43 +0530 Subject: [PATCH 8/9] [Automated] Update native jar versions in toml files --- ballerina/Ballerina.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 1c287bab..1bbd9ffe 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -18,7 +18,6 @@ artifactId = "io-native" path = "../native/build/libs/io-native-1.7.0-SNAPSHOT.jar" version = "1.7.0" - [[platform.java21.dependency]] path = "../test-utils/build/libs/io-test-utils-1.7.0-SNAPSHOT.jar" scope = "testOnly" From d86b3eaacea05f4b31ca7d881cb05962de4973d5 Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Mon, 18 Nov 2024 15:49:00 +0530 Subject: [PATCH 9/9] [Automated] Update native jar versions in toml files --- ballerina/Ballerina.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 1bbd9ffe..1c287bab 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -18,6 +18,7 @@ artifactId = "io-native" path = "../native/build/libs/io-native-1.7.0-SNAPSHOT.jar" version = "1.7.0" + [[platform.java21.dependency]] path = "../test-utils/build/libs/io-test-utils-1.7.0-SNAPSHOT.jar" scope = "testOnly"