Merge branch 'master' into java-serialization-fixes

Author: lukellmann

.teamcity/additionalConfiguration.kt

@@ -3,9 +3,16 @@
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
  */
 
+import jetbrains.buildServer.configs.kotlin.BuildType
 import jetbrains.buildServer.configs.kotlin.DslContext
 import jetbrains.buildServer.configs.kotlin.Project
 import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher
+import jetbrains.buildServer.configs.kotlin.buildFeatures.notifications
+import jetbrains.buildServer.configs.kotlin.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.buildSteps.script
+import jetbrains.buildServer.configs.kotlin.toId
+import jetbrains.buildServer.configs.kotlin.triggers.schedule
+import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot
 
 fun Project.additionalConfiguration() {
     knownBuilds.buildAll.features {
@@ -19,4 +26,66 @@ fun Project.additionalConfiguration() {
             }
         }
     }
-}
+
+    BuildType {
+        id("Check_Updates")
+        name = "Check for timezone database updates"
+        description = "Queries the Internet to see if the timezone data was updated"
+
+        vcs {
+            root(DslContext.settingsRoot)
+            cleanCheckout = true
+        }
+
+        steps {
+            script {
+                name = "Check if a new version of the timezone database is present"
+                id = "Check_if_a_new_version_of_the_timezone_database_is_present"
+                scriptContent = """
+                    set -efu
+                    git clone https://github.com/eggert/tz
+                    latest_tag=$(git -C tz/ describe --abbrev=0 --tags)
+                    current_tag=$(grep tzdbVersion gradle.properties | cut -d= -f2)
+                    if [ "${'$'}latest_tag" != "${'$'}current_tag" ]; then
+                      printf "A new version of the timezone database is available: %s\n" "${'$'}latest_tag" >&2
+                      exit 1
+                    fi
+                """.trimIndent()
+            }
+            gradle {
+                name = "Check if the Windows names need updating"
+                id = "Check_if_the_Windows_names_need_updating"
+                tasks = "downloadWindowsZonesMapping"
+                jdkHome = "%env.JDK_18_x64%"
+            }
+        }
+
+        triggers {
+            schedule {
+                schedulingPolicy = daily {
+                    hour = 1
+                    minute = 50
+                }
+                triggerBuild = always()
+                withPendingChangesOnly = false
+                branchFilter = "+:<default>"
+            }
+        }
+
+        features {
+            notifications {
+                notifierSettings = slackNotifier {
+                    connection = "PROJECT_EXT_51"
+                    sendTo = "#kotlin-lib-team"
+                    messageFormat = simpleMessageFormat()
+                }
+                buildFailed = true
+                firstFailureAfterSuccess = true
+            }
+        }
+
+        requirements {
+            doesNotContain("teamcity.agent.jvm.os.name", "Windows")
+        }
+    }.also { buildType(it) }
+}

README.md

@@ -475,7 +475,9 @@ and after that add the following initialization code in your project:
 @JsNonModule
 external object JsJodaTimeZoneModule
 
