diff --git a/build.gradle.kts b/build.gradle.kts index 0a14c22c..e7152164 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,18 +46,18 @@ configure(projects) { testImplementation(kotlin("test-junit5")) // coroutines - val coroutinesVersion = "1.5.0" + val coroutinesVersion = "1.5.1" implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion") - val kotlinSerializationVersion = "1.2.1" + val kotlinSerializationVersion = "1.3.0-RC" implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion") implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion") // Dependency Injection - implementation("org.kodein.di:kodein-di-conf-jvm:7.5.0") + implementation("org.kodein.di:kodein-di-conf-jvm:7.7.0") // Logging implementation("org.slf4j:slf4j-api:1.7.30") @@ -69,8 +69,8 @@ configure(projects) { implementation("io.reactivex:rxkotlin:1.0.0") implementation("com.jakewharton.rxrelay:rxrelay:1.2.0") - // JSoup - implementation("org.jsoup:jsoup:1.13.1") + // dependency both in AndroidCompat and extensions, version locked by Tachiyomi app/extensions + implementation("org.jsoup:jsoup:1.14.1") // dependency of :AndroidCompat:Config implementation("com.typesafe:config:1.4.1") @@ -80,14 +80,15 @@ configure(projects) { implementation("net.harawata:appdirs:1.2.1") // dex2jar - val dex2jarVersion = "v21" + val dex2jarVersion = "v26" implementation("com.github.ThexXTURBOXx.dex2jar:dex-translator:$dex2jarVersion") implementation("com.github.ThexXTURBOXx.dex2jar:dex-tools:$dex2jarVersion") // APK parser implementation("net.dongliu:apk-parser:2.6.10") - // Jackson + + // dependency both in AndroidCompat and server, version locked by javalin implementation("com.fasterxml.jackson.core:jackson-annotations:2.10.3") } } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt index 7a50456b..8502fa47 100644 --- a/buildSrc/src/main/kotlin/Constants.kt +++ b/buildSrc/src/main/kotlin/Constants.kt @@ -7,7 +7,7 @@ import java.io.BufferedReader * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -const val kotlinVersion = "1.5.21" +const val kotlinVersion = "1.5.30" const val MainClass = "suwayomi.tachidesk.MainKt" diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 5eae203c..a61e2d50 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -9,7 +9,7 @@ plugins { application kotlin("plugin.serialization") id("com.github.johnrengelman.shadow") version "7.0.0" - id("org.jmailen.kotlinter") version "3.5.0" + id("org.jmailen.kotlinter") version "3.6.0" id("com.github.gmazzo.buildconfig") version "3.0.2" } @@ -31,13 +31,13 @@ dependencies { implementation("com.squareup.okio:okio:2.10.0") // Javalin api - implementation("io.javalin:javalin:3.13.6") - // jackson version is tied to javalin, ref: `io.javalin.core.util.OptionalDependency` + implementation("io.javalin:javalin:3.13.11") + // jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency` implementation("com.fasterxml.jackson.core:jackson-databind:2.10.3") implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.10.3") // Exposed ORM - val exposedVersion = "0.31.1" + val exposedVersion = "0.34.1" implementation("org.jetbrains.exposed:exposed-core:$exposedVersion") implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion") implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion") @@ -51,7 +51,7 @@ dependencies { // tray icon implementation("com.dorkbox:SystemTray:4.1") - implementation("com.dorkbox:Utilities:1.9") + implementation("com.dorkbox:Utilities:1.9") // version locked by SystemTray // dependencies of Tachiyomi extensions, some are duplicate, keeping it here for reference