Use the newest Kotlin

Author: dkhalanskyjb

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("kotlinx.team.infra") version "0.4.0-dev-81"
+    id("kotlinx.team.infra") version "0.4.0-dev-82"
     kotlin("multiplatform") apply false
     id("org.jetbrains.kotlinx.kover") version "0.8.0-Beta2"
 }

core/api/kotlinx-datetime.api

@@ -188,7 +188,6 @@ kotlin {
         commonMain {
             dependencies {
                 compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
-                api(project(":fake-kotlinx-time"))
             }
         }
 
@@ -223,6 +222,10 @@ kotlin {
             }
         }
     }
+
+    compilerOptions {
+        optIn.add("kotlin.time.ExperimentalTime")
+    }
 }
 
 tasks {

core/api/kotlinx-datetime.klib.api

@@ -8,9 +8,9 @@
 package kotlinx.datetime
 
 import kotlin.time.*
-import kotlinx.time.Clock
-import kotlinx.time.Instant
-import kotlinx.time.isDistantFuture
+import kotlin.time.Clock
+import kotlin.time.Instant
+import kotlin.time.isDistantFuture
 import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName
 import kotlin.time.Duration.Companion.seconds

core/build.gradle.kts

@@ -17,23 +17,23 @@ import kotlin.time.ExperimentalTime
 import kotlin.time.TimeSource
 
 /**
- * Creates a [kotlinx.time.Clock] (the standard library version of `Clock`) delegating to `this`.
+ * Creates a [kotlin.time.Clock] (the standard library version of `Clock`) delegating to `this`.
  */
-public fun Clock.toStdlibClock(): kotlinx.time.Clock =
+public fun Clock.toStdlibClock(): kotlin.time.Clock =
     (this as? DateTimeClock)?.clock ?: StdlibClock(this)
 
 /**
  * Creates a [kotlinx.datetime.Clock] delegating to the version of `Clock` from the standard library.
  */
-public fun kotlinx.time.Clock.toDeprecatedClock(): Clock =
+public fun kotlin.time.Clock.toDeprecatedClock(): Clock =
     (this as? StdlibClock)?.clock ?: DateTimeClock(this)
 
-private class DateTimeClock(val clock: kotlinx.time.Clock): kotlinx.datetime.Clock {
+private class DateTimeClock(val clock: kotlin.time.Clock): kotlinx.datetime.Clock {
     override fun now(): Instant = clock.now().toDeprecatedInstant()
 }
 
-private class StdlibClock(val clock: Clock): kotlinx.time.Clock {
-    override fun now(): kotlinx.time.Instant = clock.now().toStdlibInstant()
+private class StdlibClock(val clock: Clock): kotlin.time.Clock {
+    override fun now(): kotlin.time.Instant = clock.now().toStdlibInstant()
 }
 
 /**
@@ -48,7 +48,7 @@ private class StdlibClock(val clock: Clock): kotlinx.time.Clock {
  */
 @Deprecated(
     "Use kotlin.time.Clock instead",
-    ReplaceWith("kotlinx.time.Clock", "kotlinx.time.Clock"),
+    ReplaceWith("kotlin.time.Clock", "kotlin.time.Clock"),
     level = DeprecationLevel.WARNING
 )
 public interface Clock {
@@ -85,7 +85,7 @@ public interface Clock {
      * @sample kotlinx.datetime.test.samples.ClockSamples.dependencyInjection
      */
     public object System : Clock {
-        override fun now(): Instant = kotlinx.time.Clock.System.now().toDeprecatedInstant()
+        override fun now(): Instant = kotlin.time.Clock.System.now().toDeprecatedInstant()
     }
 
     /** A companion object used purely for namespacing. */

core/common/src/Clock.kt

@@ -22,20 +22,20 @@ import kotlin.time.Duration
 import kotlin.time.TimeSource
 
 /**
- * Creates a [kotlinx.time.Instant] (the standard library version of `Instant`) identical to `this`.
+ * Creates a [kotlin.time.Instant] (the standard library version of `Instant`) identical to `this`.
  */
-public fun Instant.toStdlibInstant(): kotlinx.time.Instant =
-    kotlinx.time.Instant.fromEpochSeconds(epochSeconds, nanosecondsOfSecond)
+public fun Instant.toStdlibInstant(): kotlin.time.Instant =
+    kotlin.time.Instant.fromEpochSeconds(epochSeconds, nanosecondsOfSecond)
 
 /**
  * Creates a [kotlinx.datetime.Instant] identical to the version of `Instant` from the standard library.
  */
-public fun kotlinx.time.Instant.toDeprecatedInstant(): Instant =
+public fun kotlin.time.Instant.toDeprecatedInstant(): Instant =
     Instant.fromEpochSeconds(epochSeconds, nanosecondsOfSecond)
 
 @Deprecated(
     "Use kotlin.time.Instant instead",
-    ReplaceWith("kotlinx.time.Instant", "kotlinx.time.Instant"),
+    ReplaceWith("kotlin.time.Instant", "kotlin.time.Instant"),
     level = DeprecationLevel.WARNING
 )
 @Serializable(with = InstantIso8601Serializer::class)
@@ -191,7 +191,7 @@ public expect class Instant : Comparable<Instant> {
 
 
     public companion object {
-        @Deprecated("Use Clock.System.now() instead", ReplaceWith("Clock.System.now()", "kotlinx.time.Clock"), level = DeprecationLevel.ERROR)
+        @Deprecated("Use Clock.System.now() instead", ReplaceWith("Clock.System.now()", "kotlin.time.Clock"), level = DeprecationLevel.ERROR)
         public fun now(): Instant
 
         /**
@@ -294,7 +294,7 @@ public expect class Instant : Comparable<Instant> {
  */
 @Deprecated("kotlinx.datetime.Instant is superseded by kotlin.time.Instant",
     level = DeprecationLevel.WARNING,
-    replaceWith = ReplaceWith("this.toStdlibInstant().isDistantPast", "kotlinx.time.isDistantPast")
+    replaceWith = ReplaceWith("this.toStdlibInstant().isDistantPast", "kotlin.time.isDistantPast")
 )
 public val Instant.isDistantPast: Boolean
     get() = this <= Instant.DISTANT_PAST
@@ -306,7 +306,7 @@ public val Instant.isDistantPast: Boolean
  */
 @Deprecated("kotlinx.datetime.Instant is superseded by kotlin.time.Instant",
     level = DeprecationLevel.WARNING,
-    replaceWith = ReplaceWith("this.toStdlibInstant().isDistantPast", "kotlinx.time.isDistantFuture")
+    replaceWith = ReplaceWith("this.toStdlibInstant().isDistantPast", "kotlin.time.isDistantFuture")
 )
 public val Instant.isDistantFuture: Boolean
     get() = this >= Instant.DISTANT_FUTURE

core/common/src/DeprecatedClock.kt

@@ -10,7 +10,7 @@ package kotlinx.datetime
 import kotlinx.datetime.format.*
 import kotlinx.datetime.internal.*
 import kotlin.time.*
-import kotlinx.time.Instant
+import kotlin.time.Instant
 import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName
 

core/common/src/DeprecatedInstant.kt

@@ -10,7 +10,7 @@ package kotlinx.datetime
 
 import kotlinx.datetime.serializers.*
 import kotlinx.serialization.Serializable
-import kotlinx.time.Instant
+import kotlin.time.Instant
 
 /**
  * A time zone, provides the conversion between [Instant] and [LocalDateTime] values

core/common/src/Instant.kt

@@ -12,7 +12,7 @@ import kotlinx.datetime.internal.format.*
 import kotlinx.datetime.internal.format.parser.Copyable
 import kotlinx.datetime.internal.safeMultiply
 import kotlin.reflect.*
-import kotlinx.time.Instant
+import kotlin.time.Instant
 
 /**
  * A collection of datetime fields used specifically for parsing and formatting.