Skip to content

Commit c4d4d3a

Browse files
committed
Make TimeZone.UTC return FixedOffsetTimeZone (statically)
1 parent f7d5e45 commit c4d4d3a

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

core/common/src/TimeZone.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public expect open class TimeZone {
3131
/**
3232
* Returns the time zone with the fixed UTC+0 offset.
3333
*/
34-
public val UTC: TimeZone
34+
public val UTC: FixedOffsetTimeZone
3535

3636
/**
3737
* Returns the time zone identified by the provided [zoneId].

core/common/test/TimeZoneTest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ class TimeZoneTest {
1414

1515
@Test
1616
fun utc() {
17-
println(TimeZone.UTC)
18-
assertEquals("Z", TimeZone.UTC.id)
17+
val utc: FixedOffsetTimeZone = TimeZone.UTC
18+
println(utc)
19+
assertEquals("Z", utc.id)
20+
assertEquals(0, utc.utcOffset.totalSeconds)
1921
}
2022

2123
@Test

core/js/src/TimeZone.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public actual open class TimeZone internal constructor(internal val zoneId: Zone
2727

2828
public actual companion object {
2929
public actual fun currentSystemDefault(): TimeZone = ZoneId.systemDefault().let(::TimeZone)
30-
public actual val UTC: TimeZone = jtZoneOffset.UTC.let(::TimeZone)
30+
public actual val UTC: FixedOffsetTimeZone = UtcOffset(jtZoneOffset.UTC).asTimeZone()
3131

3232
public actual fun of(zoneId: String): TimeZone = try {
3333
val zone = ZoneId.of(zoneId)

core/jvm/src/TimeZoneJvm.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public actual open class TimeZone internal constructor(internal val zoneId: Zone
3232

3333
public actual companion object {
3434
public actual fun currentSystemDefault(): TimeZone = ZoneId.systemDefault().let(::TimeZone)
35-
public actual val UTC: TimeZone = jtZoneOffset.UTC.let(::TimeZone)
35+
public actual val UTC: FixedOffsetTimeZone = UtcOffset(jtZoneOffset.UTC).asTimeZone()
3636

3737
public actual fun of(zoneId: String): TimeZone = try {
3838
val zone = ZoneId.of(zoneId)

core/native/src/TimeZone.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public actual open class TimeZone internal constructor(internal val value: TimeZ
1818

1919
public actual fun currentSystemDefault(): TimeZone = PlatformTimeZoneImpl.currentSystemDefault().let(::TimeZone)
2020

21-
public actual val UTC: TimeZone = UtcOffset.ZERO.asTimeZone()
21+
public actual val UTC: FixedOffsetTimeZone = UtcOffset.ZERO.asTimeZone()
2222

2323
// org.threeten.bp.ZoneId#of(java.lang.String)
2424
public actual fun of(zoneId: String): TimeZone {

0 commit comments

Comments
 (0)