Rewrite the Windows code in pure Kotlin

Author: dkhalanskyjb

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "date-cpp-library/date"]
-	path = thirdparty/date
-	url = https://github.com/HowardHinnant/date

README.md

@@ -381,15 +381,6 @@ Add a dependency to the `<dependencies>` element. Note that you need to use the
 
 ## Building
 
-Before building, ensure that you have [thirdparty/date](thirdparty/date) submodule initialized and updated. 
-IDEA does that automatically when cloning the repository, and if you cloned it in the command line, you may need
-to run additionally:
-
-```kotlin
-git submodule init
-git submodule update
-```
-
 The project requires JDK 8 to build classes and to run tests. 
 Gradle will try to find it among the installed JDKs or [provision](https://docs.gradle.org/current/userguide/toolchains.html#sec:provisioning) it automatically if it couldn't be found.
 The path to JDK 8 can be additionally specified with the environment variable `JDK_8`. 

core/build.gradle.kts

@@ -74,7 +74,9 @@ kotlin {
             }
         }
         // Tier 3
-        target("mingwX64")
+        common("windows") {
+            target("mingwX64")
+        }
     }
 
     jvm {
@@ -143,24 +145,11 @@ kotlin {
         when {
             konanTarget.family == org.jetbrains.kotlin.konan.target.Family.MINGW -> {
                 compilations["main"].cinterops {
-                    create("date") {
-                        val cinteropDir = "$projectDir/native/cinterop"
-                        val dateLibDir = "${project(":").projectDir}/thirdparty/date"
-                        headers("$cinteropDir/public/cdate.h")
-                        defFile("native/cinterop/date.def")
-                        extraOpts("-Xsource-compiler-option", "-I$cinteropDir/public")
-                        extraOpts("-Xsource-compiler-option", "-DONLY_C_LOCALE=1")
-                        // needed to be able to use std::shared_mutex to implement caching.
-                        extraOpts("-Xsource-compiler-option", "-std=c++17")
-                        // the date library headers, needed for some pure calculations.
-                        extraOpts("-Xsource-compiler-option", "-I$dateLibDir/include")
-                        // the main source for the platform bindings.
-                        extraOpts("-Xcompile-source", "$cinteropDir/cpp/windows.cpp")
+                    create("declarations") {
+                        defFile("$projectDir/windows/cinterop/definitions.def")
+                        headers("$projectDir/windows/cinterop/definitions.h")
                     }
                 }
-                compilations["main"].defaultSourceSet {
-                    kotlin.srcDir("native/cinterop_actuals")
-                }
             }
             konanTarget.family == org.jetbrains.kotlin.konan.target.Family.LINUX -> {
                 // do nothing special
@@ -173,8 +162,6 @@ kotlin {
             }
         }
     }
-
-
     sourceSets {
         commonMain {
             dependencies {
@@ -321,10 +308,10 @@ tasks {
 
 val downloadWindowsZonesMapping by tasks.registering {
     description = "Updates the mapping between Windows-specific and usual names for timezones"
-    val output = "$projectDir/native/cinterop/public/windows_zones.hpp"
-    val initialFileContents = File(output).readBytes()
+    val output = "$projectDir/windows/src/WindowsZoneNames.kt"
     outputs.file(output)
     doLast {
+        val initialFileContents = try { File(output).readBytes() } catch(e: Throwable) { ByteArray(0) }
         val documentBuilderFactory = DocumentBuilderFactory.newInstance()
         // otherwise, parsing fails since it can't find the dtd
         documentBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
@@ -336,11 +323,13 @@ val downloadWindowsZonesMapping by tasks.registering {
         xmlDoc.documentElement.normalize()
         val mapZones = xmlDoc.getElementsByTagName("mapZone")
         val mapping = linkedMapOf<String, String>()
+        mapping["UTC"] = "UTC"
         for (i in 0 until mapZones.length) {
             val mapZone = mapZones.item(i)
             val windowsName = mapZone.attributes.getNamedItem("other").nodeValue
             val usualNames = mapZone.attributes.getNamedItem("type").nodeValue
             for (usualName in usualNames.split(' ')) {
+                if (usualName == "") continue
                 val oldWindowsName = mapping[usualName] // don't do it in `put` to preserve the order in the map
                 if (oldWindowsName == null) {
                     mapping[usualName] = windowsName
@@ -353,31 +342,23 @@ val downloadWindowsZonesMapping by tasks.registering {
         val bos = ByteArrayOutputStream()
         PrintWriter(bos).use { out ->
             out.println("""// generated with gradle task `$name`""")
-            out.println("""#include <unordered_map>""")
-            out.println("""#include <string>""")
-            out.println("""static const std::unordered_map<std::string, std::string> standard_to_windows = {""")
+            out.println("""package kotlinx.datetime""")
+            out.println("""internal val standardToWindows: Map<String, String> = mutableMapOf(""")
             for ((usualName, windowsName) in sortedMapping) {
-                out.println("\t{ \"$usualName\", \"$windowsName\" },")
+                out.println("  \"$usualName\" to \"$windowsName\",")
             }
-            out.println("};")
-            out.println("""static const std::unordered_map<std::string, std::string> windows_to_standard = {""")
+            out.println(")")
+            out.println("""internal val windowsToStandard: Map<String, String> = mutableMapOf(""")
             val reverseMap = sortedMapOf<String, String>()
             for ((usualName, windowsName) in mapping) {
                 if (reverseMap[windowsName] == null) {
                     reverseMap[windowsName] = usualName
                 }
             }
             for ((windowsName, usualName) in reverseMap) {
-                out.println("\t{ \"$windowsName\", \"$usualName\" },")
-            }
-            out.println("};")
-            out.println("""static const std::unordered_map<std::string, size_t> zone_ids = {""")
-            var i = 0
-            for ((usualName, windowsName) in sortedMapping) {
-                out.println("\t{ \"$usualName\", $i },")
-                ++i
+                out.println("  \"$windowsName\" to \"$usualName\",")
             }
-            out.println("};")
+            out.println(")")
         }
         val newFileContents = bos.toByteArray()
         if (!(initialFileContents contentEquals newFileContents)) {

core/common/test/TimeZoneTest.kt

@@ -35,13 +35,13 @@ class TimeZoneTest {
     @Test
     fun available() {
         val allTzIds = TimeZone.availableZoneIds
-        assertContains(allTzIds, "Europe/Berlin")
-        assertContains(allTzIds, "Europe/Moscow")
-        assertContains(allTzIds, "America/New_York")
+        assertContains(allTzIds, "Europe/Berlin", "Europe/Berlin not in $allTzIds")
+        assertContains(allTzIds, "Europe/Moscow", "Europe/Moscow not in $allTzIds")
+        assertContains(allTzIds, "America/New_York", "America/New_York not in $allTzIds")
 
-        assertNotEquals(0, allTzIds.size)
-        assertTrue(TimeZone.currentSystemDefault().id in allTzIds)
-        assertTrue("UTC" in allTzIds)
+        assertTrue(TimeZone.currentSystemDefault().id in allTzIds,
+            "The current system timezone ${TimeZone.currentSystemDefault().id} is not in $allTzIds")
+        assertTrue("UTC" in allTzIds, "The UTC timezone not in $allTzIds")
     }
 
     @Test

core/linux/test/TimeZoneRulesCompleteTest.kt

@@ -113,7 +113,6 @@ fun parseRfc2822(input: String): Pair<LocalDateTime, String> {
     val abbreviation = input.substringAfterLast(" ")
     val dateTime = input.substringBeforeLast(" ")
     val components = dateTime.split(Regex(" +"))
-    val dayOfWeek = components[0]
     val month = components[1]
     val dayOfMonth = components[2].toInt()
     val time = LocalTime.parse(components[3])