Skip to content

Commit

Permalink
Merge pull request #497 from ravinperera00/java21_2
Browse files Browse the repository at this point in the history
Sync with master
  • Loading branch information
warunalakshitha authored Nov 13, 2024
2 parents 2f4e8e9 + 321e5f1 commit 201b904
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 26 deletions.
19 changes: 0 additions & 19 deletions .github/workflows/stale_check.yml

This file was deleted.

8 changes: 4 additions & 4 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[package]
org = "ballerina"
name = "time"
version = "2.5.1"
version = "2.6.0"
authors = ["Ballerina"]
keywords = ["time", "utc", "epoch", "civil"]
repository = "https://github.com/ballerina-platform/module-ballerina-time"
icon = "icon.png"
license = ["Apache-2.0"]
distribution = "2201.8.0"
distribution = "2201.11.0"

[platform.java21]
graalvmCompatible = true

[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "time-native"
version = "2.5.1"
path = "../native/build/libs/time-native-2.5.1-SNAPSHOT.jar"
version = "2.6.0"
path = "../native/build/libs/time-native-2.6.0-SNAPSHOT.jar"
2 changes: 1 addition & 1 deletion ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ modules = [
[[package]]
org = "ballerina"
name = "time"
version = "2.5.1"
version = "2.6.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "test"}
Expand Down
1 change: 1 addition & 0 deletions ballerina/time_types.bal
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ public type ZoneOffset readonly & record {|
decimal seconds?;
|};

@java:ExternalDependency
type ReadWriteZoneOffset record {|
int hours;
int minutes = 0;
Expand Down
2 changes: 1 addition & 1 deletion build-config/resources/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ keywords = ["time", "utc", "epoch", "civil"]
repository = "https://github.com/ballerina-platform/module-ballerina-time"
icon = "icon.png"
license = ["Apache-2.0"]
distribution = "2201.8.0"
distribution = "2201.11.0"

[platform.java21]
graalvmCompatible = true
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org.gradle.caching=true
group=io.ballerina.stdlib
version=2.5.1-SNAPSHOT
version=2.6.0-SNAPSHOT
ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87
githubSpotbugsVersion=6.0.18
githubJohnrengelmanShadowVersion=8.1.1
Expand Down

0 comments on commit 201b904

Please sign in to comment.