Backport kxDT-as-KUP infrastructure and migration changes

benchmarks/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+
 /*
  * Copyright 2019-2023 JetBrains s.r.o. and contributors.
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
@@ -32,3 +34,10 @@ tasks.named<Jar>("jmhJar") {
 repositories {
     mavenCentral()
 }
+
+// !! infrastructure for builds as a Kotlin user project
+tasks.named("assemble") {
+    // compile all Kotlin code from the module during full-repository builds
+    // so that it's covered during builds as a Kotlin user project
+    dependsOn(tasks.withType<KotlinCompilationTask<*>>())
+}

build.gradle.kts

@@ -1,3 +1,9 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
+import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
+
 plugins {
     id("kotlinx.team.infra") version "0.4.0-dev-85"
     kotlin("multiplatform") apply false
@@ -20,30 +26,46 @@ infra {
 val mainJavaToolchainVersion by ext(project.property("java.mainToolchainVersion"))
 val modularJavaToolchainVersion by ext(project.property("java.modularToolchainVersion"))
 
+// !! infrastructure for builds as a Kotlin user project
+val shouldWarningsBeErrors = providers.gradleProperty("kotlin_Werror_override")
+    .map { optionalWErrorOverride ->
+        when (optionalWErrorOverride) {
+            "enable" -> true
+            "disable" -> false
+            else -> error("Unknown value for 'kotlin_Werror_override': $optionalWErrorOverride")
+        }
+    }
+    .getOrElse(false)
+    .also { logger.info("shouldWarningsBeErrors: $it") }
+
 allprojects {
     repositories {
-        addTrainRepositories(project)
         mavenCentral()
-    }
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-        // outputs the compiler version to logs so we can check whether the train configuration applied
-        kotlinOptions.freeCompilerArgs += "-version"
-    }
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
-        compilerOptions { freeCompilerArgs.add("-Xjvm-default=all-compatibility") }
-    }
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile>().configureEach {
-        compilerOptions { freeCompilerArgs.add("-Xpartial-linkage-loglevel=ERROR") }
-    }
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile>().configureEach {
-        compilerOptions { freeCompilerArgs.add("-Xpartial-linkage-loglevel=ERROR") }
+
+        // !! infrastructure for builds as a Kotlin user project
+        val optionalKotlinArtifactsRepo = providers.gradleProperty("kotlin_repo_url").orNull
+        if (optionalKotlinArtifactsRepo != null) {
+            maven(url = optionalKotlinArtifactsRepo)
+            logger.info(
+                "[ktDT-as-KUP] Registered '$optionalKotlinArtifactsRepo' as a dependency Maven repository for '${path}'"
+            )
+        }
     }
 }
 
-// Disable NPM to NodeJS nightly compatibility check.
-// Drop this when NodeJs version that supports latest Wasm become stable
-tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
-    args.add("--ignore-engines")
+subprojects {
+    tasks.withType<KotlinCompilationTask<*>>().configureEach {
+        compilerOptions {
+            allWarningsAsErrors.set(shouldWarningsBeErrors)
+        }
+    }
+
+    // drop this after migration to 2.2.0
+    tasks.withType<KotlinJvmCompile>().configureEach {
+        compilerOptions {
+            freeCompilerArgs.add("-Xjvm-default=all-compatibility")
+        }
+    }
 }
 
 kover {
@@ -61,3 +83,48 @@ dependencies {
     kover(project(":kotlinx-datetime"))
     kover(project(":kotlinx-datetime-serialization"))
 }
+
+// !! infrastructure for builds as a Kotlin user project
+subprojects {
+    tasks.withType<KotlinCompilationTask<*>>().configureEach {
+        compilerOptions {
+            // output reported warnings even in the presence of reported errors
+            freeCompilerArgs.add("-Xreport-all-warnings")
+            // output kotlin.git-searchable names of reported diagnostics
+            freeCompilerArgs.add("-Xrender-internal-diagnostic-names")
+
+            with(providers) {
+                gradleProperty("kotlin_language_version").orNull?.let { optionalOverridingKotlinLV ->
+                    languageVersion.set(KotlinVersion.fromVersion(optionalOverridingKotlinLV))
+                    logger.info(
+                        "[ktDT-as-KUP] Overrode the Kotlin language version with $optionalOverridingKotlinLV for '$path'"
+                    )
+                }
+                gradleProperty("kotlin_api_version").orNull?.let { optionalOverridingKotlinAPIV ->
+                    apiVersion.set(KotlinVersion.fromVersion(optionalOverridingKotlinAPIV))
+                    logger.info(
+                        "[ktDT-as-KUP] Overrode the Kotlin API version with $optionalOverridingKotlinAPIV for '$path'"
+                    )
+                }
+                gradleProperty("kotlin_additional_cli_options").orNull?.let { optionalAdditionalCLIOptions ->
+                    if (optionalAdditionalCLIOptions.isNotBlank()) {
+                        freeCompilerArgs.addAll(optionalAdditionalCLIOptions.split(" "))
+                        logger.info(
+                            "[ktDT-as-KUP] Added the following Kotlin CLI options to '$path': $optionalAdditionalCLIOptions"
+                        )
+                    }
+                }
+            }
+        }
+    }
+    tasks.withType<KotlinNativeCompile>().configureEach {
+        compilerOptions {
+            freeCompilerArgs.add("-Xpartial-linkage-loglevel=error")
+        }
+    }
+    tasks.withType<Kotlin2JsCompile>().configureEach {
+        compilerOptions {
+            freeCompilerArgs.add("-Xpartial-linkage-loglevel=error")
+        }
+    }
+}

buildSrc/build.gradle.kts

@@ -8,33 +8,38 @@ plugins {
     `kotlin-dsl`
 }
 
-val props = Properties().apply {
-    file("../gradle.properties").inputStream().use { load(it) }
-}
+repositories {
+    mavenCentral()
+    gradlePluginPortal()
 
-// copy-pasted from `CommunityProjectsBuild`, see the explanation there
-fun RepositoryHandler.addTrainRepositories(project: Project) {
-    if (project.rootProject.properties["build_snapshot_train"]?.toString()?.toBoolean() == true) {
-        mavenLocal()
+    // !! infrastructure for builds as a Kotlin user project
+    val optionalKotlinArtifactsRepo = providers.gradleProperty("kotlin_repo_url").orNull
+    if (optionalKotlinArtifactsRepo != null) {
+        maven(url = optionalKotlinArtifactsRepo)
+        logger.info(
+            "[ktDT-as-KUP] Registered '$optionalKotlinArtifactsRepo' as a dependency Maven repository for buildSrc"
+        )
     }
-    (project.rootProject.properties["kotlin_repo_url"] as? String)?.let(::maven)
 }
 
-// copy-pasted from `CommunityProjectsBuild`, but uses `props` to obtain the non-snapshot version, because
-// we don't have access to the properties defined in `gradle.properties` of the encompassing project
-val Project.kotlinVersion: String
-    get() = if (rootProject.properties["build_snapshot_train"]?.toString()?.toBoolean() == true) {
-        rootProject.properties["kotlin_snapshot_version"] as? String ?: error("kotlin_snapshot_version must be specified")
-    } else {
-        props.getProperty("defaultKotlinVersion")
+// !! infrastructure for builds as a Kotlin user project
+val Project.kotlinVersion: String by lazy {
+        val optionalOverridingKotlinVersion = providers.gradleProperty("kotlin_version").orNull
+        if (optionalOverridingKotlinVersion != null) {
+            logger.info(
+                "[ktDT-as-KUP] Overrode the Kotlin distribution version with $optionalOverridingKotlinVersion"
+            )
+            optionalOverridingKotlinVersion
+        } else {
+            // we don't have access to the properties defined in `gradle.properties` of the encompassing project,
+            // so we have to get them manually
+            val properties = Properties().apply {
+                file("../gradle.properties").inputStream().use { load(it) }
+            }
+            properties.getProperty("defaultKotlinVersion")
+        }
     }
 
-repositories {
-    mavenCentral()
-    gradlePluginPortal()
-    addTrainRepositories(project)
-}
-
 dependencies {
     fun gradlePlugin(id: String, version: String): String = "$id:$id.gradle.plugin:$version"
     implementation(gradlePlugin("org.jetbrains.kotlin.multiplatform", kotlinVersion))

core/build.gradle.kts

@@ -5,6 +5,7 @@ import javax.xml.parsers.DocumentBuilderFactory
 import java.io.ByteArrayOutputStream
 import java.io.PrintWriter
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JsModuleKind
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.konan.target.Family
 
@@ -102,16 +103,13 @@ kotlin {
             }
         }
         compilations.all {
-            kotlinOptions {
-                sourceMap = true
-                moduleKind = "umd"
+            compileTaskProvider.configure {
+                compilerOptions {
+                    sourceMap = true
+                    moduleKind = JsModuleKind.MODULE_UMD
+                }
             }
         }
-//        compilations["main"].apply {
-//            kotlinOptions {
-//                outputFile = "kotlinx-datetime-tmp.js"
-//            }
-//        }
     }
 
     wasmJs {
@@ -412,21 +410,6 @@ dokka {
     }
 }
 
-// Disable intermediate sourceSet compilation because we do not need js-wasmJs artifact
-tasks.configureEach {
-    if (name == "compileCommonJsMainKotlinMetadata") {
-        enabled = false
-    }
-}
-
-// Drop this configuration when the Node.JS version in KGP will support wasm gc milestone 4
-// check it here:
-// https://github.com/JetBrains/kotlin/blob/master/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
-with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) {
-    nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"
-    nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
-}
-
 apiValidation {
     @OptIn(kotlinx.validation.ExperimentalBCVApi::class)
     klib {

core/common/src/DateTimeUnit.kt

@@ -152,14 +152,7 @@ public sealed class DateTimeUnit {
      * @see DateTimeUnit.MonthBased for specifically month-based units.
      */
     @Serializable(with = DateBasedDateTimeUnitSerializer::class)
