Fix breaking builds on Native due to depending on serialization

build.gradle.kts

@@ -18,6 +18,7 @@ infra {
     }
     publishing {
         include(":kotlinx-datetime")
+        include(":kotlinx-datetime-serialization")
         libraryRepoUrl = "https://github.com/Kotlin/kotlinx-datetime"
         sonatype { }
     }

core/build.gradle.kts

@@ -152,7 +152,6 @@ kotlin {
         commonMain {
             dependencies {
                 api("org.jetbrains.kotlin:kotlin-stdlib-common")
-                compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
             }
         }
 

core/common/src/DateTimePeriod.kt

@@ -5,14 +5,10 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.DatePeriodIso8601Serializer
-import kotlinx.datetime.serializers.DateTimePeriodIso8601Serializer
 import kotlin.math.*
 import kotlin.time.Duration
 import kotlin.time.ExperimentalTime
-import kotlinx.serialization.Serializable
 
-@Serializable(with = DateTimePeriodIso8601Serializer::class)
 // TODO: could be error-prone without explicitly named params
 public sealed class DateTimePeriod {
     internal abstract val totalMonths: Int
@@ -237,7 +233,6 @@ public sealed class DateTimePeriod {
 
 public fun String.toDateTimePeriod(): DateTimePeriod = DateTimePeriod.parse(this)
 
-@Serializable(with = DatePeriodIso8601Serializer::class)
 public class DatePeriod internal constructor(
     internal override val totalMonths: Int,
     override val days: Int,

core/common/src/DateTimeUnit.kt

@@ -5,16 +5,12 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.*
-import kotlinx.serialization.Serializable
 import kotlin.time.*
 
-@Serializable(with = DateTimeUnitSerializer::class)
 public sealed class DateTimeUnit {
 
     public abstract operator fun times(scalar: Int): DateTimeUnit
 
-    @Serializable(with = TimeBasedDateTimeUnitSerializer::class)
     public class TimeBased(public val nanoseconds: Long) : DateTimeUnit() {
         private val unitName: String
         private val unitScale: Long
@@ -64,10 +60,8 @@ public sealed class DateTimeUnit {
         override fun toString(): String = formatToString(unitScale, unitName)
     }
 
-    @Serializable(with = DateBasedDateTimeUnitSerializer::class)
     public sealed class DateBased : DateTimeUnit() {
         // TODO: investigate how to move subclasses up to DateTimeUnit scope
-        @Serializable(with = DayBasedDateTimeUnitSerializer::class)
         public class DayBased(public val days: Int) : DateBased() {
             init {
                 require(days > 0) { "Unit duration must be positive, but was $days days." }
@@ -85,7 +79,6 @@ public sealed class DateTimeUnit {
             else
                 formatToString(days, "DAY")
         }
-        @Serializable(with = MonthBasedDateTimeUnitSerializer::class)
         public class MonthBased(public val months: Int) : DateBased() {
             init {
                 require(months > 0) { "Unit duration must be positive, but was $months months." }

core/common/src/Instant.kt

@@ -5,12 +5,9 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.InstantIso8601Serializer
-import kotlinx.serialization.Serializable
 import kotlin.time.*
 
 @OptIn(ExperimentalTime::class)
-@Serializable(with = InstantIso8601Serializer::class)
 public expect class Instant : Comparable<Instant> {
 
     /**

core/common/src/LocalDate.kt

@@ -5,10 +5,6 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.LocalDateIso8601Serializer
-import kotlinx.serialization.Serializable
-
-@Serializable(with = LocalDateIso8601Serializer::class)
 public expect class LocalDate : Comparable<LocalDate> {
     public companion object {
         /**

core/common/src/LocalDateTime.kt

@@ -5,10 +5,6 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.LocalDateTimeIso8601Serializer
-import kotlinx.serialization.Serializable
-
-@Serializable(with = LocalDateTimeIso8601Serializer::class)
 public expect class LocalDateTime : Comparable<LocalDateTime> {
     public companion object {
 

core/common/src/TimeZone.kt

@@ -8,11 +8,6 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.TimeZoneSerializer
-import kotlinx.datetime.serializers.ZoneOffsetSerializer
-import kotlinx.serialization.Serializable
-
-@Serializable(with = TimeZoneSerializer::class)
 public expect open class TimeZone {
     /**
      * Returns the identifier string of the time zone.
@@ -85,7 +80,6 @@ public expect open class TimeZone {
     public fun LocalDateTime.toInstant(): Instant
 }
 
-@Serializable(with = ZoneOffsetSerializer::class)
 public expect class ZoneOffset : TimeZone {
     public val totalSeconds: Int
 }

core/js/src/Instant.kt

@@ -15,11 +15,8 @@ import kotlinx.datetime.internal.JSJoda.OffsetDateTime as jtOffsetDateTime
 import kotlinx.datetime.internal.JSJoda.Duration as jtDuration
 import kotlinx.datetime.internal.JSJoda.Clock as jtClock
 import kotlinx.datetime.internal.JSJoda.ChronoUnit
-import kotlinx.datetime.serializers.InstantIso8601Serializer
-import kotlinx.serialization.Serializable
 import kotlin.math.truncate
 
-@Serializable(with = InstantIso8601Serializer::class)
 @OptIn(ExperimentalTime::class)
 public actual class Instant internal constructor(internal val value: jtInstant) : Comparable<Instant> {
 

core/js/src/LocalDate.kt

@@ -6,11 +6,8 @@
 package kotlinx.datetime
 
 import kotlinx.datetime.internal.JSJoda.ChronoUnit
-import kotlinx.datetime.serializers.LocalDateIso8601Serializer
-import kotlinx.serialization.Serializable
 import kotlinx.datetime.internal.JSJoda.LocalDate as jtLocalDate
 
-@Serializable(with = LocalDateIso8601Serializer::class)
 public actual class LocalDate internal constructor(internal val value: jtLocalDate) : Comparable<LocalDate> {
     public actual companion object {
         public actual fun parse(isoString: String): LocalDate = try {

core/js/src/LocalDateTime.kt

@@ -4,11 +4,8 @@
  */
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.LocalDateTimeIso8601Serializer
-import kotlinx.serialization.Serializable
 import kotlinx.datetime.internal.JSJoda.LocalDateTime as jtLocalDateTime
 
-@Serializable(with = LocalDateTimeIso8601Serializer::class)
 public actual class LocalDateTime internal constructor(internal val value: jtLocalDateTime) : Comparable<LocalDateTime> {
 
     public actual constructor(year: Int, monthNumber: Int, dayOfMonth: Int, hour: Int, minute: Int, second: Int, nanosecond: Int) :

core/js/src/TimeZone.kt

@@ -5,12 +5,8 @@
 package kotlinx.datetime
 
 import kotlinx.datetime.internal.JSJoda.ZoneId
-import kotlinx.datetime.serializers.TimeZoneSerializer
-import kotlinx.datetime.serializers.ZoneOffsetSerializer
-import kotlinx.serialization.Serializable
 import kotlinx.datetime.internal.JSJoda.ZoneOffset as jtZoneOffset
 
-@Serializable(with = TimeZoneSerializer::class)
 public actual open class TimeZone internal constructor(internal val zoneId: ZoneId) {
     public actual val id: String get() = zoneId.id()
 
@@ -46,7 +42,6 @@ public actual open class TimeZone internal constructor(internal val zoneId: Zone
     }
 }
 
-@Serializable(with = ZoneOffsetSerializer::class)
 public actual class ZoneOffset internal constructor(zoneOffset: jtZoneOffset): TimeZone(zoneOffset) {
     private val zoneOffset get() = zoneId as jtZoneOffset
 

core/jvm/src/Instant.kt

@@ -6,8 +6,6 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.InstantIso8601Serializer
-import kotlinx.serialization.Serializable
 import java.time.DateTimeException
 import java.time.format.DateTimeParseException
 import java.time.temporal.ChronoUnit
@@ -16,7 +14,6 @@ import java.time.Instant as jtInstant
 import java.time.OffsetDateTime as jtOffsetDateTime
 import java.time.Clock as jtClock
 
-@Serializable(with = InstantIso8601Serializer::class)
 @OptIn(ExperimentalTime::class)
 public actual class Instant internal constructor(internal val value: jtInstant) : Comparable<Instant> {
 

core/jvm/src/LocalDate.kt

@@ -5,14 +5,11 @@
 @file:JvmName("LocalDateJvmKt")
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.LocalDateIso8601Serializer
-import kotlinx.serialization.Serializable
 import java.time.DateTimeException
 import java.time.format.DateTimeParseException
 import java.time.temporal.ChronoUnit
 import java.time.LocalDate as jtLocalDate
 
-@Serializable(with = LocalDateIso8601Serializer::class)
 public actual class LocalDate internal constructor(internal val value: jtLocalDate) : Comparable<LocalDate> {
     public actual companion object {
         public actual fun parse(isoString: String): LocalDate = try {

core/jvm/src/LocalDateTime.kt

@@ -5,16 +5,13 @@
 @file:JvmName("LocalDateTimeJvmKt")
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.LocalDateTimeIso8601Serializer
-import kotlinx.serialization.Serializable
 import java.time.DateTimeException
 import java.time.format.DateTimeParseException
 import java.time.LocalDateTime as jtLocalDateTime
 
 public actual typealias Month = java.time.Month
 public actual typealias DayOfWeek = java.time.DayOfWeek
 
-@Serializable(with = LocalDateTimeIso8601Serializer::class)
 public actual class LocalDateTime internal constructor(internal val value: jtLocalDateTime) : Comparable<LocalDateTime> {
 
     public actual constructor(year: Int, monthNumber: Int, dayOfMonth: Int, hour: Int, minute: Int, second: Int, nanosecond: Int) :

core/jvm/src/TimeZoneJvm.kt

@@ -8,14 +8,10 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.TimeZoneSerializer
-import kotlinx.datetime.serializers.ZoneOffsetSerializer
-import kotlinx.serialization.Serializable
 import java.time.DateTimeException
 import java.time.ZoneId
 import java.time.ZoneOffset as jtZoneOffset
 
-@Serializable(with = TimeZoneSerializer::class)
 public actual open class TimeZone internal constructor(internal val zoneId: ZoneId) {
     public actual val id: String get() = zoneId.id
 
@@ -51,7 +47,6 @@ public actual open class TimeZone internal constructor(internal val zoneId: Zone
     }
 }
 
-@Serializable(with = ZoneOffsetSerializer::class)
 public actual class ZoneOffset internal constructor(zoneOffset: jtZoneOffset): TimeZone(zoneOffset) {
     internal val zoneOffset get() = zoneId as jtZoneOffset
 

core/native/src/Instant.kt

@@ -8,8 +8,6 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.InstantIso8601Serializer
-import kotlinx.serialization.Serializable
 import kotlin.math.*
 import kotlin.time.*
 
@@ -126,7 +124,6 @@ private fun isValidInstantSecond(second: Long) = second >= MIN_SECOND && second
 
 internal expect fun currentTime(): Instant
 
-@Serializable(with = InstantIso8601Serializer::class)
 @OptIn(ExperimentalTime::class)
 public actual class Instant internal constructor(public actual val epochSeconds: Long, public actual val nanosecondsOfSecond: Int) : Comparable<Instant> {
 

core/native/src/LocalDate.kt

@@ -8,8 +8,6 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.LocalDateIso8601Serializer
-import kotlinx.serialization.Serializable
 import kotlin.math.*
 
 // This is a function and not a value due to https://github.com/Kotlin/kotlinx-datetime/issues/5
@@ -36,7 +34,6 @@ internal const val YEAR_MAX = 999_999
 private fun isValidYear(year: Int): Boolean =
     year >= YEAR_MIN && year <= YEAR_MAX
 
-@Serializable(with = LocalDateIso8601Serializer::class)
 public actual class LocalDate actual constructor(public actual val year: Int, public actual val monthNumber: Int, public actual val dayOfMonth: Int) : Comparable<LocalDate> {
 
     init {

core/native/src/LocalDateTime.kt

@@ -8,9 +8,6 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.LocalDateTimeIso8601Serializer
-import kotlinx.serialization.Serializable
-
 // This is a function and not a value due to https://github.com/Kotlin/kotlinx-datetime/issues/5
 // org.threeten.bp.format.DateTimeFormatter#ISO_LOCAL_DATE_TIME
 internal val localDateTimeParser: Parser<LocalDateTime>
@@ -21,7 +18,6 @@ internal val localDateTimeParser: Parser<LocalDateTime>
             LocalDateTime(date, time)
         }
 
-@Serializable(with = LocalDateTimeIso8601Serializer::class)
 public actual class LocalDateTime internal constructor(
     public actual val date: LocalDate, internal val time: LocalTime) : Comparable<LocalDateTime> {
     public actual companion object {

core/native/src/TimeZone.kt

@@ -8,13 +8,9 @@
 
 package kotlinx.datetime
 
-import kotlinx.datetime.serializers.TimeZoneSerializer
-import kotlinx.datetime.serializers.ZoneOffsetSerializer
 import kotlin.math.abs
 import kotlin.native.concurrent.*
-import kotlinx.serialization.Serializable
 
-@Serializable(with = TimeZoneSerializer::class)
 public actual open class TimeZone internal constructor(internal val value: TimeZoneImpl) {
 
     public actual companion object {
@@ -83,7 +79,6 @@ public actual open class TimeZone internal constructor(internal val value: TimeZ
 @ThreadLocal
 private var zoneOffsetCache: MutableMap<Int, ZoneOffset> = mutableMapOf()
 
-@Serializable(with = ZoneOffsetSerializer::class)
 public actual class ZoneOffset internal constructor(internal val offset: ZoneOffsetImpl) : TimeZone(offset) {
 
     public actual val totalSeconds: Int get() = offset.totalSeconds

serialization/build.gradle.kts

@@ -3,6 +3,7 @@ import java.util.Locale
 plugins {
     id("kotlin-multiplatform")
     kotlin("plugin.serialization")
+    `maven-publish`
 }
 
 val JDK_8: String by project
@@ -70,6 +71,7 @@ kotlin {
             dependencies {
                 api(project(":kotlinx-datetime"))
                 api("org.jetbrains.kotlin:kotlin-stdlib-common")
+                api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
             }
         }
 

core/common/src/serializers/DateTimePeriodSerializers.kt → serialization/common/src/DateTimePeriodSerializers.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
  */
 
-package kotlinx.datetime.serializers
+package kotlinx.datetime.serialization
 
 import kotlinx.datetime.DatePeriod
 import kotlinx.datetime.DateTimePeriod

core/common/src/serializers/DateTimeUnitSerializers.kt → serialization/common/src/DateTimeUnitSerializers.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
  */
 
-package kotlinx.datetime.serializers
+package kotlinx.datetime.serialization
 
 import kotlinx.datetime.DateTimeUnit
 import kotlinx.serialization.*

core/common/src/serializers/DayOfWeekSerializers.kt → serialization/common/src/DayOfWeekSerializers.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
  */
 
-package kotlinx.datetime.serializers
+package kotlinx.datetime.serialization
 
 import kotlinx.datetime.DayOfWeek
 import kotlinx.serialization.*

core/common/src/serializers/InstantSerializers.kt → serialization/common/src/InstantSerializers.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
  */
 
-package kotlinx.datetime.serializers
+package kotlinx.datetime.serialization
 
 import kotlinx.datetime.Instant
 import kotlinx.serialization.*

core/common/src/serializers/LocalDateSerializers.kt → serialization/common/src/LocalDateSerializers.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
  */
 
-package kotlinx.datetime.serializers
+package kotlinx.datetime.serialization
 
 import kotlinx.datetime.LocalDate
 import kotlinx.serialization.*