Skip to content

Commit

Permalink
Merge pull request #164 from dilanSachi/bump-versions
Browse files Browse the repository at this point in the history
Bump versions for update 9
  • Loading branch information
dilanSachi authored Apr 10, 2024
2 parents a1edebb + 10650d8 commit 35cd4ff
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 25 deletions.
20 changes: 13 additions & 7 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[package]
org = "ballerina"
name = "mqtt"
version = "1.0.0"
version = "1.1.0"
authors = ["ballerina"]
keywords = ["mqtt", "client", "messaging", "network", "pubsub", "iot"]
repository = "https:/ballerina-platform/module-ballerina-mqtt"
distribution = "2201.8.0"
distribution = "2201.9.0"

[platform.java17]
graalvmCompatible = true

[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "mqtt-native"
version = "1.0.0"
path = "../native/build/libs/mqtt-native-1.0.0.jar"
version = "1.1.0"
path = "../native/build/libs/mqtt-native-1.1.0-SNAPSHOT.jar"

[[platform.java17.dependency]]
groupId = "org.eclipse.paho"
Expand All @@ -24,6 +24,12 @@ path = "./lib/org.eclipse.paho.mqttv5.client-1.2.5.jar"

[[platform.java17.dependency]]
groupId = "org.bouncycastle"
artifactId = "bcpkix-jdk15on"
version = "1.69"
path = "./lib/bcpkix-jdk15on-1.69.jar"
artifactId = "bcpkix-jdk18on"
version = "1.77"
path = "./lib/bcpkix-jdk18on-1.77.jar"

[[platform.java17.dependency]]
groupId = "org.bouncycastle"
artifactId = "bcutil-jdk18on"
version = "1.77"
path = "./lib/bcutil-jdk18on-1.77.jar"
2 changes: 1 addition & 1 deletion ballerina/CompilerPlugin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0.jar"
path = "../compiler-plugin/build/libs/mqtt-compiler-plugin-1.1.0-SNAPSHOT.jar"
21 changes: 16 additions & 5 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.8.0"
distribution-version = "2201.9.0-20240405-165800-4b163f78"

[[package]]
org = "ballerina"
name = "crypto"
version = "2.5.0"
version = "2.7.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "time"}
Expand Down Expand Up @@ -47,6 +47,16 @@ dependencies = [
{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"
Expand Down Expand Up @@ -112,7 +122,7 @@ modules = [
[[package]]
org = "ballerina"
name = "mqtt"
version = "1.0.0"
version = "1.1.0"
dependencies = [
{org = "ballerina", name = "crypto"},
{org = "ballerina", name = "jballerina.java"},
Expand All @@ -128,7 +138,7 @@ modules = [
[[package]]
org = "ballerina"
name = "observe"
version = "1.2.0"
version = "1.2.3"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
Expand All @@ -141,6 +151,7 @@ version = "0.0.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.array"},
{org = "ballerina", name = "lang.error"}
]
modules = [
Expand All @@ -158,7 +169,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "uuid"
version = "1.7.0"
version = "1.8.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "crypto"},
Expand Down
5 changes: 4 additions & 1 deletion ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ dependencies {
externalJars(group: 'org.eclipse.paho', name: 'org.eclipse.paho.mqttv5.client', version: "${pahoMqtt5Version}") {
transitive = false
}
externalJars(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: "${bouncycastleVersion}") {
externalJars(group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: "${bouncycastleVersion}") {
transitive = false
}
externalJars(group: 'org.bouncycastle', name: 'bcutil-jdk18on', version: "${bouncycastleVersion}") {
transitive = false
}
}
Expand Down
12 changes: 9 additions & 3 deletions build-config/resources/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = "@toml.version@"
authors = ["ballerina"]
keywords = ["mqtt", "client", "messaging", "network", "pubsub", "iot"]
repository = "https:/ballerina-platform/module-ballerina-mqtt"
distribution = "2201.8.0"
distribution = "2201.9.0"

[platform.java17]
graalvmCompatible = true
Expand All @@ -24,6 +24,12 @@ path = "./lib/[email protected]@.jar"

[[platform.java17.dependency]]
groupId = "org.bouncycastle"
artifactId = "bcpkix-jdk15on"
artifactId = "bcpkix-jdk18on"
version = "@bouncy.castle.version@"
path = "./lib/[email protected]@.jar"
path = "./lib/[email protected]@.jar"

[[platform.java17.dependency]]
groupId = "org.bouncycastle"
artifactId = "bcutil-jdk18on"
version = "@bouncy.castle.version@"
path = "./lib/[email protected]@.jar"
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
org.gradle.caching=true
group=io.ballerina.stdlib
version=1.0.1-SNAPSHOT
ballerinaLangVersion=2201.8.0
version=1.1.0-SNAPSHOT
ballerinaLangVersion=2201.9.0-20240405-165800-4b163f78

checkstylePluginVersion=10.12.1
spotbugsPluginVersion=5.0.14
Expand All @@ -14,7 +14,7 @@ testngVersion=7.6.1
gsonVersion=2.8.8
jacocoVersion=0.8.10

bouncycastleVersion=1.69
bouncycastleVersion=1.77
pahoMqtt5Version=1.2.5

#stdlib dependencies
Expand All @@ -25,11 +25,11 @@ stdlibIoVersion=1.6.0

# Level 02
stdlibLogVersion=2.9.0
stdlibCryptoVersion=2.5.0
stdlibCryptoVersion=2.7.0-20240410-115200-2ae9fd5
stdlibRandomVersion=1.5.0

# Level 03
stdlibUuidVersion=1.7.0
stdlibUuidVersion=1.8.0-20240410-125400-bbe7ac5

observeVersion=1.2.0
observeInternalVersion=1.2.0
observeVersion=1.2.3-20240408-194900-a0e331f
observeInternalVersion=1.2.2-20240408-195500-1436319
3 changes: 2 additions & 1 deletion native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ dependencies {
implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}"
implementation group: 'io.ballerina.stdlib', name: 'crypto-native', version: "${stdlibCryptoVersion}"
implementation group: 'org.eclipse.paho', name: 'org.eclipse.paho.mqttv5.client', version:"${pahoMqtt5Version}"
implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version:"${bouncycastleVersion}"
implementation group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version:"${bouncycastleVersion}"
implementation group: 'org.bouncycastle', name: 'bcutil-jdk18on', version: "${bouncycastleVersion}"
}

def excludePattern = '**/module-info.java'
Expand Down

0 comments on commit 35cd4ff

Please sign in to comment.