WIP: Don't typealias Month

core/common/src/Month.kt

@@ -7,7 +7,7 @@ package kotlinx.datetime
 
 import kotlin.native.concurrent.*
 
-public expect enum class Month {
+public enum class Month {
     JANUARY,
     FEBRUARY,
     MARCH,
@@ -21,11 +21,9 @@ public expect enum class Month {
     NOVEMBER,
     DECEMBER;
 
-//    val value: Int // member missing in java.time.Month has to be an extension
+    public val number: Int get() = ordinal + 1
 }
 
-public val Month.number: Int get() = ordinal + 1
-
 @SharedImmutable
 private val allMonths = Month.values().asList()
 

core/js/src/Month.kt

@@ -7,19 +7,4 @@ package kotlinx.datetime
 
 import kotlinx.datetime.internal.JSJoda.Month as jsMonth
 
-public actual enum class Month {
-    JANUARY,
-    FEBRUARY,
-    MARCH,
-    APRIL,
-    MAY,
-    JUNE,
-    JULY,
-    AUGUST,
-    SEPTEMBER,
-    OCTOBER,
-    NOVEMBER,
-    DECEMBER;
-}
-
 internal fun jsMonth.toMonth(): Month = Month(this.value().toInt())

core/jvm/src/Converters.kt

@@ -5,6 +5,17 @@
 
 package kotlinx.datetime
 
+/**
+ * Converts this [kotlinx.datetime.Month][Month] value to a [java.time.Month][java.time.Month] value.
+ */
+public fun Month.toJavaMonth(): java.time.Month = java.time.Month.of(number)
+
+/**
+ * Converts this [java.time.Month][java.time.Month] value to a [kotlinx.datetime.Month][Month] value.
+ */
+public fun java.time.Month.toKotlinMonth(): Month = Month(value)
+
+
 /**
  * Converts this [kotlinx.datetime.Instant][Instant] value to a [java.time.Instant][java.time.Instant] value.
  */

core/jvm/src/LocalDate.kt

@@ -36,7 +36,7 @@ public actual class LocalDate internal constructor(internal val value: jtLocalDa
 
     public actual val year: Int get() = value.year
     public actual val monthNumber: Int get() = value.monthValue
-    public actual val month: Month get() = value.month
+    public actual val month: Month get() = value.month.toKotlinMonth()
     public actual val dayOfMonth: Int get() = value.dayOfMonth
     public actual val dayOfWeek: DayOfWeek get() = value.dayOfWeek
     public actual val dayOfYear: Int get() = value.dayOfYear

core/jvm/src/LocalDateTime.kt

@@ -11,7 +11,6 @@ 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)
@@ -29,7 +28,7 @@ public actual class LocalDateTime internal constructor(internal val value: jtLoc
 
     public actual val year: Int get() = value.year
     public actual val monthNumber: Int get() = value.monthValue
-    public actual val month: Month get() = value.month
+    public actual val month: Month get() = value.month.toKotlinMonth()
     public actual val dayOfMonth: Int get() = value.dayOfMonth
     public actual val dayOfWeek: DayOfWeek get() = value.dayOfWeek
     public actual val dayOfYear: Int get() = value.dayOfYear

core/native/src/Month.kt

@@ -5,10 +5,6 @@
 
 package kotlinx.datetime
 
-public actual enum class Month {
-    JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBER, DECEMBER;
-}
-
 // From threetenbp
 internal fun Month.firstDayOfYear(leapYear: Boolean): Int {
     val leap = if (leapYear) 1 else 0