-private val jsJodaTz = JsJodaTimeZoneModule
+@OptIn(ExperimentalJsExport::class)
+@JsExport
+val jsJodaTz = JsJodaTimeZoneModule
 ```
 
 #### Note about time zones in Wasm/JS

core/api/kotlinx-datetime.api

@@ -4,7 +4,6 @@ import java.net.URL
 import javax.xml.parsers.DocumentBuilderFactory
 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
@@ -379,26 +378,31 @@ val downloadWindowsZonesMapping by tasks.registering {
     }
 }
 
-tasks.withType<AbstractDokkaLeafTask>().configureEach {
-    pluginsMapConfiguration.set(mapOf("org.jetbrains.dokka.base.DokkaBase" to """{ "templatesDir" : "${projectDir.toString().replace('\\', '/')}/dokka-templates" }"""))
+dokka {
+    pluginsConfiguration.html {
+        templatesDir.set(projectDir.resolve("dokka-templates"))
+    }
+
+    dokkaPublications.html {
+        failOnWarning.set(true)
+        // Enum members and undocumented toString()
+        suppressInheritedMembers.set(true)
+    }
 
-    failOnWarning.set(true)
     dokkaSourceSets.configureEach {
-        val testSourceSet = kotlin.sourceSets.named("${name.dropLast(4)}Test")
-        samples.from(testSourceSet.map { it.kotlin.srcDirs })
+        val platform = name.dropLast(4)
+        samples.from("$platform/test")
 
         // reportUndocumented.set(true) // much noisy output about `hashCode` and serializer encoders, decoders etc
         skipDeprecated.set(true)
-        // Enum members and undocumented toString()
-        suppressInheritedMembers.set(true)
         // hide the `internal` package, which, on JS, has public members generated by Dukat that would get mentioned
         perPackageOption {
             matchingRegex.set(".*\\.internal(\\..*)?")
             suppress.set(true)
         }
         sourceLink {
             localDirectory.set(rootDir)
-            remoteUrl.set(URL("https://github.com/kotlin/kotlinx-datetime/tree/latest-release"))
+            remoteUrl("https://github.com/kotlin/kotlinx-datetime/tree/latest-release")
             remoteLineSuffix.set("#L")
         }
     }

core/api/kotlinx-datetime.klib.api

@@ -9,7 +9,9 @@ import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.DatePeriodIso8601Serializer
 import kotlinx.datetime.serializers.DateTimePeriodIso8601Serializer
 import kotlinx.datetime.serializers.DatePeriodComponentSerializer
+import kotlinx.datetime.serializers.DatePeriodSerializer
 import kotlinx.datetime.serializers.DateTimePeriodComponentSerializer
+import kotlinx.datetime.serializers.DateTimePeriodSerializer
 import kotlin.math.*
 import kotlin.time.Duration
 import kotlinx.serialization.Serializable
@@ -63,13 +65,14 @@ import kotlinx.serialization.Serializable
  * `DateTimePeriod` can also be returned as the result of instant arithmetic operations (see [Instant.periodUntil]).
  *
  * Additionally, there are several `kotlinx-serialization` serializers for [DateTimePeriod]:
- * - [DateTimePeriodIso8601Serializer] for the ISO 8601 format;
+ * - The default serializer, delegating to [toString] and [parse].
+ * - [DateTimePeriodIso8601Serializer] for the ISO 8601 format.
  * - [DateTimePeriodComponentSerializer]  for an object with components.
  *
  * @sample kotlinx.datetime.test.samples.DateTimePeriodSamples.construction
  * @sample kotlinx.datetime.test.samples.DateTimePeriodSamples.simpleParsingAndFormatting
  */
-@Serializable(with = DateTimePeriodIso8601Serializer::class)
+@Serializable(with = DateTimePeriodSerializer::class)
 // TODO: could be error-prone without explicitly named params
 public sealed class DateTimePeriod {
     internal abstract val totalMonths: Long
@@ -430,7 +433,7 @@ public fun String.toDateTimePeriod(): DateTimePeriod = DateTimePeriod.parse(this
  *
  * @sample kotlinx.datetime.test.samples.DatePeriodSamples.simpleParsingAndFormatting
  */
-@Serializable(with = DatePeriodIso8601Serializer::class)
+@Serializable(with = DatePeriodSerializer::class)
 public class DatePeriod internal constructor(
     internal override val totalMonths: Long,
     override val days: Int,

core/build.gradle.kts

@@ -7,8 +7,7 @@ package kotlinx.datetime
 
 import kotlinx.datetime.format.*
 import kotlinx.datetime.internal.*
-import kotlinx.datetime.serializers.InstantIso8601Serializer
-import kotlinx.datetime.serializers.InstantComponentSerializer
+import kotlinx.datetime.serializers.*
 import kotlinx.serialization.Serializable
 import kotlin.time.*
 
@@ -189,12 +188,13 @@ import kotlin.time.*
  * ```
  *
  * Additionally, there are several `kotlinx-serialization` serializers for [Instant]:
+ * - The default serializer, delegating to [toString] and [parse].
  * - [InstantIso8601Serializer] for the ISO 8601 extended format.
  * - [InstantComponentSerializer] for an object with components.
  *
  * @see LocalDateTime for a user-visible representation of moments in time in an unspecified time zone.
  */
-@Serializable(with = InstantIso8601Serializer::class)
+@Serializable(with = InstantSerializer::class)
 public expect class Instant : Comparable<Instant> {
 
     /**

core/common/src/DateTimePeriod.kt

@@ -57,6 +57,7 @@ import kotlin.internal.*
  * See sample 4.
  *
  * Additionally, there are several `kotlinx-serialization` serializers for [LocalDate]:
+ * - The default serializer, delegating to [toString] and [parse].
  * - [LocalDateIso8601Serializer] for the ISO 8601 extended format.
  * - [LocalDateComponentSerializer] for an object with components.
  *
@@ -65,7 +66,7 @@ import kotlin.internal.*
  * @sample kotlinx.datetime.test.samples.LocalDateSamples.simpleParsingAndFormatting
  * @sample kotlinx.datetime.test.samples.LocalDateSamples.customFormat
  */
-@Serializable(with = LocalDateIso8601Serializer::class)
+@Serializable(with = LocalDateSerializer::class)
 public expect class LocalDate : Comparable<LocalDate> {
     public companion object {
         /**
@@ -246,6 +247,20 @@ public expect class LocalDate : Comparable<LocalDate> {
      */
     public fun toEpochDays(): Long
 
+    /**
+     * Creates a [LocalDateRange] from `this` to [that], inclusive.
+     *
+     * @sample kotlinx.datetime.test.samples.LocalDateRangeSamples.simpleRangeCreation
+     */
+    public operator fun rangeTo(that: LocalDate): LocalDateRange
+
+    /**
+     * Creates a [LocalDateRange] from `this` to [that], exclusive, i.e., from this to (that - 1 day)
+     *
+     * @sample kotlinx.datetime.test.samples.LocalDateRangeSamples.simpleRangeCreation
+     */
+    public operator fun rangeUntil(that: LocalDate): LocalDateRange
+
     /**
      * Compares `this` date with the [other] date.
      * Returns zero if this date represents the same day as the other (meaning they are equal to one other),