From ffb1029968f0c4f300658d7086c4b617ecb9ca9c Mon Sep 17 00:00:00 2001 From: tharindu-nw <52607043+tharindu-nw@users.noreply.github.com> Date: Wed, 5 Mar 2025 18:11:43 +0530 Subject: [PATCH 1/2] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 8 +- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 183 ---------------------------------- 3 files changed, 5 insertions(+), 188 deletions(-) delete mode 100644 ballerina/Dependencies.toml diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 99f8760..799cae4 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,11 +1,11 @@ [package] org = "ballerina" name = "mqtt" -version = "1.3.1" +version = "1.4.0" authors = ["ballerina"] keywords = ["mqtt", "client", "messaging", "network", "pubsub", "iot"] repository = "https://github.com/ballerina-platform/module-ballerina-mqtt" -distribution = "2201.11.0" +distribution = "2201.12.0" [platform.java21] graalvmCompatible = true @@ -13,8 +13,8 @@ graalvmCompatible = true [[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "mqtt-native" -version = "1.3.1" -path = "../native/build/libs/mqtt-native-1.3.1-SNAPSHOT.jar" +version = "1.4.0" +path = "../native/build/libs/mqtt-native-1.4.0-SNAPSHOT.jar" [[platform.java21.dependency]] groupId = "org.eclipse.paho" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 534e0e8..4512e86 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "mqtt-compiler-plugin" class = "io.ballerina.stdlib.mqtt.compiler.MqttCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/mqtt-compiler-plugin-1.3.1-SNAPSHOT.jar" +path = "../compiler-plugin/build/libs/mqtt-compiler-plugin-1.4.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml deleted file mode 100644 index f429530..0000000 --- a/ballerina/Dependencies.toml +++ /dev/null @@ -1,183 +0,0 @@ -# AUTO-GENERATED FILE. DO NOT MODIFY. - -# This file is auto-generated by Ballerina for managing dependency versions. -# It should not be modified by hand. - -[ballerina] -dependencies-toml-version = "2" -distribution-version = "2201.12.0-20250228-201300-8d411a0f" - -[[package]] -org = "ballerina" -name = "crypto" -version = "2.8.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "time"} -] -modules = [ - {org = "ballerina", packageName = "crypto", moduleName = "crypto"} -] - -[[package]] -org = "ballerina" -name = "io" -version = "1.7.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.value"} -] - -[[package]] -org = "ballerina" -name = "jballerina.java" -version = "0.0.0" -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" -version = "0.0.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "lang.int" -version = "0.0.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.__internal"}, - {org = "ballerina", name = "lang.object"} -] - -[[package]] -org = "ballerina" -name = "lang.object" -version = "0.0.0" -scope = "testOnly" - -[[package]] -org = "ballerina" -name = "lang.runtime" -version = "0.0.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] -modules = [ - {org = "ballerina", packageName = "lang.runtime", moduleName = "lang.runtime"} -] - -[[package]] -org = "ballerina" -name = "lang.value" -version = "0.0.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "log" -version = "2.11.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "io"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.value"}, - {org = "ballerina", name = "observe"} -] -modules = [ - {org = "ballerina", packageName = "log", moduleName = "log"} -] - -[[package]] -org = "ballerina" -name = "mqtt" -version = "1.3.1" -dependencies = [ - {org = "ballerina", name = "crypto"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.runtime"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "test"}, - {org = "ballerina", name = "uuid"} -] -modules = [ - {org = "ballerina", packageName = "mqtt", moduleName = "mqtt"} -] - -[[package]] -org = "ballerina" -name = "observe" -version = "1.4.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "test" -version = "0.0.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.array"}, - {org = "ballerina", name = "lang.error"} -] -modules = [ - {org = "ballerina", packageName = "test", moduleName = "test"} -] - -[[package]] -org = "ballerina" -name = "time" -version = "2.6.0" -dependencies = [ - {org = "ballerina", name = "jballerina.java"} -] - -[[package]] -org = "ballerina" -name = "uuid" -version = "1.9.0" -scope = "testOnly" -dependencies = [ - {org = "ballerina", name = "crypto"}, - {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "lang.int"}, - {org = "ballerina", name = "time"} -] -modules = [ - {org = "ballerina", packageName = "uuid", moduleName = "uuid"} -] - From cc739ef626d263cc33726ffed1ce19778bc8c59d Mon Sep 17 00:00:00 2001 From: tharindu-nw <52607043+tharindu-nw@users.noreply.github.com> Date: Wed, 5 Mar 2025 18:48:30 +0530 Subject: [PATCH 2/2] Update dependencies for U12 --- ballerina/Dependencies.toml | 183 ++++++++++++++++++++++++++++++++++++ ballerina/build.gradle | 1 + gradle.properties | 16 ++-- 3 files changed, 192 insertions(+), 8 deletions(-) create mode 100644 ballerina/Dependencies.toml diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml new file mode 100644 index 0000000..67a21f1 --- /dev/null +++ b/ballerina/Dependencies.toml @@ -0,0 +1,183 @@ +# AUTO-GENERATED FILE. DO NOT MODIFY. + +# This file is auto-generated by Ballerina for managing dependency versions. +# It should not be modified by hand. + +[ballerina] +dependencies-toml-version = "2" +distribution-version = "2201.12.0-20250228-201300-8d411a0f" + +[[package]] +org = "ballerina" +name = "crypto" +version = "2.9.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "time"} +] +modules = [ + {org = "ballerina", packageName = "crypto", moduleName = "crypto"} +] + +[[package]] +org = "ballerina" +name = "io" +version = "1.8.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.value"} +] + +[[package]] +org = "ballerina" +name = "jballerina.java" +version = "0.0.0" +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" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "lang.int" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.__internal"}, + {org = "ballerina", name = "lang.object"} +] + +[[package]] +org = "ballerina" +name = "lang.object" +version = "0.0.0" +scope = "testOnly" + +[[package]] +org = "ballerina" +name = "lang.runtime" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] +modules = [ + {org = "ballerina", packageName = "lang.runtime", moduleName = "lang.runtime"} +] + +[[package]] +org = "ballerina" +name = "lang.value" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "log" +version = "2.12.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.value"}, + {org = "ballerina", name = "observe"} +] +modules = [ + {org = "ballerina", packageName = "log", moduleName = "log"} +] + +[[package]] +org = "ballerina" +name = "mqtt" +version = "1.4.0" +dependencies = [ + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.runtime"}, + {org = "ballerina", name = "log"}, + {org = "ballerina", name = "test"}, + {org = "ballerina", name = "uuid"} +] +modules = [ + {org = "ballerina", packageName = "mqtt", moduleName = "mqtt"} +] + +[[package]] +org = "ballerina" +name = "observe" +version = "1.5.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "test" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.array"}, + {org = "ballerina", name = "lang.error"} +] +modules = [ + {org = "ballerina", packageName = "test", moduleName = "test"} +] + +[[package]] +org = "ballerina" +name = "time" +version = "2.7.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "uuid" +version = "1.10.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.int"}, + {org = "ballerina", name = "time"} +] +modules = [ + {org = "ballerina", packageName = "uuid", moduleName = "uuid"} +] + diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 0bb111e..69e5110 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -150,5 +150,6 @@ build.dependsOn ":mqtt-native:build" build.dependsOn ":${packageName}-compiler-plugin:build" build.dependsOn "generatePomFileForMavenPublication" test.dependsOn ":${packageName}-compiler-plugin:build" +test.dependsOn ":mqtt-native:build" publishToMavenLocal.dependsOn build publish.dependsOn build diff --git a/gradle.properties b/gradle.properties index 8386e71..7687bb5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,16 +19,16 @@ pahoMqtt5Version=1.2.5 #stdlib dependencies # Level 01 -stdlibTimeVersion=2.6.0 -stdlibIoVersion=1.7.0 +stdlibTimeVersion=2.7.0-20250304-133100-009bfd7 +stdlibIoVersion=1.8.0-20250304-133300-967a7a4 # Level 02 -stdlibLogVersion=2.11.0 -stdlibCryptoVersion=2.8.0 -stdlibRandomVersion=1.6.0 +stdlibLogVersion=2.12.0-20250305-165600-b4606dd +stdlibCryptoVersion=2.9.0-20250305-165500-b42b932 +stdlibRandomVersion=1.7.0-20250305-165400-16e4670 # Level 03 -stdlibUuidVersion=1.9.0 +stdlibUuidVersion=1.10.0-20250305-175100-746df53 -observeVersion=1.4.0 -observeInternalVersion=1.4.0 +observeVersion=1.5.0-20250304-140800-d60274b +observeInternalVersion=1.5.0-20250305-160800-51dc066