Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgraded Joda Core to 5.6.2; Upgraded Joda Timezone to 2.18.3 #377

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgraded Joda Core to 5.6.2; Upgraded Joda Timezone to 2.18.3 #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ kotlin {
sourceSets {
val jsMain by getting {
dependencies {
implementation(npm("@js-joda/timezone", "2.3.0"))
implementation(npm("@js-joda/timezone", "2.18.3"))
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ base {
val mainJavaToolchainVersion: String by project
val modularJavaToolchainVersion: String by project
val serializationVersion: String by project
val jodaCoreVersion: String by project
val jodaTimezoneVersion: String by project

java {
toolchain { languageVersion.set(JavaLanguageVersion.of(mainJavaToolchainVersion)) }
Expand Down Expand Up @@ -193,14 +195,14 @@ kotlin {
dependsOn(commonMain.get())
dependencies {
api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
implementation(npm("@js-joda/core", "3.2.0"))
implementation(npm("@js-joda/core", jodaCoreVersion))
}
}

val commonJsTest by creating {
dependsOn(commonTest.get())
dependencies {
implementation(npm("@js-joda/timezone", "2.3.0"))
implementation(npm("@js-joda/timezone", jodaTimezoneVersion))
}
}

Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ defaultKotlinVersion=1.9.21
dokkaVersion=1.9.10
serializationVersion=1.6.2
benchmarksVersion=0.7.2
jodaCoreVersion=5.6.2
jodaTimezoneVersion=2.18.3

java.mainToolchainVersion=8
java.modularToolchainVersion=11
Expand Down
13 changes: 9 additions & 4 deletions kotlin-js-store/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@
resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273"
integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg==

"@js-joda/timezone@2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@js-joda/timezone/-/timezone-2.3.0.tgz#72878f6dc8afef20c29906e5d8d946f91618a2c3"
integrity sha512-DHXdNs0SydSqC5f0oRJPpTcNfnpRojgBqMCFupQFv6WgeZAjU3DBx+A7JtaGPP3dHrP2Odi2N8Vf+uAm/8ynCQ==
"@js-joda/core@5.6.2":
version "5.6.2"
resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-5.6.2.tgz#1885d10daa404cea2bd55575f910ab3bbe6c33d7"
integrity sha512-ow4R+7C24xeTjiMTTZ4k6lvxj7MRBqvqLCQjThQff3RjOmIMokMP20LNYVFhGafJtUx/Xo2Qp4qU8eNoTVH0SA==

"@js-joda/timezone@2.18.3":
version "2.18.3"
resolved "https://registry.yarnpkg.com/@js-joda/timezone/-/timezone-2.18.3.tgz#3d3d9907557493c77f6e829a583e64db8c15792a"
integrity sha512-e+tZFIHWQJoR7ZVyGo5K/i+pPIAvFiEuq8F0CLFINSA7csSIK1dd4mtB2tb43e1/NUmDsnwo9FlhRlyBR9EzoQ==

ansi-colors@4.1.1:
version "4.1.1"
Expand Down
5 changes: 3 additions & 2 deletions serialization/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugins {

val mainJavaToolchainVersion: String by project
val serializationVersion: String by project
val jodaTimezoneVersion: String by project

java {
toolchain { languageVersion.set(JavaLanguageVersion.of(mainJavaToolchainVersion)) }
Expand Down Expand Up @@ -91,14 +92,14 @@ kotlin {
val jsMain by getting
val jsTest by getting {
dependencies {
implementation(npm("@js-joda/timezone", "2.3.0"))
implementation(npm("@js-joda/timezone", jodaTimezoneVersion))
}
}

val wasmJsMain by getting
val wasmJsTest by getting {
dependencies {
implementation(npm("@js-joda/timezone", "2.3.0"))
implementation(npm("@js-joda/timezone", jodaTimezoneVersion))
}
}

Expand Down