-    public sealed class DateBased : DateTimeUnit() {
-        @Suppress("TOPLEVEL_TYPEALIASES_ONLY")
-        @Deprecated("Use DateTimeUnit.DayBased", ReplaceWith("DateTimeUnit.DayBased", "kotlinx.datetime.DateTimeUnit"))
-        public typealias DayBased = DateTimeUnit.DayBased
-        @Suppress("TOPLEVEL_TYPEALIASES_ONLY")
-        @Deprecated("Use DateTimeUnit.MonthBased", ReplaceWith("DateTimeUnit.MonthBased", "kotlinx.datetime.DateTimeUnit"))
-        public typealias MonthBased = DateTimeUnit.MonthBased
-    }
+    public sealed class DateBased : DateTimeUnit()
 
     /**
      * A [datetime unit][DateTimeUnit] equal to some number of calendar days.

core/common/test/ClockTimeSourceTest.kt

@@ -6,6 +6,7 @@
 package kotlinx.datetime.test
 
 import kotlinx.datetime.*
+import kotlinx.datetime.asClock
 import kotlin.test.*
 import kotlin.time.*
 import kotlin.time.Duration.Companion.days

core/commonKotlin/src/internal/Tzfile.kt

@@ -88,6 +88,9 @@ internal fun readTzFile(data: ByteArray): TzFile {
         override fun toString(): String = "Ttinfo(utoff=$utoff, isdst=$isdst, abbrind=$abbrind)"
     }
 
+    fun abbreviationForIndex(abbreviations: List<Byte>, startIndex: UByte): String = abbreviations.drop(startIndex.toInt())
+        .takeWhile { byte -> byte != 0.toByte() }.toByteArray().decodeToString()
+
     inline fun BinaryDataReader.readData(header: Header, readTime: () -> Long): TzFileData {
         val transitionTimes = List(header.timecnt) { readTime() }
         val transitionTypes = List(header.timecnt) { readByte() }
@@ -99,8 +102,6 @@ internal fun readTzFile(data: ByteArray): TzFile {
             )
         }
         val abbreviations = List(header.charcnt) { readByte() }
-        fun abbreviationForIndex(startIndex: UByte): String = abbreviations.drop(startIndex.toInt())
-            .takeWhile { byte -> byte != 0.toByte() }.toByteArray().decodeToString()
         val leapSecondRules = List(header.leapcnt) {
             TzFileData.LeapSecondRule(
                 readTime(),
@@ -114,7 +115,7 @@ internal fun readTzFile(data: ByteArray): TzFile {
         return TzFileData(
             leapSecondRules,
             transitionTimes.zip(transitionTypes) { time, type -> TzFileData.Transition(time, type.toInt()) },
-            ttinfos.map { TzFileData.ClockState(TzFileOffset(it.utoff), it.isdst, abbreviationForIndex(it.abbrind)) }
+            ttinfos.map { TzFileData.ClockState(TzFileOffset(it.utoff), it.isdst, abbreviationForIndex(abbreviations, it.abbrind)) }
         )
     }
 

gradle.properties

@@ -16,10 +16,8 @@ bcvVersion=0.17.0
 java.mainToolchainVersion=8
 java.modularToolchainVersion=11
 
-kotlin.js.compiler=ir
-kotlin.native.ignoreIncorrectDependencies=true
-kotlin.native.ignoreDisabledTargets=true
 kotlin.mpp.applyDefaultHierarchyTemplate=false
+kotlin.native.ignoreDisabledTargets=true
 
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.nowarn=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists