Verified Commit 0c12d135 authored by Konstantin Kopper's avatar Konstantin Kopper
Browse files

Kotlin 1.3.50 and some dependency upgrades

parent 20cd7ad6
Pipeline #13075 failed with stages
in 36 seconds
root=true
root = true
[*]
charset=utf-8
end_of_line=lf
insert_final_newline=true
indent_style=space
indent_size=4
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
[{*.yml,*.yaml,*.json}]
indent_style=space
indent_size=2
[{*.yml, *.yaml, *.json}]
indent_style = space
indent_size = 2
[{*.kt,*.kts}]
indent_style=space
indent_size=4
[{*.kt, *.kts}]
indent_style = space
indent_size = 4
......@@ -7,8 +7,8 @@ if (!JavaVersion.current().isJava8Compatible)
error("Only JDK 8 or newer is supported!")
plugins {
kotlin("jvm") version "1.3.41"
id("kotlinx-serialization") version "1.3.41"
kotlin("jvm") version "1.3.50"
id("kotlinx-serialization") version "1.3.50"
id("org.jetbrains.dokka") version "0.9.18"
}
......@@ -17,8 +17,8 @@ repositories {
maven { url = uri("https://dl.bintray.com/kotlin/kotlinx") }
}
val ktorVersion = "1.2.2"
val junitVersion = "5.5.0"
val ktorVersion = "1.2.3"
val junitVersion = "5.5.1"
val aspectjVersion = "1.9.4"
dependencies {
......@@ -29,16 +29,16 @@ dependencies {
implementation(kotlin("stdlib-jdk8"))
// Coroutines
implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.2.2")
implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.3.0")
// Kotlin serialization
implementation("org.jetbrains.kotlinx", "kotlinx-serialization-runtime", "0.11.1")
implementation("org.jetbrains.kotlinx", "kotlinx-serialization-runtime", "0.12.0")
// OpenJFX
if (JavaVersion.current().isJava11Compatible) {
for (pkg in listOf("base", "controls", "fxml", "graphics"))
for (os in listOf("linux", "mac", "win"))
implementation("org.openjfx", "javafx-$pkg", "12.0.1", classifier = os)
implementation("org.openjfx", "javafx-$pkg", "12.0.2", classifier = os)
}
// Provides RichText TextAreas. Used for code input area.
......@@ -59,13 +59,13 @@ dependencies {
implementation("io.ktor", "ktor-freemarker", ktorVersion)
// http4k WebSocket client library
implementation("org.http4k", "http4k-client-websocket", "3.162.0")
implementation("org.http4k", "http4k-client-websocket", "3.177.0")
// AspectJ runtime
runtimeOnly("org.aspectj", "aspectjrt", aspectjVersion)
// NOP (no-operation) logger implementation
runtimeOnly("org.slf4j", "slf4j-nop", "1.7.26")
runtimeOnly("org.slf4j", "slf4j-nop", "1.7.28")
testImplementation("org.junit.jupiter", "junit-jupiter-api", junitVersion)
testImplementation("org.junit.jupiter", "junit-jupiter-params", junitVersion)
......
......@@ -15,7 +15,6 @@ import io.ktor.http.URLProtocol
import io.ktor.http.withCharset
import kotlinx.coroutines.io.jvm.javaio.toInputStream
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonElementTypeMismatchException
import kotlinx.serialization.json.JsonException
import java.awt.Desktop
import java.net.URI
......@@ -84,8 +83,6 @@ object PseuCoShare : FileSharer {
return try {
URI(Json.plain.parseJson(c.content.toInputStream().reader().use { it.readText() }).jsonObject["url"]!!.primitive.content)
} catch (e: JsonElementTypeMismatchException) {
throw PseuCoShareException("Response had invalid format.", e)
} catch (e: JsonException) {
throw PseuCoShareException("Parsing the API response failed.", e)
} catch (e: URISyntaxException) {
......
......@@ -26,7 +26,6 @@ import io.ktor.websocket.WebSockets
import io.ktor.websocket.webSocket
import kotlinx.coroutines.launch
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonElementTypeMismatchException
import kotlinx.serialization.json.JsonException
import util.Workspace
import java.io.File
......@@ -104,7 +103,7 @@ object PseuCoWebSocket : PseuCoServer {
val request = Json.plain.parseJson(frame.readText()).let {
val o = try {
it.jsonObject
} catch (e: JsonElementTypeMismatchException) {
} catch (e: JsonException) {
sendError("Expected a JSON object.")
return@let null
}
......
......@@ -2,6 +2,7 @@ package fxGui
import com.pseuco.PseuCoFileSharer
import com.pseuco.api.PseuCoShare
import com.pseuco.dataraces.PseuCoDRD
import com.pseuco.websocket.PseuCoWebSocket
import config.Config
import fxGui.main.MainPane
......@@ -151,6 +152,7 @@ internal class Main : Application() {
VersionCheck.close()
PseuCoWebSocket.stop()
CompanionWebApp.stop()
PseuCoDRD.leave()
}
companion object {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment