Skip to content

Commit 6f629bb

Browse files
dkhalanskyjbdkhalanskyjb
committed
Use the newest Kotlin
1 parent 351ce59 commit 6f629bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+187
-2259
lines changed

‎build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("kotlinx.team.infra") version "0.4.0-dev-81"
2+
id("kotlinx.team.infra") version "0.4.0-dev-82"
33
kotlin("multiplatform") apply false
44
id("org.jetbrains.kotlinx.kover") version "0.8.0-Beta2"
55
}

‎core/api/kotlinx-datetime.api

+49-49
Large diffs are not rendered by default.

‎core/api/kotlinx-datetime.klib.api

+47-47
Large diffs are not rendered by default.

‎core/build.gradle.kts

+4-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ kotlin {
188188
commonMain {
189189
dependencies {
190190
compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
191-
api(project(":fake-kotlinx-time"))
192191
}
193192
}
194193

@@ -223,6 +222,10 @@ kotlin {
223222
}
224223
}
225224
}
225+
226+
compilerOptions {
227+
optIn.add("kotlin.time.ExperimentalTime")
228+
}
226229
}
227230

228231
tasks {

‎core/common/src/Clock.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
package kotlinx.datetime
99

1010
import kotlin.time.*
11-
import kotlinx.time.Clock
12-
import kotlinx.time.Instant
13-
import kotlinx.time.isDistantFuture
11+
import kotlin.time.Clock
12+
import kotlin.time.Instant
13+
import kotlin.time.isDistantFuture
1414
import kotlin.jvm.JvmMultifileClass
1515
import kotlin.jvm.JvmName
1616
import kotlin.time.Duration.Companion.seconds

‎core/common/src/DeprecatedClock.kt

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ import kotlin.time.ExperimentalTime
1717
import kotlin.time.TimeSource
1818

1919
/**
20-
* Creates a [kotlinx.time.Clock] (the standard library version of `Clock`) delegating to `this`.
20+
* Creates a [kotlin.time.Clock] (the standard library version of `Clock`) delegating to `this`.
2121
*/
22-
public fun Clock.toStdlibClock(): kotlinx.time.Clock =
22+
public fun Clock.toStdlibClock(): kotlin.time.Clock =
2323
(this as? DateTimeClock)?.clock ?: StdlibClock(this)
2424

2525
/**
2626
* Creates a [kotlinx.datetime.Clock] delegating to the version of `Clock` from the standard library.
2727
*/
28-
public fun kotlinx.time.Clock.toDeprecatedClock(): Clock =
28+
public fun kotlin.time.Clock.toDeprecatedClock(): Clock =
2929
(this as? StdlibClock)?.clock ?: DateTimeClock(this)
3030

31-
private class DateTimeClock(val clock: kotlinx.time.Clock): kotlinx.datetime.Clock {
31+
private class DateTimeClock(val clock: kotlin.time.Clock): kotlinx.datetime.Clock {
3232
override fun now(): Instant = clock.now().toDeprecatedInstant()
3333
}
3434

35-
private class StdlibClock(val clock: Clock): kotlinx.time.Clock {
36-
override fun now(): kotlinx.time.Instant = clock.now().toStdlibInstant()
35+
private class StdlibClock(val clock: Clock): kotlin.time.Clock {
36+
override fun now(): kotlin.time.Instant = clock.now().toStdlibInstant()
3737
}
3838

3939
/**
@@ -48,7 +48,7 @@ private class StdlibClock(val clock: Clock): kotlinx.time.Clock {
4848
*/
4949
@Deprecated(
5050
"Use kotlin.time.Clock instead",
51-
ReplaceWith("kotlinx.time.Clock", "kotlinx.time.Clock"),
51+
ReplaceWith("kotlin.time.Clock", "kotlin.time.Clock"),
5252
level = DeprecationLevel.WARNING
5353
)
5454
public interface Clock {
@@ -85,7 +85,7 @@ public interface Clock {
8585
* @sample kotlinx.datetime.test.samples.ClockSamples.dependencyInjection
8686
*/
8787
public object System : Clock {
88-
override fun now(): Instant = kotlinx.time.Clock.System.now().toDeprecatedInstant()
88+
override fun now(): Instant = kotlin.time.Clock.System.now().toDeprecatedInstant()
8989
}
9090

9191
/** A companion object used purely for namespacing. */

‎core/common/src/DeprecatedInstant.kt

+8-8
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ import kotlin.time.Duration
2222
import kotlin.time.TimeSource
2323

2424
/**
25-
* Creates a [kotlinx.time.Instant] (the standard library version of `Instant`) identical to `this`.
25+
* Creates a [kotlin.time.Instant] (the standard library version of `Instant`) identical to `this`.
2626
*/
27-
public fun Instant.toStdlibInstant(): kotlinx.time.Instant =
28-
kotlinx.time.Instant.fromEpochSeconds(epochSeconds, nanosecondsOfSecond)
27+
public fun Instant.toStdlibInstant(): kotlin.time.Instant =
28+
kotlin.time.Instant.fromEpochSeconds(epochSeconds, nanosecondsOfSecond)
2929

3030
/**
3131
* Creates a [kotlinx.datetime.Instant] identical to the version of `Instant` from the standard library.
3232
*/
33-
public fun kotlinx.time.Instant.toDeprecatedInstant(): Instant =
33+
public fun kotlin.time.Instant.toDeprecatedInstant(): Instant =
3434
Instant.fromEpochSeconds(epochSeconds, nanosecondsOfSecond)
3535

3636
@Deprecated(
3737
"Use kotlin.time.Instant instead",
38-
ReplaceWith("kotlinx.time.Instant", "kotlinx.time.Instant"),
38+
ReplaceWith("kotlin.time.Instant", "kotlin.time.Instant"),
3939
level = DeprecationLevel.WARNING
4040
)
4141
@Serializable(with = InstantIso8601Serializer::class)
@@ -191,7 +191,7 @@ public expect class Instant : Comparable<Instant> {
191191

192192

193193
public companion object {
194-
@Deprecated("Use Clock.System.now() instead", ReplaceWith("Clock.System.now()", "kotlinx.time.Clock"), level = DeprecationLevel.ERROR)
194+
@Deprecated("Use Clock.System.now() instead", ReplaceWith("Clock.System.now()", "kotlin.time.Clock"), level = DeprecationLevel.ERROR)
195195
public fun now(): Instant
196196

197197
/**
@@ -294,7 +294,7 @@ public expect class Instant : Comparable<Instant> {
294294
*/
295295
@Deprecated("kotlinx.datetime.Instant is superseded by kotlin.time.Instant",
296296
level = DeprecationLevel.WARNING,
297-
replaceWith = ReplaceWith("this.toStdlibInstant().isDistantPast", "kotlinx.time.isDistantPast")
297+
replaceWith = ReplaceWith("this.toStdlibInstant().isDistantPast", "kotlin.time.isDistantPast")
298298
)
299299
public val Instant.isDistantPast: Boolean
300300
get() = this <= Instant.DISTANT_PAST
@@ -306,7 +306,7 @@ public val Instant.isDistantPast: Boolean
306306
*/
307307
@Deprecated("kotlinx.datetime.Instant is superseded by kotlin.time.Instant",
308308
level = DeprecationLevel.WARNING,
309-
replaceWith = ReplaceWith("this.toStdlibInstant().isDistantPast", "kotlinx.time.isDistantFuture")
309+
replaceWith = ReplaceWith("this.toStdlibInstant().isDistantPast", "kotlin.time.isDistantFuture")
310310
)
311311
public val Instant.isDistantFuture: Boolean
312312
get() = this >= Instant.DISTANT_FUTURE

‎core/common/src/Instant.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package kotlinx.datetime
1010
import kotlinx.datetime.format.*
1111
import kotlinx.datetime.internal.*
1212
import kotlin.time.*
13-
import kotlinx.time.Instant
13+
import kotlin.time.Instant
1414
import kotlin.jvm.JvmMultifileClass
1515
import kotlin.jvm.JvmName
1616

‎core/common/src/TimeZone.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package kotlinx.datetime
1010

1111
import kotlinx.datetime.serializers.*
1212
import kotlinx.serialization.Serializable
13-
import kotlinx.time.Instant
13+
import kotlin.time.Instant
1414

1515
/**
1616
* A time zone, provides the conversion between [Instant] and [LocalDateTime] values

‎core/common/src/format/DateTimeComponents.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import kotlinx.datetime.internal.format.*
1212
import kotlinx.datetime.internal.format.parser.Copyable
1313
import kotlinx.datetime.internal.safeMultiply
1414
import kotlin.reflect.*
15-
import kotlinx.time.Instant
15+
import kotlin.time.Instant
1616

1717
/**
1818
* A collection of datetime fields used specifically for parsing and formatting.

‎core/common/test/ClockTimeSourceTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import kotlin.time.*
1111
import kotlin.time.Duration.Companion.days
1212
import kotlin.time.Duration.Companion.nanoseconds
1313
import kotlin.time.Duration.Companion.seconds
14-
import kotlinx.time.Clock
15-
import kotlinx.time.Instant
14+
import kotlin.time.Clock
15+
import kotlin.time.Instant
1616

1717
@OptIn(ExperimentalTime::class)
1818
@Suppress("DEPRECATION")

‎core/common/test/DeprecatedClockTimeSourceTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ package kotlinx.datetime.test
88

99
import kotlinx.datetime.*
1010
import kotlin.test.*
11-
import kotlin.time.*
11+
import kotlin.time.ExperimentalTime
12+
import kotlin.time.Duration
1213
import kotlin.time.Duration.Companion.days
1314
import kotlin.time.Duration.Companion.nanoseconds
1415

‎core/common/test/DeprecatedInstantTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import kotlinx.datetime.format.*
1111
import kotlinx.datetime.internal.*
1212
import kotlin.random.*
1313
import kotlin.test.*
14-
import kotlin.time.*
14+
import kotlin.time.Duration
1515
import kotlin.time.Duration.Companion.days
1616
import kotlin.time.Duration.Companion.hours
1717
import kotlin.time.Duration.Companion.milliseconds

‎core/common/test/InstantTest.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import kotlin.time.Duration.Companion.hours
1616
import kotlin.time.Duration.Companion.milliseconds
1717
import kotlin.time.Duration.Companion.nanoseconds
1818
import kotlin.time.Duration.Companion.seconds
19-
import kotlinx.time.Clock
20-
import kotlinx.time.Instant
21-
import kotlinx.time.isDistantFuture
22-
import kotlinx.time.isDistantPast
19+
import kotlin.time.Clock
20+
import kotlin.time.Instant
21+
import kotlin.time.isDistantFuture
22+
import kotlin.time.isDistantPast
2323

2424
class InstantTest {
2525

‎core/common/test/LocalDateTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package kotlinx.datetime.test
77

88
import kotlinx.datetime.*
99
import kotlinx.datetime.internal.*
10-
import kotlinx.time.Clock
10+
import kotlin.time.Clock
1111
import kotlin.random.*
1212
import kotlin.test.*
1313

‎core/common/test/LocalDateTimeTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package kotlinx.datetime.test
77

88
import kotlinx.datetime.*
9-
import kotlinx.time.Clock
10-
import kotlinx.time.Instant
9+
import kotlin.time.Clock
10+
import kotlin.time.Instant
1111
import kotlin.test.*
1212
import kotlin.time.*
1313
import kotlin.time.Duration.Companion.hours

‎core/common/test/ReadmeTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import kotlinx.datetime.*
99
import kotlinx.datetime.format.*
1010
import kotlin.test.*
1111
import kotlin.time.*
12-
import kotlinx.time.Clock
13-
import kotlinx.time.Instant
12+
import kotlin.time.Clock
13+
import kotlin.time.Instant
1414

1515
/**
1616
* Tests the code snippets in the README.md file.

‎core/common/test/TimeZoneTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
package kotlinx.datetime.test
1010
import kotlinx.datetime.*
1111
import kotlin.test.*
12-
import kotlinx.time.Clock
13-
import kotlinx.time.Instant
12+
import kotlin.time.Clock
13+
import kotlin.time.Instant
1414

1515
class TimeZoneTest {
1616

‎core/common/test/format/DateTimeComponentsFormatTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import kotlinx.datetime.format.*
1010
import kotlin.reflect.KMutableProperty1
1111
import kotlin.reflect.KProperty
1212
import kotlin.test.*
13-
import kotlinx.time.Instant
13+
import kotlin.time.Instant
1414

1515
class DateTimeComponentsFormatTest {
1616
@Test

‎core/common/test/format/DateTimeComponentsTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package kotlinx.datetime.test.format
88
import kotlinx.datetime.*
99
import kotlinx.datetime.format.*
1010
import kotlin.test.*
11-
import kotlinx.time.Clock
11+
import kotlin.time.Clock
1212

1313
class DateTimeComponentsTest {
1414
@Test

‎core/common/test/samples/ClockSamples.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import kotlinx.datetime.*
99
import kotlin.test.*
1010
import kotlin.time.Duration.Companion.seconds
1111
import kotlin.time.TestTimeSource
12-
import kotlinx.time.Clock
13-
import kotlinx.time.Instant
12+
import kotlin.time.Clock
13+
import kotlin.time.Instant
1414

1515
class ClockSamples {
1616
@Test

‎core/common/test/samples/DayOfWeekSamples.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package kotlinx.datetime.test.samples
77

88
import kotlinx.datetime.*
99
import kotlin.test.*
10-
import kotlinx.time.Clock
10+
import kotlin.time.Clock
1111

1212
class DayOfWeekSamples {
1313

‎core/common/test/samples/InstantSamples.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import kotlinx.datetime.format.*
1010
import kotlin.random.*
1111
import kotlin.test.*
1212
import kotlin.time.Duration.Companion.hours
13-
import kotlinx.time.Clock
14-
import kotlinx.time.Instant
15-
import kotlinx.time.isDistantFuture
16-
import kotlinx.time.isDistantPast
13+
import kotlin.time.Clock
14+
import kotlin.time.Instant
15+
import kotlin.time.isDistantFuture
16+
import kotlin.time.isDistantPast
1717

1818
class InstantSamples {
1919

‎core/common/test/samples/MonthSamples.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package kotlinx.datetime.test.samples
77

88
import kotlinx.datetime.*
99
import kotlin.test.*
10-
import kotlinx.time.Clock
10+
import kotlin.time.Clock
1111

1212
class MonthSamples {
1313

‎core/common/test/samples/TimeZoneSamples.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ package kotlinx.datetime.test.samples
88
import kotlinx.datetime.*
99
import kotlinx.datetime.format.*
1010
import kotlin.test.*
11-
import kotlinx.time.Instant
12-
import kotlinx.time.Clock
11+
import kotlin.time.Instant
12+
import kotlin.time.Clock
1313

1414
class TimeZoneSamples {
1515

‎core/common/test/samples/format/DateTimeComponentsSamples.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package kotlinx.datetime.test.samples.format
88
import kotlinx.datetime.*
99
import kotlinx.datetime.format.*
1010
import kotlin.test.*
11-
import kotlinx.time.Instant
11+
import kotlin.time.Instant
1212

1313
class DateTimeComponentsSamples {
1414

‎core/commonJs/src/internal/Platform.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package kotlinx.datetime.internal
88
import kotlinx.datetime.*
99
import kotlinx.datetime.UtcOffset
1010
import kotlinx.datetime.internal.JSJoda.ZoneId
11-
import kotlinx.time.Instant
11+
import kotlin.time.Instant
1212

1313
private val tzdb: Result<TimeZoneDatabase?> = runCatching {
1414
/**

‎core/commonJs/test/JsJodaTimezoneTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import kotlin.time.Duration.Companion.milliseconds
1212
import kotlin.time.Duration.Companion.seconds
1313
import kotlinx.datetime.test.JSJoda.Instant as jtInstant
1414
import kotlinx.datetime.test.JSJoda.ZoneId as jtZoneId
15-
import kotlinx.time.Instant
15+
import kotlin.time.Instant
1616

1717
class JsJodaTimezoneTest {
1818
@Test

‎core/commonKotlin/src/DeprecatedInstant.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private const val MAX_SECOND = 31556889864403199L // +1000000000-12-31T23:59:59Z
3535

3636
@Deprecated(
3737
"Use kotlin.time.Instant instead",
38-
ReplaceWith("kotlinx.time.Instant", "kotlinx.time.Instant"),
38+
ReplaceWith("kotlin.time.Instant", "kotlin.time.Instant"),
3939
level = DeprecationLevel.WARNING
4040
)
4141
@Serializable(with = InstantIso8601Serializer::class)
@@ -153,7 +153,7 @@ public actual class Instant internal constructor(
153153
internal actual val MIN = Instant(MIN_SECOND, 0)
154154
internal actual val MAX = Instant(MAX_SECOND, 999_999_999)
155155

156-
@Deprecated("Use Clock.System.now() instead", ReplaceWith("Clock.System.now()", "kotlinx.datetime.Clock"), level = DeprecationLevel.ERROR)
156+
@Deprecated("Use Clock.System.now() instead", ReplaceWith("Clock.System.now()", "kotlin.time.Clock"), level = DeprecationLevel.ERROR)
157157
public actual fun now(): Instant = Clock.System.now()
158158

159159
// org.threeten.bp.Instant#ofEpochMilli

‎core/commonKotlin/src/Instant.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package kotlinx.datetime
1010

11-
import kotlinx.time.Instant
11+
import kotlin.time.Instant
1212
import kotlinx.datetime.internal.*
1313
import kotlin.time.Duration.Companion.nanoseconds
1414
import kotlin.time.Duration.Companion.seconds

‎core/commonKotlin/src/TimeZone.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import kotlinx.datetime.format.*
1212
import kotlinx.datetime.internal.*
1313
import kotlinx.datetime.serializers.*
1414
import kotlinx.serialization.Serializable
15-
import kotlinx.time.Instant
15+
import kotlin.time.Instant
1616

1717
@Serializable(with = TimeZoneSerializer::class)
1818
public actual open class TimeZone internal constructor() {

‎core/commonKotlin/src/ZonedDateTime.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package kotlinx.datetime
1010

11-
import kotlinx.time.Instant
11+
import kotlin.time.Instant
1212

1313
internal class ZonedDateTime(val dateTime: LocalDateTime, private val zone: TimeZone, val offset: UtcOffset) {
1414
/**

0 commit comments

Comments
 (0)