Dependency updates.

Author: jpd236

build.gradle.kts

@@ -1,8 +1,8 @@
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
 
 plugins {
-    kotlin("js") version "1.8.22"
-    kotlin("plugin.serialization") version "1.8.22"
+    kotlin("multiplatform") version "1.9.10"
+    kotlin("plugin.serialization") version "1.9.10"
 }
 
 group = "com.jeffpdavidson"
@@ -11,35 +11,46 @@ version = "1.3.10-SNAPSHOT"
 repositories {
     mavenCentral()
     // TODO: Remove ahead of public release.
-    // maven { url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") }
-}
-
-dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.6.4")
-    implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.8.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
-    implementation("com.github.ajalt.colormath:colormath:3.2.1")
-
-    implementation("com.jeffpdavidson.kotwords:kotwords-js:1.3.9")
-
-    runtimeOnly(npm("webextension-polyfill", "0.10.0"))
-    runtimeOnly(npm("jquery", "3.6.3"))
-    runtimeOnly(npm("bootstrap", "4.6.2"))
-
-    testImplementation(kotlin("test-js"))
+    maven { url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") }
 }
 
 kotlin {
     js(IR) {
         browser {
-            webpackTask {
+            webpackTask(Action {
                 // The default devtool uses eval(), which is forbidden in extensions. And we inline the map so we don't
                 // need to configure the extension to load additional resources for the map.
                 devtool = org.jetbrains.kotlin.gradle.targets.js.webpack.WebpackDevtool.INLINE_CHEAP_MODULE_SOURCE_MAP
-            }
+            })
         }
         binaries.executable()
     }
+
+    @Suppress("UNUSED_VARIABLE") // https://youtrack.jetbrains.com/issue/KT-38871
+    sourceSets {
+        val jsMain by getting {
+            dependencies {
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.7.3")
+                implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.9.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-js:1.6.0")
+                implementation("com.github.ajalt.colormath:colormath-js:3.3.3")
+
+                implementation("com.jeffpdavidson.kotwords:kotwords-js:1.3.10-SNAPSHOT")
+
+                // TODO: Migrate to kotlinx-datetime if parsing/formatting support is added.
+                implementation("com.soywiz.korlibs.klock:klock-js:4.0.10")
+
+                runtimeOnly(npm("webextension-polyfill", "0.10.0"))
+                runtimeOnly(npm("bootstrap", "5.3.2"))
+            }
+        }
+
+        val jsTest by getting {
+            dependencies {
+                implementation(kotlin("test-js"))
+            }
+        }
+    }
 }
 
 // Define development{Browser}Extension and production{Browser}Extension tasks which build in development/production
@@ -59,29 +70,31 @@ tasks {
         }
     }
 
