Skip to content

Commit 69c4299

Browse files
committed
Add the UTC timezone to Windows explicitly
1 parent 4b7d026 commit 69c4299

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

core/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ val downloadWindowsZonesMapping by tasks.registering {
298298
xmlDoc.documentElement.normalize()
299299
val mapZones = xmlDoc.getElementsByTagName("mapZone")
300300
val mapping = linkedMapOf<String, String>()
301+
mapping["UTC"] = "UTC"
301302
for (i in 0 until mapZones.length) {
302303
val mapZone = mapZones.item(i)
303304
val windowsName = mapZone.attributes.getNamedItem("other").nodeValue

core/windows/src/WindowsZoneNames.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@ internal val standardToWindows: Map<String, String> = mutableMapOf(
463463
"Pacific/Truk" to "West Pacific Standard Time",
464464
"Pacific/Wake" to "UTC+12",
465465
"Pacific/Wallis" to "UTC+12",
466+
"UTC" to "UTC",
466467
)
467468
@SharedImmutable
468469
internal val windowsToStandard: Map<String, String> = mutableMapOf(
@@ -585,7 +586,7 @@ internal val windowsToStandard: Map<String, String> = mutableMapOf(
585586
"Turks And Caicos Standard Time" to "America/Grand_Turk",
586587
"US Eastern Standard Time" to "America/Indianapolis",
587588
"US Mountain Standard Time" to "America/Phoenix",
588-
"UTC" to "Etc/UTC",
589+
"UTC" to "UTC",
589590
"UTC+12" to "Etc/GMT-12",
590591
"UTC+13" to "Etc/GMT-13",
591592
"UTC-02" to "Etc/GMT+2",

0 commit comments

Comments
 (0)