Merge pull request #623 from kizitonwose/bump_kotlin_time

Bump dependencies

Author: kizitonwose

compose-multiplatform/library/api/android/library.api

@@ -452,7 +452,7 @@ final class com.kizitonwose.calendar.core/Year : kotlin/Comparable<com.kizitonwo
 
     final object Companion { // com.kizitonwose.calendar.core/Year.Companion|null[0]
         final fun isLeap(kotlin/Int): kotlin/Boolean // com.kizitonwose.calendar.core/Year.Companion.isLeap|isLeap(kotlin.Int){}[0]
-        final fun now(kotlinx.datetime/Clock = ..., kotlinx.datetime/TimeZone = ...): com.kizitonwose.calendar.core/Year // com.kizitonwose.calendar.core/Year.Companion.now|now(kotlinx.datetime.Clock;kotlinx.datetime.TimeZone){}[0]
+        final fun now(kotlin.time/Clock = ..., kotlinx.datetime/TimeZone = ...): com.kizitonwose.calendar.core/Year // com.kizitonwose.calendar.core/Year.Companion.now|now(kotlin.time.Clock;kotlinx.datetime.TimeZone){}[0]
         final fun parseIso8601(kotlin/String): com.kizitonwose.calendar.core/Year // com.kizitonwose.calendar.core/Year.Companion.parseIso8601|parseIso8601(kotlin.String){}[0]
         final fun serializer(): kotlinx.serialization/KSerializer<com.kizitonwose.calendar.core/Year> // com.kizitonwose.calendar.core/Year.Companion.serializer|serializer(){}[0]
     }
@@ -478,7 +478,7 @@ final class com.kizitonwose.calendar.core/YearMonth : kotlin/Comparable<com.kizi
     final fun toString(): kotlin/String // com.kizitonwose.calendar.core/YearMonth.toString|toString(){}[0]
 
     final object Companion { // com.kizitonwose.calendar.core/YearMonth.Companion|null[0]
-        final fun now(kotlinx.datetime/Clock = ..., kotlinx.datetime/TimeZone = ...): com.kizitonwose.calendar.core/YearMonth // com.kizitonwose.calendar.core/YearMonth.Companion.now|now(kotlinx.datetime.Clock;kotlinx.datetime.TimeZone){}[0]
+        final fun now(kotlin.time/Clock = ..., kotlinx.datetime/TimeZone = ...): com.kizitonwose.calendar.core/YearMonth // com.kizitonwose.calendar.core/YearMonth.Companion.now|now(kotlin.time.Clock;kotlinx.datetime.TimeZone){}[0]
         final fun parseIso8601(kotlin/String): com.kizitonwose.calendar.core/YearMonth // com.kizitonwose.calendar.core/YearMonth.Companion.parseIso8601|parseIso8601(kotlin.String){}[0]
         final fun serializer(): kotlinx.serialization/KSerializer<com.kizitonwose.calendar.core/YearMonth> // com.kizitonwose.calendar.core/YearMonth.Companion.serializer|serializer(){}[0]
     }
