Update dependencies

Signed-off-by: Graham <gpe@openrs2.org>

db/src/test/kotlin/org/openrs2/db/DatabaseTest.kt

@@ -1,7 +1,8 @@
 package org.openrs2.db
 
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.test.currentTime
+import kotlinx.coroutines.test.runTest
 import org.h2.jdbcx.JdbcDataSource
 import java.sql.SQLException
 import kotlin.test.Test
@@ -27,7 +28,7 @@ class DatabaseTest {
     }
 
     @Test
-    fun testSuccessful() = runBlockingTest {
+    fun testSuccessful() = runTest {
         val start = currentTime
 
         val result = database.execute { connection ->
@@ -58,7 +59,7 @@ class DatabaseTest {
     }
 
     @Test
-    fun testDeadlockRetry() = runBlockingTest {
+    fun testDeadlockRetry() = runTest {
         var attempts = 0
         val start = currentTime
 
@@ -100,7 +101,7 @@ class DatabaseTest {
         var attempts = 0
 
         assertFailsWith<DeadlockException> {
-            runBlockingTest {
+            runTest {
                 database.execute<Unit> {
                     attempts++
                     throw DeadlockException()
@@ -116,7 +117,7 @@ class DatabaseTest {
         var attempts = 0
 
         assertFailsWith<TestException> {
-            runBlockingTest {
+            runTest {
                 database.execute<Unit> {
                     attempts++
                     throw TestException()
@@ -142,7 +143,7 @@ class DatabaseTest {
     }
 
     @Test
-    fun testDeadlockCauseChain() = runBlockingTest {
+    fun testDeadlockCauseChain() = runTest {
         var attempts = 0
         val start = currentTime
 
@@ -166,7 +167,7 @@ class DatabaseTest {
     }
 
     @Test
-    fun testDeadlockNextChain() = runBlockingTest {
+    fun testDeadlockNextChain() = runTest {
         var attempts = 0
         val start = currentTime
 
@@ -196,7 +197,7 @@ class DatabaseTest {
         var attempts = 0
 
         assertFailsWith<NonDeadlockException> {
-            runBlockingTest {
+            runTest {
                 database.execute<Unit> {
                     attempts++
 

gradle/libs.versions.toml

@@ -3,14 +3,14 @@ asm = "9.2"
 commons-compress = "1.21"
 guava = "31.0.1-jre"
 guice = "5.0.1"
-jackson = "2.13.0"
+jackson = "2.13.1"
 jimfs = "1.2"
 junit = "5.8.2"
-kotlin = "1.6.0"
+kotlin = "1.6.10"
-kotlinCoroutines = "1.5.2"
+kotlinCoroutines = "1.6.0"
 ktor = "1.6.7"
-netty = "4.1.71.Final"
+netty = "4.1.72.Final"
-nettyIoUring = "0.0.10.Final"
+nettyIoUring = "0.0.11.Final"
 
 [libraries]
 asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" }
@@ -26,10 +26,10 @@ clikt = { module = "com.github.ajalt.clikt:clikt", version = "3.3.0" }
 commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commons-compress" }
 fastutil = { module = "it.unimi.dsi:fastutil", version = "8.5.6" }
 fernflower = { module = "org.openrs2:fernflower", version = "1.1.1" }
-flyway = { module = "org.flywaydb:flyway-core", version = "8.2.1" }
+flyway = { module = "org.flywaydb:flyway-core", version = "8.3.0" }
 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.0.202" }
+h2 = { module = "com.h2database:h2", version = "2.0.204" }
 hikaricp = { module = "com.zaxxer:HikariCP", version = "5.0.0" }
 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.ref = "jackson" }
@@ -51,7 +51,7 @@ 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" }
 ktor-webjars = { module = "io.ktor:ktor-webjars", version.ref = "ktor" }
-logback = { module = "ch.qos.logback:logback-classic", version = "1.2.7" }
+logback = { module = "ch.qos.logback:logback-classic", version = "1.2.10" }
 netty-buffer = { module = "io.netty:netty-buffer", version.ref = "netty" }
 netty-codec-core = { module = "io.netty:netty-codec", version.ref = "netty" }
 netty-codec-http = { module = "io.netty:netty-codec-http", version.ref = "netty" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -14,10 +14,10 @@ pluginManagement {
     plugins {
         id("com.github.ben-manes.versions") version "0.39.0"
         id("com.github.jk1.dependency-license-report") version "2.0"
-        id("com.github.johnrengelman.shadow") version "7.1.0"
+        id("com.github.johnrengelman.shadow") version "7.1.1"
         id("org.jetbrains.dokka") version "1.6.0"
-        id("org.jmailen.kotlinter") version "3.7.0"
+        id("org.jmailen.kotlinter") version "3.8.0"
-        kotlin("jvm") version "1.6.0"
+        kotlin("jvm") version "1.6.10"
     }
 }