diff --git a/README.md b/README.md index 57f8194..b81a9c4 100755 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ repositories { mavenCentral() } dependencies { - implementation("ee.bjarn", "ktify", "0.1.2") + implementation("ee.bjarn", "ktify", "0.1.4") } ``` diff --git a/build.gradle.kts b/build.gradle.kts index acedd9d..4bf845e 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,40 +1,41 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm import com.vanniktech.maven.publish.SonatypeHost +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.9.23" - kotlin("plugin.serialization") version "1.9.23" + kotlin("jvm") version "2.0.21" + kotlin("plugin.serialization") version "2.0.21" id("org.jlleitschuh.gradle.ktlint") version "11.0.0" id("org.jetbrains.dokka") version "1.9.20" id("com.vanniktech.maven.publish") version "0.28.0" } group = "ee.bjarn" -version = "0.1.3" +version = "0.1.4" repositories { mavenCentral() } dependencies { - implementation(platform("io.ktor:ktor-bom:2.3.10")) + implementation(platform("io.ktor:ktor-bom:3.0.0")) implementation("io.ktor", "ktor-client-okhttp") implementation("io.ktor", "ktor-serialization-kotlinx-json") implementation("io.ktor", "ktor-client-content-negotiation") - implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.6.3") + implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.7.3") - implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.8.0") + implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.9.0") implementation("io.github.microutils", "kotlin-logging-jvm", "3.0.5") implementation("org.slf4j", "slf4j-simple", "2.0.13") } tasks { withType { - kotlinOptions { - jvmTarget = "11" - freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn" + compilerOptions { + jvmTarget.set(JvmTarget.JVM_11) + freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn") } } dokkaHtml { diff --git a/src/main/kotlin/ee/bjarn/ktify/Ktify.kt b/src/main/kotlin/ee/bjarn/ktify/Ktify.kt index bc6d5a1..9c144a3 100755 --- a/src/main/kotlin/ee/bjarn/ktify/Ktify.kt +++ b/src/main/kotlin/ee/bjarn/ktify/Ktify.kt @@ -20,6 +20,7 @@ import io.ktor.client.request.* import io.ktor.http.* import io.ktor.serialization.kotlinx.json.* import io.ktor.util.* +import io.ktor.utils.io.InternalAPI import kotlinx.serialization.json.JsonObject import mu.KotlinLogging import java.net.URLEncoder diff --git a/src/main/kotlin/ee/bjarn/ktify/model/auth/ClientCredentials.kt b/src/main/kotlin/ee/bjarn/ktify/model/auth/ClientCredentials.kt index dafa703..fdc9d8c 100755 --- a/src/main/kotlin/ee/bjarn/ktify/model/auth/ClientCredentials.kt +++ b/src/main/kotlin/ee/bjarn/ktify/model/auth/ClientCredentials.kt @@ -5,6 +5,7 @@ import ee.bjarn.ktify.utils.base64encode import io.ktor.client.call.* import io.ktor.client.request.* import io.ktor.util.* +import io.ktor.utils.io.InternalAPI import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable