Update dependencies (#234)

Author: hopskipnfall

.github/workflows/docs.yml

@@ -14,10 +14,10 @@ jobs:
         with:
           persist-credentials: false
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: Build with Gradle
         uses: gradle/gradle-build-action@v2

.github/workflows/gradle.yml

@@ -21,25 +21,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: compileKotlin
+        run: ./gradlew compileKotlin
       - name: Run tests
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: test --info
+        run: ./gradlew test --info
       - name: Dry run JMH benchmarks
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: jmh -PjmhDryRun
+        run: ./gradlew jmh -PjmhDryRun
       - name: Check formatting
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: spotlessCheck
+        run: ./gradlew spotlessCheck
+

emulinker/build.gradle.kts

@@ -3,15 +3,16 @@ import java.time.Instant
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
-  id("com.google.protobuf") version "0.9.5"
-  id("build.buf") version "0.10.2"
-  id("com.diffplug.spotless") version "7.2.1"
-  id("org.jetbrains.dokka") version "2.0.0"
+  id("com.google.protobuf") version "0.9.6"
+  id("build.buf") version "0.10.3"
+  id("com.diffplug.spotless") version "8.1.0"
+  id("org.jetbrains.dokka") version "2.1.0"
   application
 
-  kotlin("jvm") version "2.2.10"
-  kotlin("plugin.serialization") version "2.2.10"
-  id("me.champeau.jmh") version "0.7.2"
+  kotlin("jvm") version "2.3.0"
+  kotlin("plugin.serialization") version "2.3.0"
+  id("me.champeau.jmh") version "0.7.3"
+  id("com.github.ben-manes.versions") version "0.53.0"
 }
 
 repositories {
@@ -20,20 +21,20 @@ repositories {
 }
 
 dependencies {
-  api("org.jetbrains.kotlin:kotlin-stdlib:2.2.10")
+  api("org.jetbrains.kotlin:kotlin-stdlib:2.3.0")
 
-  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
+  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
 
   implementation("io.github.redouane59.twitter:twittered:2.23")
 
-  implementation(project.dependencies.platform("io.insert-koin:koin-bom:4.1.0"))
+  implementation(project.dependencies.platform("io.insert-koin:koin-bom:4.1.1"))
   implementation("io.insert-koin:koin-core")
   testImplementation("io.insert-koin:koin-test")
   testImplementation("io.insert-koin:koin-test-junit4")
 
-  implementation("com.google.protobuf:protobuf-kotlin:4.31.1")
-  implementation("com.google.protobuf:protobuf-java:4.31.1")
-  implementation("com.google.protobuf:protobuf-java-util:4.31.1")
+  implementation("com.google.protobuf:protobuf-kotlin:4.33.2")
+  implementation("com.google.protobuf:protobuf-java:4.33.2")
+  implementation("com.google.protobuf:protobuf-java-util:4.33.2")
 
   val dropwizardMetricsVersion = "4.2.37"
   api("io.dropwizard.metrics:metrics-core:$dropwizardMetricsVersion")
@@ -44,7 +45,7 @@ dependencies {
   api("com.google.flogger:flogger-system-backend:$floggerVersion")
   api("com.google.flogger:flogger-log4j2-backend:$floggerVersion")
 
-  val log4j = "2.25.1"
+  val log4j = "2.25.3"
   implementation("org.apache.logging.log4j:log4j:$log4j")
   implementation("org.apache.logging.log4j:log4j-core:$log4j")
   implementation("org.apache.logging.log4j:log4j-api:$log4j")
@@ -53,7 +54,7 @@ dependencies {
   implementation("commons-configuration:commons-configuration:1.10")
   implementation("commons-pool:commons-pool:1.6")
 
-  val ktorVersion = "3.2.3"
+  val ktorVersion = "3.3.3"
   implementation("io.ktor:ktor-network-jvm:$ktorVersion")
   implementation("io.ktor:ktor-server-core-jvm:$ktorVersion")
   implementation("io.ktor:ktor-server-netty-jvm:$ktorVersion")
@@ -63,14 +64,14 @@ dependencies {
   implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.7.1")
 
   // https://mvnrepository.com/artifact/io.netty/netty-all
-  testImplementation("io.netty:netty-all:4.2.4.Final")
+  testImplementation("io.netty:netty-all:4.2.9.Final")
 
   testImplementation("junit:junit:4.13.2")
-  testImplementation("com.google.truth:truth:1.4.4")
-  testImplementation("com.google.truth.extensions:truth-proto-extension:1.4.4")
+  testImplementation("com.google.truth:truth:1.4.5")
+  testImplementation("com.google.truth.extensions:truth-proto-extension:1.4.5")
   testImplementation(kotlin("test"))
-  testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1")
-  testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
+  testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2")
+  testImplementation("org.mockito.kotlin:mockito-kotlin:6.1.0")
 }
 
 group = "org.emulinker"
@@ -166,7 +167,7 @@ spotless {
 }
 
 protobuf {
-  protoc { artifact = "com.google.protobuf:protoc:4.31.1" }
+  protoc { artifact = "com.google.protobuf:protoc:4.33.2" }
 
   generateProtoTasks {
     ofSourceSet("main").forEach {

emulinker/src/jmh/java/org/emulinker/kaillera/controller/LoginBenchmark.kt

@@ -79,8 +79,7 @@ open class LoginBenchmark : KoinComponent {
     @JvmInline value class Bundle(val message: V086Bundle) : OutgoingMessage
 
     @JvmInline
-    value class ConnectionMessage(val message: RequestPrivateKailleraPortResponse) :
-      OutgoingMessage
+    value class ConnectionMessage(val message: RequestPrivateKailleraPortResponse) : OutgoingMessage
   }
 
   fun readOutgoing(): OutgoingMessage {

emulinker/src/main/i18n/messages.properties

@@ -174,6 +174,7 @@ KailleraServerImpl.CanceledPendingTweet=Canceled pending tweet.
 
 Lagstat.GameNotLaggy=The game does not appear to be significantly laggy.
 Lagstat.LagstatReset=LagStat has been reset.
+! Example: Total lag over the last 1.0m: 0.02s
 Lagstat.TotalGameLagSummary=Total lag over the last {0}\: {1}.
 ! Example: Recommendation: nue should try playing on 2f. Enter 25 in the ping spoof field when joining. If lag continues, run /lagstat again.
 Lagstat.LagReductionRecommendation=Recommendation\: {0} should try playing on {1,number,integer}f. Enter {2,number,integer} in the ping spoof field when joining. If lag continues, run /lagstat again.

emulinker/src/main/java/org/emulinker/kaillera/access/TemporaryAttribute.kt

@@ -22,8 +22,7 @@ class TempBan(accessStr: String, duration: Duration) : TemporaryAttribute(access
 
 class TempAdmin(accessStr: String, duration: Duration) : TemporaryAttribute(accessStr, duration)
 
-class TempModerator(accessStr: String, duration: Duration) :
-  TemporaryAttribute(accessStr, duration)
+class TempModerator(accessStr: String, duration: Duration) : TemporaryAttribute(accessStr, duration)
 
 class TempElevated(accessStr: String, duration: Duration) : TemporaryAttribute(accessStr, duration)
 

emulinker/src/test/java/org/emulinker/testing/LoggingRule.kt

@@ -2,6 +2,7 @@ package org.emulinker.testing
 
 import com.google.common.flogger.backend.LogData
 import com.google.common.flogger.backend.LoggerBackend
+import com.google.common.flogger.backend.SimpleMessageFormatter
 import com.google.common.flogger.backend.system.BackendFactory
 import com.google.common.truth.Fact.simpleFact
 import com.google.common.truth.FailureMetadata
@@ -65,7 +66,15 @@ object TestLoggingBackend : LoggerBackend() {
   }
 
   override fun handleError(e: RuntimeException?, logData: LogData) {
-    logs.loggerToMessage.add(logData.loggerName!! to logData.literalArgument.toString())
+    val message =
+      if (logData.templateContext == null) {
+        logData.literalArgument.toString()
+      } else {
+        val sb = StringBuilder()
+        SimpleMessageFormatter.format(logData) { _, message, _ -> sb.append(message) }
+        sb.toString()
+      }
+    logs.loggerToMessage.add(logData.loggerName!! to message)
   }
 }