Skip to content

Commit c3df865

Browse files
committed
Make TimeZone.UTC return FixedOffsetTimeZone (statically)
1 parent 1e0e831 commit c3df865

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

core/common/src/TimeZone.kt

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

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

core/common/test/TimeZoneTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ 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)
1920
}
2021

2122
@Test

core/js/src/TimeZone.kt

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

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

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

core/jvm/src/TimeZoneJvm.kt

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

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

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

core/native/src/TimeZone.kt

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

2222
public actual fun currentSystemDefault(): TimeZone = PlatformTimeZoneImpl.currentSystemDefault().let(::TimeZone)
2323

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

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

0 commit comments

Comments
 (0)