Upgrade to Kotlin 2.1.0 (#475)

* Avoid using deprecated API when grouping source sets together
* Do not explicitly set `metaInfo = true` for NPM, it's the default
* Upgrade the Yarn lock file
* No longer use the -trw flag
* Add .kotlin to .gitignore

Author: dkhalanskyjb

.gitignore

@@ -6,3 +6,4 @@ target
 build
 /local.properties
 benchmarks.jar
+.kotlin

core/build.gradle.kts

@@ -6,6 +6,7 @@ import java.io.ByteArrayOutputStream
 import java.io.PrintWriter
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.konan.target.Family
 
 plugins {
@@ -35,53 +36,50 @@ java {
 kotlin {
     explicitApi()
 
-    infra {
-        common("tzfile") {
-            // Tiers are in accordance with <https://kotlinlang.org/docs/native-target-support.html>
-            common("tzdbOnFilesystem") {
-                common("linux") {
-                    // Tier 1
-                    target("linuxX64")
-                    // Tier 2
-                    target("linuxArm64")
-                    // Tier 4 (deprecated, but still in demand)
-                    target("linuxArm32Hfp")
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    applyDefaultHierarchyTemplate {
+        common {
+            group("commonKotlin") {
+                group("commonJs") {
+                    withJs()
+                    withWasmJs()
                 }
-                common("darwin") {
-                    common("darwinDevices") {
-                        // Tier 1
-                        target("macosX64")
-                        target("macosArm64")
-                        // Tier 2
-                        target("watchosX64")
-                        target("watchosArm32")
-                        target("watchosArm64")
-                        target("tvosX64")
-                        target("tvosArm64")
-                        target("iosArm64")
-                        // Tier 3
-                        target("watchosDeviceArm64")
+                withWasmWasi()
+                group("native") {
+                    group("tzfile") {
+                        group("tzdbOnFilesystem") {
+                            group("linux") {
+                                withLinux()
+                            }
+                            group("darwin") {
+                                group("darwinDevices") {
+                                    withMacosX64()
+                                    withMacosArm64()
+                                    withWatchosX64()
+                                    withWatchosArm32()
+                                    withWatchosArm64()
+                                    withTvosX64()
+                                    withTvosArm64()
+                                    withIosArm64()
+                                    withWatchosDeviceArm64()
+                                }
+                                group("darwinSimulator") {
+                                    withIosSimulatorArm64()
+                                    withIosX64()
+                                    withWatchosSimulatorArm64()
+                                    withTvosSimulatorArm64()
+                                }
+                            }
+                        }
+                        group("androidNative") {
+                            withAndroidNative()
+                        }
                     }
-                    common("darwinSimulator") {
-                        // Tier 1
-                        target("iosSimulatorArm64")
-                        target("iosX64")
-                        // Tier 2
-                        target("watchosSimulatorArm64")
-                        target("tvosSimulatorArm64")
+                    group("windows") {
+                        withMingw()
                     }
                 }
             }
-            common("androidNative") {
-                target("androidNativeArm32")
-                target("androidNativeArm64")
-                target("androidNativeX86")
-                target("androidNativeX64")
-            }
-        }
-        // Tier 3
-        common("windows") {
-            target("mingwX64")
         }
     }
 
@@ -107,7 +105,6 @@ kotlin {
             kotlinOptions {
                 sourceMap = true
                 moduleKind = "umd"
-                metaInfo = true
             }
         }
 //        compilations["main"].apply {
@@ -131,6 +128,33 @@ kotlin {
         nodejs()
     }
 
+    // Tiers are in accordance with <https://kotlinlang.org/docs/native-target-support.html>
+    // Tier 1
+    macosX64()
+    macosArm64()
+    iosSimulatorArm64()
+    iosX64()
+    iosArm64()
+    // Tier 2
+    linuxX64()
+    linuxArm64()
+    watchosSimulatorArm64()
+    watchosX64()
+    watchosArm32()
+    watchosArm64()
+    tvosSimulatorArm64()
+    tvosX64()
+    tvosArm64()
+    // Tier 3
+    androidNativeArm32()
+    androidNativeArm64()
+    androidNativeX86()
+    androidNativeX64()
+    mingwX64()
+    watchosDeviceArm64()
+    // Deprecated
+    @Suppress("DEPRECATION") linuxArm32Hfp()
+
     @OptIn(ExperimentalKotlinGradlePluginApi::class)
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
@@ -149,9 +173,6 @@ kotlin {
     }
 
     targets.withType<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget> {
-        compilations["test"].kotlinOptions {
-            freeCompilerArgs += listOf("-trw")
-        }
         if (konanTarget.family == Family.MINGW) {
             compilations["test"].cinterops {
                 create("modern_api") {
@@ -161,6 +182,7 @@ kotlin {
             }
         }
     }
+
     sourceSets {
         commonMain {
             dependencies {
@@ -174,78 +196,30 @@ kotlin {
             }
         }
 
-        val commonKotlinMain by creating {
-            dependsOn(commonMain.get())
-            dependencies {
-                api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
-            }
-        }
-
-        val commonKotlinTest by creating {
-            dependsOn(commonTest.get())
-        }
-
-        val jvmMain by getting {
-        }
-
-        val jvmTest by getting {
-        }
-
-        val commonJsMain by creating {
-            dependsOn(commonKotlinMain)
+        val commonJsMain by getting {
             dependencies {
                 api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
                 implementation(npm("@js-joda/core", "3.2.0"))
             }
         }
 
-        val commonJsTest by creating {
-            dependsOn(commonKotlinTest)
+        val commonJsTest by getting {
             dependencies {
                 implementation(npm("@js-joda/timezone", "2.3.0"))
             }
         }
 
-        val jsMain by getting {
-            dependsOn(commonJsMain)
-        }
-
-        val jsTest by getting {
-            dependsOn(commonJsTest)
-        }
-
-        val wasmJsMain by getting {
-            dependsOn(commonJsMain)
-        }
-
-        val wasmJsTest by getting {
-            dependsOn(commonJsTest)
-        }
-
-        val nativeMain by getting {
-            dependsOn(commonKotlinMain)
-        }
-
-        val nativeTest by getting {
-            dependsOn(commonKotlinTest)
-        }
-
-        val wasmWasiMain by getting {
-            dependsOn(commonKotlinMain)
+        val commonKotlinMain by getting {
+            dependencies {
+                api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
+            }
         }
 
         val wasmWasiTest by getting {
-            dependsOn(commonKotlinTest)
             dependencies {
                 runtimeOnly(project(":kotlinx-datetime-zoneinfo"))
             }
         }
-
-        val darwinMain by getting {
-        }
-
-        val darwinTest by getting {
-        }
     }
 }
 

core/jvm/src/LocalDate.kt

@@ -86,9 +86,8 @@ public actual class LocalDate internal constructor(internal val value: jtLocalDa
     public actual fun toEpochDays(): Long = value.toEpochDay()
 
     @PublishedApi
-    @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
-    @LowPriorityInOverloadResolution
-    internal fun toEpochDays(): Int = value.toEpochDay().clampToInt()
+    @JvmName("toEpochDays")
+    internal fun toEpochDaysJvm(): Int = value.toEpochDay().clampToInt()
 }
 
 @Deprecated("Use the plus overload with an explicit number of units", ReplaceWith("this.plus(1, unit)"))
@@ -156,9 +155,8 @@ public actual fun LocalDate.until(other: LocalDate, unit: DateTimeUnit.DateBased
 }
 
 @PublishedApi
-@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
-@LowPriorityInOverloadResolution
-internal fun LocalDate.until(other: LocalDate, unit: DateTimeUnit.DateBased): Int =
+@JvmName("until")
+internal fun LocalDate.untilJvm(other: LocalDate, unit: DateTimeUnit.DateBased): Int =
     until(other, unit).clampToInt()
 
 public actual fun LocalDate.daysUntil(other: LocalDate): Int =

gradle.properties

@@ -7,7 +7,7 @@ versionSuffix=SNAPSHOT
 
 tzdbVersion=2025a
 
-defaultKotlinVersion=1.9.21
+defaultKotlinVersion=2.1.0
 dokkaVersion=1.9.20
 serializationVersion=1.6.2
 benchmarksVersion=0.7.2