Use Enum entries instead of values

Author: ilya-g

core/common/src/DayOfWeek.kt

@@ -5,8 +5,6 @@
 
 package kotlinx.datetime
 
-import kotlin.native.concurrent.*
-
 /**
  * The enumeration class representing the days of the week.
  */
@@ -25,13 +23,10 @@ public expect enum class DayOfWeek {
  */
 public val DayOfWeek.isoDayNumber: Int get() = ordinal + 1
 
-@SharedImmutable
-private val allDaysOfWeek = DayOfWeek.values().asList()
-
 /**
  * Returns the [DayOfWeek] instance for the given ISO-8601 week day number. Monday is 1, Sunday is 7.
  */
 public fun DayOfWeek(isoDayNumber: Int): DayOfWeek {
     require(isoDayNumber in 1..7)
-    return allDaysOfWeek[isoDayNumber - 1]
+    return DayOfWeek.entries[isoDayNumber - 1]
 }

core/common/src/Month.kt

@@ -5,8 +5,6 @@
 
 package kotlinx.datetime
 
-import kotlin.native.concurrent.*
-
 /**
  * The enumeration class representing the 12 months of the year.
  */
@@ -55,15 +53,12 @@ public expect enum class Month {
  */
 public val Month.number: Int get() = ordinal + 1
 
-@SharedImmutable
-private val allMonths = Month.values().asList()
-
 /**
  * Returns the [Month] instance for the given month number. January is 1, December is 12.
  */
 public fun Month(number: Int): Month {
     require(number in 1..12)
-    return allMonths[number - 1]
+    return Month.entries[number - 1]
 }
 
 

core/jvm/test/ConvertersTest.kt

@@ -39,7 +39,7 @@ class ConvertersTest {
 
     private fun randomDate(): LocalDate {
         val year = Random.nextInt(-20000, 20000)
-        val month = Month.values().random()
+        val month = Month.entries.random()
         val day = (1..java.time.YearMonth.of(year, month).lengthOfMonth()).random()
         return LocalDate(year, month.number, day)
     }

serialization/common/test/DayOfWeekSerializationTest.kt

@@ -13,7 +13,7 @@ import kotlin.test.*
 class DayOfWeekSerializationTest {
     @Test
     fun testSerialization() {
-        for (dayOfWeek in DayOfWeek.values()) {
+        for (dayOfWeek in DayOfWeek.entries) {
             val json = "\"${dayOfWeek.name}\""
             assertEquals(json, Json.encodeToString(DayOfWeekSerializer, dayOfWeek))
             assertEquals(dayOfWeek, Json.decodeFromString(DayOfWeekSerializer, json))

serialization/common/test/MonthSerializationTest.kt

@@ -13,7 +13,7 @@ import kotlin.test.*
 class MonthSerializationTest {
     @Test
     fun testSerialization() {
-        for (month in Month.values()) {
+        for (month in Month.entries) {
             val json = "\"${month.name}\""
             assertEquals(json, Json.encodeToString(MonthSerializer, month))
             assertEquals(month, Json.decodeFromString(MonthSerializer, json))