diff --git a/api/kweb-core.api b/api/kweb-core.api index b1f3bc0efa..2f3d938cf6 100644 --- a/api/kweb-core.api +++ b/api/kweb-core.api @@ -213,7 +213,7 @@ public class kweb/ElementCreator { public final fun text (Lkweb/state/KVal;)V } -public final class kweb/ElementCreator$Companion : mu/KLogging { +public final class kweb/ElementCreator$Companion : mu/two/KLogging { } public final class kweb/ElementKt { @@ -583,7 +583,7 @@ public final class kweb/ValueElement$DiffData { public final fun getPrefixEndIndex ()I public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lkweb/ValueElement$DiffData;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lkweb/ValueElement$DiffData;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class kweb/ValueElement$DiffData$$serializer : kotlinx/serialization/internal/GeneratedSerializer { @@ -742,7 +742,7 @@ public final class kweb/client/Client2ServerMessage { public final fun getKeepalive ()Z public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lkweb/client/Client2ServerMessage;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lkweb/client/Client2ServerMessage;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class kweb/client/Client2ServerMessage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { @@ -770,7 +770,7 @@ public final class kweb/client/Client2ServerMessage$C2SCallback { public final fun getData ()Lkotlinx/serialization/json/JsonElement; public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lkweb/client/Client2ServerMessage$C2SCallback;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lkweb/client/Client2ServerMessage$C2SCallback;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class kweb/client/Client2ServerMessage$C2SCallback$$serializer : kotlinx/serialization/internal/GeneratedSerializer { @@ -805,7 +805,7 @@ public final class kweb/client/Client2ServerMessage$ErrorMessage { public final fun getError ()Lkweb/client/Client2ServerMessage$ErrorMessage$Error; public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lkweb/client/Client2ServerMessage$ErrorMessage;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lkweb/client/Client2ServerMessage$ErrorMessage;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class kweb/client/Client2ServerMessage$ErrorMessage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { @@ -836,7 +836,7 @@ public final class kweb/client/Client2ServerMessage$ErrorMessage$Error { public final fun getName ()Ljava/lang/String; public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lkweb/client/Client2ServerMessage$ErrorMessage$Error;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lkweb/client/Client2ServerMessage$ErrorMessage$Error;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class kweb/client/Client2ServerMessage$ErrorMessage$Error$$serializer : kotlinx/serialization/internal/GeneratedSerializer { @@ -896,7 +896,7 @@ public final class kweb/client/FunctionCall { public final fun getParameters ()Ljava/lang/String; public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lkweb/client/FunctionCall;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lkweb/client/FunctionCall;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class kweb/client/FunctionCall$$serializer : kotlinx/serialization/internal/GeneratedSerializer { @@ -971,7 +971,7 @@ public final class kweb/client/Server2ClientMessage { public final fun getYourId ()Ljava/lang/String; public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lkweb/client/Server2ClientMessage;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lkweb/client/Server2ClientMessage;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class kweb/client/Server2ClientMessage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { @@ -1101,7 +1101,7 @@ public final class kweb/html/events/Event { public final fun getType ()Ljava/lang/String; public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lkweb/html/events/Event;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lkweb/html/events/Event;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class kweb/html/events/Event$$serializer : kotlinx/serialization/internal/GeneratedSerializer { @@ -1163,7 +1163,7 @@ public final class kweb/html/events/KeyboardEvent { public fun hashCode ()I public final fun isComposing ()Z public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lkweb/html/events/KeyboardEvent;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lkweb/html/events/KeyboardEvent;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class kweb/html/events/KeyboardEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { @@ -1227,7 +1227,7 @@ public final class kweb/html/events/MouseEvent { public final fun getY ()F public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lkweb/html/events/MouseEvent;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lkweb/html/events/MouseEvent;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class kweb/html/events/MouseEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { @@ -1367,7 +1367,7 @@ public final class kweb/html/events/OnReceiver$Companion { } public final class kweb/html/events/OnReceiverKt { - public static final fun getLogger ()Lmu/KLogger; + public static final fun getLogger ()Lmu/two/KLogger; } public final class kweb/html/fileUpload/FileFormInput { @@ -1387,7 +1387,7 @@ public final class kweb/html/fileUpload/FileUpload { public final fun getBase64Content ()Ljava/lang/String; public final fun getFileName ()Ljava/lang/String; public final fun getFileSize ()I - public static final fun write$Self (Lkweb/html/fileUpload/FileUpload;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V + public static final synthetic fun write$Self (Lkweb/html/fileUpload/FileUpload;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class kweb/html/fileUpload/FileUpload$$serializer : kotlinx/serialization/internal/GeneratedSerializer { diff --git a/build.gradle.kts b/build.gradle.kts index 7bb97d639c..fae1fab797 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,15 +4,15 @@ import java.net.URL plugins { buildsrc.conventions.`kotlin-jvm` buildsrc.conventions.`maven-publish` - id("org.jetbrains.dokka") version "1.7.20" - id("com.github.ben-manes.versions") version "0.45.0" + id("org.jetbrains.dokka") version "1.8.10" + id("com.github.ben-manes.versions") version "0.46.0" kotlin("plugin.serialization") // See api/API_README.md for details - id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.0" + id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.1" // Coverage - id("org.jetbrains.kotlinx.kover") version "0.6.1" + id("org.jetbrains.kotlinx.kover") version "0.7.0-Beta" } // This is overridden by the maven release process @@ -26,7 +26,7 @@ tasks.test { } dependencies { - api("org.jsoup:jsoup:1.15.4") + api("org.jsoup:jsoup:1.16.1") implementation("org.apache.commons:commons-text:1.10.0") implementation("com.google.guava:guava:31.1-jre") api("dev.forkhandles:result4k:2.4.0.0") @@ -35,29 +35,29 @@ dependencies { // Kotlin library dependencies ////////////////////////////// - api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") - api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4") - api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1") + api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.0-RC") + api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.0-RC") + api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") //////////////////// // Ktor dependencvies //////////////////// api("io.ktor:ktor-server-jetty:2.3.0") - api("io.ktor:ktor-server-websockets:2.2.3") - api("io.ktor:ktor-server-default-headers:2.2.4") + api("io.ktor:ktor-server-websockets:2.3.0") + api("io.ktor:ktor-server-default-headers:2.3.0") api("io.ktor:ktor-server-compression:2.3.0") - api("io.ktor:ktor-server-caching-headers:2.2.4") - api("io.ktor:ktor-network-tls-certificates:2.2.4") + api("io.ktor:ktor-server-caching-headers:2.3.0") + api("io.ktor:ktor-network-tls-certificates:2.3.0") api("io.mola.galimatias:galimatias:0.2.1") - implementation("io.github.microutils:kotlin-logging:3.0.5") + implementation("io.github.microutils:kotlin-logging:4.0.0-beta-2") /////////////////////////// // Dependencies for testing /////////////////////////// testApi(platform("io.kotest:kotest-bom:5.6.1")) - testApi(platform("org.junit:junit-bom:5.9.2")) + testApi(platform("org.junit:junit-bom:5.9.3")) testImplementation("io.kotest:kotest-runner-junit5") testImplementation("io.kotest:kotest-assertions-core") @@ -65,11 +65,11 @@ dependencies { testImplementation("ch.qos.logback:logback-classic:1.4.7") testImplementation("org.seleniumhq.selenium:selenium-opera-driver:4.4.0") - testImplementation("org.seleniumhq.selenium:selenium-chrome-driver:4.8.3") + testImplementation("org.seleniumhq.selenium:selenium-chrome-driver:4.9.0") testImplementation("org.seleniumhq.selenium:selenium-java:4.9.0") testImplementation("io.github.bonigarcia:selenium-jupiter:4.3.3") - testImplementation("org.seleniumhq.selenium:selenium-http-jdk-client:4.8.3") - testImplementation("com.codeborne:selenide:6.13.0") + testImplementation("org.seleniumhq.selenium:selenium-http-jdk-client:4.9.0") + testImplementation("com.codeborne:selenide:6.13.1") testImplementation("org.junit.jupiter:junit-jupiter-api") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 9a6791c4ae..776d0b2a6e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,8 +16,8 @@ dependencies { // files in the project. // Use their Maven coordinates (plus versions), not Gradle plugin IDs! // This should be the only place that Gradle plugin versions are defined, so they are aligned across all build scripts - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10") - implementation("org.jetbrains.kotlin:kotlin-serialization:1.8.10") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21") + implementation("org.jetbrains.kotlin:kotlin-serialization:1.8.21") } val gradleJvmTarget = 11 diff --git a/src/main/kotlin/kweb/ElementCreator.kt b/src/main/kotlin/kweb/ElementCreator.kt index b789162953..6393f04dbd 100755 --- a/src/main/kotlin/kweb/ElementCreator.kt +++ b/src/main/kotlin/kweb/ElementCreator.kt @@ -13,7 +13,7 @@ import kweb.state.KVal import kweb.state.KVar import kweb.util.KWebDSL import kweb.util.json -import mu.KLogging +import mu.two.KLogging import java.util.* import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.atomic.AtomicInteger diff --git a/src/main/kotlin/kweb/Kweb.kt b/src/main/kotlin/kweb/Kweb.kt index 6bde785d21..3388d30deb 100755 --- a/src/main/kotlin/kweb/Kweb.kt +++ b/src/main/kotlin/kweb/Kweb.kt @@ -31,7 +31,7 @@ import kweb.plugins.staticFiles.ResourceFolder import kweb.plugins.staticFiles.StaticFilesPlugin import kweb.util.* import kweb.util.NotFoundException -import mu.KotlinLogging +import mu.two.KotlinLogging import org.jsoup.nodes.DataNode import java.io.Closeable import java.time.* diff --git a/src/main/kotlin/kweb/WebBrowser.kt b/src/main/kotlin/kweb/WebBrowser.kt index ea05e50b2f..d8daf07e59 100755 --- a/src/main/kotlin/kweb/WebBrowser.kt +++ b/src/main/kotlin/kweb/WebBrowser.kt @@ -16,7 +16,7 @@ import kweb.state.KVar import kweb.state.ReversibleFunction import kweb.util.pathQueryFragment import kweb.util.random -import mu.KotlinLogging +import mu.two.KotlinLogging import java.util.* import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicInteger diff --git a/src/main/kotlin/kweb/client/ClientConnection.kt b/src/main/kotlin/kweb/client/ClientConnection.kt index 8db017ae26..b877f5537c 100755 --- a/src/main/kotlin/kweb/client/ClientConnection.kt +++ b/src/main/kotlin/kweb/client/ClientConnection.kt @@ -5,7 +5,7 @@ import io.ktor.websocket.Frame.Text import io.ktor.websocket.WebSocketSession import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel -import mu.KotlinLogging +import mu.two.KotlinLogging import java.util.concurrent.ConcurrentLinkedQueue private val logger = KotlinLogging.logger {} diff --git a/src/main/kotlin/kweb/config/KwebConfiguration.kt b/src/main/kotlin/kweb/config/KwebConfiguration.kt index 33cefaa190..c42e89318c 100644 --- a/src/main/kotlin/kweb/config/KwebConfiguration.kt +++ b/src/main/kotlin/kweb/config/KwebConfiguration.kt @@ -1,7 +1,7 @@ package kweb.config import kweb.Kweb -import mu.KotlinLogging +import mu.two.KotlinLogging import java.time.Duration import java.util.* diff --git a/src/main/kotlin/kweb/html/events/OnReceiver.kt b/src/main/kotlin/kweb/html/events/OnReceiver.kt index b83b84d86e..ba826e4a7d 100644 --- a/src/main/kotlin/kweb/html/events/OnReceiver.kt +++ b/src/main/kotlin/kweb/html/events/OnReceiver.kt @@ -5,7 +5,7 @@ import kotlinx.serialization.json.* import kotlinx.serialization.serializer import kweb.WebBrowser import kweb.util.KWebDSL -import mu.KotlinLogging +import mu.two.KotlinLogging import java.util.Collections.emptySet import java.util.concurrent.ConcurrentHashMap import kotlin.reflect.KClass diff --git a/src/main/kotlin/kweb/html/fileUpload/FileFormInput.kt b/src/main/kotlin/kweb/html/fileUpload/FileFormInput.kt index 315aa152d3..7176573beb 100644 --- a/src/main/kotlin/kweb/html/fileUpload/FileFormInput.kt +++ b/src/main/kotlin/kweb/html/fileUpload/FileFormInput.kt @@ -5,7 +5,7 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonPrimitive import kweb.Element import kweb.util.random -import mu.KotlinLogging +import mu.two.KotlinLogging import kotlin.math.abs private val logger = KotlinLogging.logger {} diff --git a/src/main/kotlin/kweb/state/KVal.kt b/src/main/kotlin/kweb/state/KVal.kt index 1497c3f71f..4d04c87a0a 100755 --- a/src/main/kotlin/kweb/state/KVal.kt +++ b/src/main/kotlin/kweb/state/KVal.kt @@ -1,7 +1,7 @@ package kweb.state import kweb.util.random -import mu.KotlinLogging +import mu.two.KotlinLogging import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentLinkedDeque diff --git a/src/main/kotlin/kweb/state/KVar.kt b/src/main/kotlin/kweb/state/KVar.kt index c7a5fd17a3..cc28603ad3 100755 --- a/src/main/kotlin/kweb/state/KVar.kt +++ b/src/main/kotlin/kweb/state/KVar.kt @@ -1,6 +1,6 @@ package kweb.state -import mu.KotlinLogging +import mu.two.KotlinLogging import kotlin.contracts.ExperimentalContracts import kotlin.contracts.InvocationKind import kotlin.contracts.contract diff --git a/src/main/kotlin/kweb/state/render.kt b/src/main/kotlin/kweb/state/render.kt index d2f7c2e18d..4d51a77716 100755 --- a/src/main/kotlin/kweb/state/render.kt +++ b/src/main/kotlin/kweb/state/render.kt @@ -5,7 +5,7 @@ import kweb.ElementCreator import kweb.WebBrowser import kweb.span import kweb.state.RenderState.* -import mu.KotlinLogging +import mu.two.KotlinLogging import java.util.concurrent.atomic.AtomicReference import kotlin.collections.ArrayList import kotlin.collections.forEach diff --git a/src/test/kotlin/kweb/demos/todo/TodoApp.kt b/src/test/kotlin/kweb/demos/todo/TodoApp.kt index 073d4c791a..b99e35e9ff 100755 --- a/src/test/kotlin/kweb/demos/todo/TodoApp.kt +++ b/src/test/kotlin/kweb/demos/todo/TodoApp.kt @@ -6,7 +6,7 @@ import kweb.plugins.fomanticUI.fomanticUIPlugin import kweb.state.* import kweb.util.NotFoundException import kweb.util.random -import mu.KotlinLogging +import mu.two.KotlinLogging fun main() { TodoApp() diff --git a/src/test/kotlin/kweb/docs/events.kt b/src/test/kotlin/kweb/docs/events.kt index 7094392d48..02f3066d81 100644 --- a/src/test/kotlin/kweb/docs/events.kt +++ b/src/test/kotlin/kweb/docs/events.kt @@ -2,7 +2,7 @@ package kweb.docs import kotlinx.serialization.json.jsonPrimitive import kweb.* -import mu.KotlinLogging +import mu.two.KotlinLogging /* * NOTE: Indentation is weird in this file because it's used to generate the documentation, don't fix it!