@@ -589,7 +589,7 @@ final fun (kotlinx.datetime/LocalDate).com.kizitonwose.calendar.core/minusYears(
 final fun (kotlinx.datetime/LocalDate).com.kizitonwose.calendar.core/plusDays(kotlin/Int): kotlinx.datetime/LocalDate // com.kizitonwose.calendar.core/plusDays|[email protected](kotlin.Int){}[0]
 final fun (kotlinx.datetime/LocalDate).com.kizitonwose.calendar.core/plusMonths(kotlin/Int): kotlinx.datetime/LocalDate // com.kizitonwose.calendar.core/plusMonths|[email protected](kotlin.Int){}[0]
 final fun (kotlinx.datetime/LocalDate).com.kizitonwose.calendar.core/plusYears(kotlin/Int): kotlinx.datetime/LocalDate // com.kizitonwose.calendar.core/plusYears|[email protected](kotlin.Int){}[0]
-final fun (kotlinx.datetime/LocalDate.Companion).com.kizitonwose.calendar.core/now(kotlinx.datetime/Clock = ..., kotlinx.datetime/TimeZone = ...): kotlinx.datetime/LocalDate // com.kizitonwose.calendar.core/now|[email protected](kotlinx.datetime.Clock;kotlinx.datetime.TimeZone){}[0]
+final fun (kotlinx.datetime/LocalDate.Companion).com.kizitonwose.calendar.core/now(kotlin.time/Clock = ..., kotlinx.datetime/TimeZone = ...): kotlinx.datetime/LocalDate // com.kizitonwose.calendar.core/now|[email protected](kotlin.time.Clock;kotlinx.datetime.TimeZone){}[0]
 final fun calendar.compose_multiplatform.library.generated.resources/calendar_compose_multiplatform_library_generated_resources_Res$stableprop_getter(): kotlin/Int // calendar.compose_multiplatform.library.generated.resources/calendar_compose_multiplatform_library_generated_resources_Res$stableprop_getter|calendar_compose_multiplatform_library_generated_resources_Res$stableprop_getter(){}[0]
 final fun calendar.compose_multiplatform.library.generated.resources/calendar_compose_multiplatform_library_generated_resources_Res_array$stableprop_getter(): kotlin/Int // calendar.compose_multiplatform.library.generated.resources/calendar_compose_multiplatform_library_generated_resources_Res_array$stableprop_getter|calendar_compose_multiplatform_library_generated_resources_Res_array$stableprop_getter(){}[0]
 final fun calendar.compose_multiplatform.library.generated.resources/calendar_compose_multiplatform_library_generated_resources_Res_drawable$stableprop_getter(): kotlin/Int // calendar.compose_multiplatform.library.generated.resources/calendar_compose_multiplatform_library_generated_resources_Res_drawable$stableprop_getter|calendar_compose_multiplatform_library_generated_resources_Res_drawable$stableprop_getter(){}[0]

compose-multiplatform/library/api/desktop/library.api

@@ -124,6 +124,9 @@ android {
         jvmToolchain {
             languageVersion.set(Config.compatibleJavaLanguageVersion)
         }
+        compilerOptions {
+            optIn.add("kotlin.time.ExperimentalTime")
+        }
     }
     buildFeatures {
         compose = true

compose-multiplatform/library/api/library.klib.api

@@ -1,7 +1,6 @@
 package com.kizitonwose.calendar.core
 
 import androidx.compose.ui.text.intl.Locale
-import kotlinx.datetime.Clock
 import kotlinx.datetime.DateTimeArithmeticException
 import kotlinx.datetime.DateTimeUnit
 import kotlinx.datetime.DayOfWeek
@@ -11,6 +10,7 @@ import kotlinx.datetime.minus
 import kotlinx.datetime.plus
 import kotlinx.datetime.todayIn
 import kotlinx.datetime.until
+import kotlin.time.Clock
 
 /**
  * Returns the days of week values such that the desired
@@ -116,4 +116,4 @@ internal fun LocalDate.plusWeeks(value: Int): LocalDate = plus(value, DateTimeUn
 
 internal fun LocalDate.minusWeeks(value: Int): LocalDate = minus(value, DateTimeUnit.WEEK)
 
-internal fun LocalDate.weeksUntil(other: LocalDate): Int = until(other, DateTimeUnit.WEEK)
+internal fun LocalDate.weeksUntil(other: LocalDate): Int = until(other, DateTimeUnit.WEEK).toInt()

compose-multiplatform/library/build.gradle.kts

@@ -4,11 +4,11 @@ import androidx.compose.runtime.Immutable
 import com.kizitonwose.calendar.core.format.fromIso8601Year
 import com.kizitonwose.calendar.core.format.toIso8601String
 import com.kizitonwose.calendar.core.serializers.YearIso8601Serializer
-import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.Month
 import kotlinx.datetime.TimeZone
 import kotlinx.serialization.Serializable
+import kotlin.time.Clock
 
 @Immutable
 @Serializable(with = YearIso8601Serializer::class)

compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/Extensions.kt

@@ -4,7 +4,6 @@ import androidx.compose.runtime.Immutable
 import com.kizitonwose.calendar.core.format.fromIso8601YearMonth
 import com.kizitonwose.calendar.core.format.toIso8601String
 import com.kizitonwose.calendar.core.serializers.YearMonthIso8601Serializer
-import kotlinx.datetime.Clock
 import kotlinx.datetime.DateTimeArithmeticException
 import kotlinx.datetime.DateTimeUnit
 import kotlinx.datetime.LocalDate
@@ -15,6 +14,7 @@ import kotlinx.datetime.monthsUntil
 import kotlinx.datetime.number
 import kotlinx.datetime.plus
 import kotlinx.serialization.Serializable
+import kotlin.time.Clock
 
 @Immutable
 @Serializable(with = YearMonthIso8601Serializer::class)

compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/Year.kt

@@ -1,12 +1,16 @@
+@file:Suppress("NewApi")
+
 package com.kizitonwose.calendar.core
 
-import java.time.Year as jtYear
-import java.time.YearMonth as jtYearMonth
+import kotlinx.datetime.toJavaMonth
+import kotlinx.datetime.toKotlinMonth
+import java.time.Year as JavaYear
+import java.time.YearMonth as JavaYearMonth
 
-public fun YearMonth.toJavaYearMonth(): jtYearMonth = jtYearMonth.of(year, month)
+public fun YearMonth.toJavaYearMonth(): JavaYearMonth = JavaYearMonth.of(year, month.toJavaMonth())
 
-public fun jtYearMonth.toKotlinYearMonth(): YearMonth = YearMonth(year, month)
+public fun JavaYearMonth.toKotlinYearMonth(): YearMonth = YearMonth(year, month.toKotlinMonth())
 
-public fun Year.toJavaYear(): jtYear = jtYear.of(value)
+public fun Year.toJavaYear(): JavaYear = JavaYear.of(value)
 
-public fun jtYear.toKotlinYear(): Year = Year(value)
+public fun JavaYear.toKotlinYear(): Year = Year(value)

compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/YearMonth.kt

@@ -1,9 +1,14 @@
+@file:Suppress("NewApi")
+
 package com.kizitonwose.calendar.core
 
 import androidx.compose.ui.text.intl.Locale
-import java.time.DayOfWeek
-import java.time.temporal.WeekFields
+import kotlinx.datetime.DayOfWeek
+import kotlinx.datetime.toKotlinDayOfWeek
+import java.time.temporal.WeekFields as JavaWeekFields
 import java.util.Locale as JavaLocale
 
 public actual fun firstDayOfWeekFromLocale(locale: Locale): DayOfWeek =
-    WeekFields.of(JavaLocale.forLanguageTag(locale.toLanguageTag())).firstDayOfWeek
+    JavaWeekFields.of(JavaLocale.forLanguageTag(locale.toLanguageTag()))
+        .firstDayOfWeek
+        .toKotlinDayOfWeek()

compose-multiplatform/library/src/jvmMain/kotlin/com/kizitonwose/calendar/core/Converters.kt

@@ -1,9 +1,9 @@
+
 import com.kizitonwose.calendar.buildsrc.Android
 import com.kizitonwose.calendar.buildsrc.Config
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDistributionDsl
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {
@@ -89,7 +89,7 @@ kotlin {
 //            implementation("com.kizitonwose.calendar:compose-multiplatform:2.6.0-alpha02")
             implementation(project(":compose-multiplatform:library"))
             implementation(libs.jetbrains.compose.navigation)
-            implementation(libs.material.icons)
+            implementation(libs.jetbrains.material.icons)
         }
         val webMain by creating {
             dependsOn(commonMain)
@@ -110,6 +110,7 @@ kotlin {
     @OptIn(ExperimentalKotlinGradlePluginApi::class)
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
+        optIn.add("kotlin.time.ExperimentalTime")
     }
 }