+    fun String.capitalizeAscii() = replaceFirstChar(Char::titlecase)
+
     val tasks = variants.associateWith { (env, browser) ->
-        val variantName = "$env${browser.capitalize()}"
+        val variantName = "$env${browser.capitalizeAscii()}"
         val extensionFolder = "build/extension/$variantName"
 
-        val browserWebpackTask = getByName("browser${env.capitalize()}Webpack", KotlinWebpack::class)
+        val browserWebpackTask = getByName("jsBrowser${env.capitalizeAscii()}Webpack", KotlinWebpack::class)
 
-        val copyBundleFile = register<Copy>("copy${variantName.capitalize()}BundleFile") {
+        val copyBundleFile = register<Copy>("copy${variantName.capitalizeAscii()}BundleFile") {
             dependsOn(browserWebpackTask)
-            from(browserWebpackTask.destinationDirectory) {
+            from(browserWebpackTask.outputDirectory) {
                 include("*.js")
             }
             into("$extensionFolder/js")
         }
 
-        val copyResources = register<Copy>("copy${variantName.capitalize()}Resources") {
-            from("src/main/resources")
+        val copyResources = register<Copy>("copy${variantName.capitalizeAscii()}Resources") {
+            from("src/jsMain/resources")
             exclude("manifest.json")
             exclude("browser-js/")
             into(extensionFolder)
         }
 
-        val copyManifest = register<Copy>("copy${variantName.capitalize()}Manifest") {
-            from("src/main/resources/manifest.json")
+        val copyManifest = register<Copy>("copy${variantName.capitalizeAscii()}Manifest") {
+            from("src/jsMain/resources/manifest.json")
             into(extensionFolder)
             // Replace placeholders in manifest.json based on the browser.
             when (browser) {
@@ -108,11 +121,7 @@ tasks {
             }
         }
 
-        val copyJsDeps = register<Copy>("copy${variantName.capitalize()}JsDeps") {
-            from("build/js/node_modules/jquery/dist") {
-                include("jquery.slim.min.js")
-                into("js")
-            }
+        val copyJsDeps = register<Copy>("copy${variantName.capitalizeAscii()}JsDeps") {
             from("build/js/node_modules/bootstrap/dist") {
                 include("css/bootstrap.min.css")
                 include("js/bootstrap.bundle.min.js")
@@ -121,7 +130,7 @@ tasks {
                 include("browser-polyfill.min.js")
                 into("js")
             }
-            from("src/main/resources/browser-js") {
+            from("src/jsMain/resources/browser-js") {
                 include("$browser.js")
                 rename { "browser.js" }
                 into("js")

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/browser/cookies/Extras.kt src/jsMain/kotlin/browser/cookies/Extras.kt

@@ -201,7 +201,7 @@ object CrosswordScraper {
         debugLog.appendLine("Browser: ${window.navigator.userAgent}")
 
         val (tabId, frames) = Scraping.getAllFrames()
-        debugLog.appendLine("URL: ${frames.first { it.parentFrameId == -1 }.url}")
+        debugLog.appendLine("URL: ${frames.firstOrNull { it.parentFrameId == -1 }?.url ?: "<unknown>"}")
 
         val puzzles = mutableSetOf<ProcessedScrapeResult>()
         val processedGrids = mutableListOf<List<List<Puzzle.Cell>>>()
@@ -385,7 +385,6 @@ object CrosswordScraper {
 
     private fun HtmlBlockTag.renderScrapeError(scrapedPuzzle: ProcessedScrapeResult.Error) {
         classes = classes + "disabled"
-        style = "pointer-events: auto;"
         div(classes = "mb-1") {
             +scrapedPuzzle.source
         }
@@ -439,7 +438,7 @@ object CrosswordScraper {
                             }
                             div("modal-footer") {
                                 button(type = ButtonType.button, classes = "btn btn-secondary") {
-                                    attributes["data-dismiss"] = "modal"
+                                    attributes["data-bs-dismiss"] = "modal"
                                     +"Close"
                                 }
                             }
@@ -451,14 +450,13 @@ object CrosswordScraper {
             val errorMessageElement = document.getElementById("error-message") as HTMLParagraphElement
             errorMessageElement.innerText = message
         }
-        val modal = js("$('#error-dialog')")
-        modal.modal("show")
+        js("new bootstrap.Modal('#error-dialog').show()")
     }
 
     /** Initiate a user download of the given data. */
     private suspend fun startDownload(fileName: String, data: ByteArray) {
         val reader = FileReader()
-        suspendCoroutine<Unit> { cont ->
+        suspendCoroutine { cont ->
             reader.onload = { event ->
                 val link = document.createElement("a") as HTMLAnchorElement
                 link.download = fileName

src/main/kotlin/browser/cookies/Imports.kt src/jsMain/kotlin/browser/cookies/Imports.kt

@@ -62,7 +62,7 @@ object Settings {
             h4 {
                 +"Automatic Download"
             }
-            div("form-group") {
+            div("mb-3") {
                 div("form-check") {
                     input(type = InputType.checkBox, classes = "form-check-input") {
                         id = ID_AUTO_DOWNLOAD
@@ -80,12 +80,12 @@ object Settings {
                             "download that puzzle and close the scraper dialog.")
                 }
             }
-            div("form-group") {
+            div("mb-3") {
                 label {
                     htmlFor = ID_AUTO_DOWNLOAD_FORMAT
                     +"Format"
                 }
-                select("form-control") {
+                select("form-select") {
                     id = ID_AUTO_DOWNLOAD_FORMAT
                     style = "max-width: 100px;"
                     FileFormat.values().forEach { format ->
@@ -106,7 +106,7 @@ object Settings {
             h4 {
                 +"PUZ"
             }
-            div("form-group") {
+            div("mb-3") {
                 div("form-check") {
                     input(type = InputType.checkBox, classes = "form-check-input") {
                         id = ID_PUZ_UNICODE_SUPPORT
@@ -127,13 +127,13 @@ object Settings {
             h4 {
                 +"PDF"
             }
-            div("form-group") {
+            div("mb-3") {
                 label {
                     htmlFor = ID_PDF_INK_SAVER_PERCENTAGE
                     +"Ink Saver percentage"
                 }
                 div("d-flex align-items-center") {
-                    input(type = InputType.range, classes = "custom-range") {
+                    input(type = InputType.range, classes = "form-range") {
                         id = ID_PDF_INK_SAVER_PERCENTAGE
                         style = "max-width: 300px;"
                         onInputFunction = {
@@ -143,24 +143,24 @@ object Settings {
                             setPdfInkSaverPercentage(pdfInkSaverPercentageInput.value.toInt())
                         }
                     }
-                    div("ml-2 border d-block") {
+                    div("ms-2 border d-block") {
                         id = ID_PDF_INK_SAVER_PERCENTAGE_SQUARE
                         style = "width: 1.5em; height: 1.5em; border-color: black !important;"
                     }
-                    span("ml-2") {
+                    span("ms-2") {
                         id = ID_PDF_INK_SAVER_PERCENTAGE_TEXT
                     }
                 }
                 small("form-text text-muted") {
                     +"Percentage to lighten black squares. 0% is pure black; 100% is pure white."
                 }
             }
-            div("form-group") {
+            div("mb-3") {
                 label {
                     htmlFor = ID_PDF_FONT
                     +"Font"
                 }
-                select("form-control") {
+                select("form-select") {
                     id = ID_PDF_FONT
                     style = "max-width: 300px;"
                     option {

src/main/kotlin/browser/permissions/Extras.kt src/jsMain/kotlin/browser/permissions/Extras.kt

@@ -5,11 +5,10 @@ import com.jeffpdavidson.crosswordscraper.Scraping
 import com.jeffpdavidson.crosswordscraper.sources.Source.Companion.hostIsDomainOrSubdomainOf
 import com.jeffpdavidson.kotwords.formats.UclickJpz
 import com.jeffpdavidson.kotwords.formats.UclickXml
-import com.soywiz.klock.DateFormat
-import com.soywiz.klock.DateTime
-import com.soywiz.klock.parseDate
+import korlibs.time.DateFormat
+import korlibs.time.DateTime
+import korlibs.time.parseDate
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import org.w3c.dom.parsing.DOMParser
 import org.w3c.dom.url.URL

src/main/kotlin/browser/permissions/Imports.kt src/jsMain/kotlin/browser/permissions/Imports.kt

@@ -8,6 +8,7 @@ import org.w3c.dom.url.URL
 object PzzlSource : FixedHostSource() {
 
     private data class PzzlSourceInfo(val hostPermission: String, val baseUrl: String)
+
     private val NYT_SOURCE = PzzlSourceInfo(
         hostPermission = "https://*.pzzl.com/*",
         baseUrl = "https://nytsyn.pzzl.com/nytsyn-crossword-mh/nytsyncrossword",

src/main/kotlin/browser/runtime/Imports.kt src/jsMain/kotlin/browser/runtime/Imports.kt

@@ -37,7 +37,6 @@ <h2>Crossword Scraper - Note About Amuse Labs</h2>
         point, support for Amuse Labs puzzles may have to be removed altogether.
     </p>
 </div>
-<script src="js/jquery.slim.min.js"></script>
 <script src="js/bootstrap.bundle.min.js"></script>
 </body>
 </html>

src/main/kotlin/browser/storage/Imports.kt src/jsMain/kotlin/browser/storage/Imports.kt

@@ -16,13 +16,12 @@ <h2>Crossword Scraper - Options</h2>
     <hr/>
     <div id="loading-container">
         <div class="spinner-border align-middle" id="loading-spinner" role="status"></div>
-        <strong class="ml-1">Loading&hellip;</strong>
+        <strong class="ms-1">Loading&hellip;</strong>
     </div>
     <div class="d-none" id="options-container"></div>
 </div>
-<script src="js/jquery.slim.min.js"></script>
 <script src="js/bootstrap.bundle.min.js"></script>
-<script src="js/browser-scripting-workaround.js"></script>
+<script src="js/browser.js"></script>
 <script src="js/CrosswordScraper.js"></script>
 </body>
 </html>

src/main/kotlin/browser/tabs/Extras.kt src/jsMain/kotlin/browser/tabs/Extras.kt

@@ -21,11 +21,10 @@ <h2>Crossword Scraper</h2>
     <hr/>
     <div id="loading-container">
         <div class="spinner-border align-middle" id="loading-spinner" role="status"></div>
-        <strong class="ml-1">Loading&hellip;</strong>
+        <strong class="ms-1">Loading&hellip;</strong>
     </div>
     <div class="d-none" id="puzzle-container"></div>
 </div>
-<script src="js/jquery.slim.min.js"></script>
 <script src="js/bootstrap.bundle.min.js"></script>
 <script src="js/browser.js"></script>
 <script src="js/CrosswordScraper.js"></script>