From 67f3dbaf57c4544a6830a16c174d61a494228559 Mon Sep 17 00:00:00 2001 From: Graham Date: Mon, 18 Jul 2022 19:06:42 +0100 Subject: [PATCH] Update dependencies Signed-off-by: Graham --- .../archive/cache/Js5ChannelHandler.kt | 1 + .../deob/ast/transform/IdentityTransformer.kt | 1 - .../transform/NegativeLiteralTransformer.kt | 1 - .../org/openrs2/deob/ast/util/ExprUtils.kt | 1 - .../transform/ConstantArgTransformer.kt | 2 -- .../game/net/login/LoginChannelHandler.kt | 1 + gradle/libs.versions.toml | 24 +++++++++---------- settings.gradle.kts | 2 +- 8 files changed, 15 insertions(+), 18 deletions(-) diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt index c627664f..e5da9d61 100644 --- a/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt +++ b/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt @@ -152,6 +152,7 @@ public abstract class Js5ChannelHandler( } } + @Suppress("OVERRIDE_DEPRECATION") override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable) { releaseGroups() diff --git a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/IdentityTransformer.kt b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/IdentityTransformer.kt index ceb687b4..d8612974 100644 --- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/IdentityTransformer.kt +++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/IdentityTransformer.kt @@ -17,7 +17,6 @@ import javax.inject.Singleton public class IdentityTransformer : Transformer() { override fun transformUnit(group: LibraryGroup, library: Library, unit: CompilationUnit) { unit.walk { expr: BinaryExpr -> - @Suppress("NON_EXHAUSTIVE_WHEN") when (expr.operator) { BinaryExpr.Operator.PLUS -> { if (expr.left.isZero()) { diff --git a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt index 98ba048d..98c746d2 100644 --- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt +++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt @@ -18,7 +18,6 @@ public class NegativeLiteralTransformer : Transformer() { return@walk } - @Suppress("NON_EXHAUSTIVE_WHEN") when (expr.operator) { UnaryExpr.Operator.PLUS -> expr.replace(operand) UnaryExpr.Operator.MINUS -> expr.replace(operand.negate()) diff --git a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/util/ExprUtils.kt b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/util/ExprUtils.kt index 541ce0db..4ca07ffe 100644 --- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/util/ExprUtils.kt +++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/util/ExprUtils.kt @@ -73,7 +73,6 @@ public fun Expression.not(): Expression { } } is BinaryExpr -> { - @Suppress("NON_EXHAUSTIVE_WHEN") when (operator) { BinaryExpr.Operator.EQUALS -> return BinaryExpr(left.clone(), right.clone(), BinaryExpr.Operator.NOT_EQUALS) diff --git a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ConstantArgTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ConstantArgTransformer.kt index 110bd090..9d4c89b1 100644 --- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ConstantArgTransformer.kt +++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ConstantArgTransformer.kt @@ -206,7 +206,6 @@ public class ConstantArgTransformer @Inject constructor(private val profile: Pro continue@frame } - @Suppress("NON_EXHAUSTIVE_WHEN") when (IntBranch.evaluateUnary(insn.opcode, value.set.values)) { ALWAYS_TAKEN -> alwaysTakenBranches += insn NEVER_TAKEN -> neverTakenBranches += insn @@ -220,7 +219,6 @@ public class ConstantArgTransformer @Inject constructor(private val profile: Pro continue@frame } - @Suppress("NON_EXHAUSTIVE_WHEN") when (IntBranch.evaluateBinary(insn.opcode, value1.set.values, value2.set.values)) { ALWAYS_TAKEN -> alwaysTakenBranches += insn NEVER_TAKEN -> neverTakenBranches += insn diff --git a/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt b/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt index 33f5da19..94f00d38 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt @@ -44,6 +44,7 @@ public class LoginChannelHandler @Inject constructor( is LoginRequest.InitJaggrabConnection -> handleInitJaggrabConnection(ctx) is LoginRequest.RequestWorldList -> handleRequestWorldList(ctx, msg) is LoginRequest.InitCrossDomainConnection -> handleInitCrossDomainConnection(ctx) + else -> Unit } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 84b06733..5c6b2bb6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,15 +6,15 @@ guice = "5.1.0" jackson = "2.13.3" jimfs = "1.2" junit = "5.8.2" -kotlin = "1.6.21" -kotlinCoroutines = "1.6.2" +kotlin = "1.7.10" +kotlinCoroutines = "1.6.4" ktor = "1.6.8" -netty = "4.1.77.Final" +netty = "4.1.79.Final" nettyIoUring = "0.0.14.Final" [plugins] dependencyLicenseReport = { id = "com.github.jk1.dependency-license-report", version = "2.1" } -dokka = { id = "org.jetbrains.dokka", version = "1.6.21" } +dokka = { id = "org.jetbrains.dokka", version = "1.7.10" } kotlinter = { id = "org.jmailen.kotlinter", version = "3.9.0" } shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2" } versions = { id = "com.github.ben-manes.versions", version = "0.42.0" } @@ -29,14 +29,14 @@ bootstrapTable = { module = "org.webjars.npm:bootstrap-table", version = "1.20.2 bouncyCastle-pkix = { module = "org.bouncycastle:bcpkix-jdk15on", version = "1.70" } bouncyCastle-provider = { module = "org.bouncycastle:bcprov-jdk15on", version = "1.70" } byteUnits = { module = "com.jakewharton.byteunits:byteunits", version = "0.9.1" } -clikt = { module = "com.github.ajalt.clikt:clikt", version = "3.4.2" } +clikt = { module = "com.github.ajalt.clikt:clikt", version = "3.5.0" } commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commons-compress" } fastutil = { module = "it.unimi.dsi:fastutil", version = "8.5.8" } fernflower = { module = "org.openrs2:fernflower", version = "1.1.1" } -flyway = { module = "org.flywaydb:flyway-core", version = "8.5.12" } +flyway = { module = "org.flywaydb:flyway-core", version = "9.0.1" } guava = { module = "com.google.guava:guava", version.ref = "guava" } guice = { module = "com.google.inject:guice", version.ref = "guice" } -h2 = { module = "com.h2database:h2", version = "2.1.212" } +h2 = { module = "com.h2database:h2", version = "2.1.214" } hikaricp = { module = "com.zaxxer:HikariCP", version = "5.0.1" } inlineLogger = { module = "com.michael-bull.kotlin-inline-logger:kotlin-inline-logger", version = "1.0.4" } jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version = "2.13.3" } @@ -49,13 +49,13 @@ jgrapht = { module = "org.jgrapht:jgrapht-core", version = "1.5.1" } jimfs = { module = "com.google.jimfs:jimfs", version.ref = "jimfs" } jquery = { module = "org.webjars:jquery", version = "3.6.0" } jnr = { module = "com.github.jnr:jnr-ffi", version = "2.2.12" } -jsoup = { module = "org.jsoup:jsoup", version = "1.15.1" } +jsoup = { module = "org.jsoup:jsoup", version = "1.15.2" } junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version = { strictly = "5.8.2" } } junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } junit-launcher = { module = "org.junit.platform:junit-platform-launcher", version = "1.8.2" } kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinCoroutines" } kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinCoroutines" } -kotlinPoet = { module = "com.squareup:kotlinpoet", version = "1.11.0" } +kotlinPoet = { module = "com.squareup:kotlinpoet", version = "1.12.0" } ktor-jackson = { module = "io.ktor:ktor-jackson", version.ref = "ktor" } ktor-server-cio = { module = "io.ktor:ktor-server-cio", version.ref = "ktor" } ktor-thymeleaf = { module = "io.ktor:ktor-thymeleaf", version.ref = "ktor" } @@ -67,9 +67,9 @@ netty-codec-http = { module = "io.netty:netty-codec-http", version.ref = "netty" netty-handler = { module = "io.netty:netty-handler", version.ref = "netty" } netty-transport = { module = "io.netty:netty-transport", version.ref = "netty" } openrs2-natives = { module = "org.openrs2:openrs2-natives-all", version = "3.2.0" } -pf4j = { module = "org.pf4j:pf4j", version = "3.6.0" } -postgres = { module = "org.postgresql:postgresql", version = "42.3.6" } -runelite-client = { module = "net.runelite:client", version = "1.8.21" } +pf4j = { module = "org.pf4j:pf4j", version = "3.7.0" } +postgres = { module = "org.postgresql:postgresql", version = "42.4.0" } +runelite-client = { module = "net.runelite:client", version = "1.8.27.1" } thymeleaf-core = { module = "org.thymeleaf:thymeleaf", version = "3.0.15.RELEASE" } thymeleaf-java8time = { module = "org.thymeleaf.extras:thymeleaf-extras-java8time", version = "3.0.4.RELEASE" } xz = { module = "org.tukaani:xz", version = "1.9" } diff --git a/settings.gradle.kts b/settings.gradle.kts index e8a34f43..82ebbcc4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,7 +13,7 @@ dependencyResolutionManagement { pluginManagement { plugins { - kotlin("jvm") version "1.6.21" + kotlin("jvm") version "1.7.10" } }