Skip to content

Commit fc0edce

Browse files
committed
Update dependencies
- Add log file
1 parent 9d6deb8 commit fc0edce

File tree

8 files changed

+162
-111
lines changed

8 files changed

+162
-111
lines changed

.github/workflows/client.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
build:
88
runs-on: windows-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v5
1111
- name: 'Set up latest JDK code tool jextract'
1212
uses: oracle-actions/setup-java@v1
1313
with:
@@ -16,11 +16,11 @@ jobs:
1616
- uses: actions/setup-java@v4
1717
with:
1818
distribution: "temurin"
19-
java-version: "23"
19+
java-version: "25"
2020
- uses: actions-rust-lang/setup-rust-toolchain@v1
2121
with:
2222
cache-workspaces: windows_helper
23-
- uses: gradle/actions/setup-gradle@v4
23+
- uses: gradle/actions/setup-gradle@v5
2424
- run: ./gradlew client:packageReleaseDistributionForCurrentOS
2525
- run: mv 'GTA Killer-*.msi' client.msi
2626
working-directory: client/build/compose/binaries/main-release/msi/

.github/workflows/server.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717

1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@v4
21-
- uses: actions/setup-java@v4
20+
uses: actions/checkout@v5
21+
- uses: actions/setup-java@v5
2222
with:
23-
java-version: 23
23+
java-version: 25
2424
distribution: temurin
25-
- uses: gradle/actions/setup-gradle@v4
25+
- uses: gradle/actions/setup-gradle@v5
2626
- run: ./gradlew server:installDist
2727
- name: Setup Docker buildx
2828
uses: docker/setup-buildx-action@v3

client/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
alias(libs.plugins.buildconfig)
99
}
1010

11-
version = "1.6.2"
11+
version = "1.6.3"
1212

1313
repositories {
1414
mavenCentral()

client/src/main/resources/logback.xml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,25 @@
44
<pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
55
</encoder>
66
</appender>
7+
<!-- Resolve Windows APPDATA -->
8+
<property name="APPDATA_DIR" value="${APPDATA:-${user.home}}/gta-killer"/>
9+
10+
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
11+
<file>${APPDATA_DIR}/app.log</file>
12+
13+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
14+
<!-- Daily rolling -->
15+
<fileNamePattern>${APPDATA_DIR}/app.%d{yyyy-MM-dd}.log</fileNamePattern>
16+
<maxHistory>30</maxHistory>
17+
</rollingPolicy>
18+
19+
<encoder>
20+
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
21+
</encoder>
22+
</appender>
723
<root level="trace">
824
<appender-ref ref="STDOUT"/>
25+
<appender-ref ref="FILE"/>
926
</root>
10-
<logger name="org.mongodb.driver" level="INFO"/>
11-
<logger name="org.pf4j" level="INFO"/>
1227
<logger name="io.netty" level="INFO"/>
13-
<logger name="io.lettuce" level="INFO"/>
1428
</configuration>

common/src/main/kotlin/Status.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.schlaubi.gtakiller.common
22

3-
import kotlinx.datetime.Instant
3+
import kotlin.time.Instant
44
import kotlinx.serialization.Serializable
55

66
@Serializable

gradle/libs.versions.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
2-
kotlin = "2.1.10"
3-
ktor = "3.1.0"
4-
kotlinx-serialization = "1.8.0"
5-
compose = "1.8.0-alpha03"
6-
proguard = "7.6.1"
2+
kotlin = "2.3.0"
3+
ktor = "3.3.3"
4+
kotlinx-serialization = "1.9.0"
5+
compose = "1.9.3"
6+
proguard = "2.7.0"
77

88
[libraries]
99
kotlinGradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
1010

1111
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
1212
kotlinx-serialization-json-io = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json-io", version.ref = "kotlinx-serialization" }
13-
kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.6.2" }
14-
kotlinx-io-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version = "0.7.0" }
13+
kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.7.1" }
14+
kotlinx-io-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version = "0.7.2" }
1515

1616
ktor-resources = { group = "io.ktor", name = "ktor-resources", version.ref = "ktor" }
1717
ktor-http = { group = "io.ktor", name = "ktor-http", version.ref = "ktor" }
@@ -27,11 +27,11 @@ ktor-server-forwarded-header = { group = "io.ktor", name = "ktor-server-forwarde
2727
ktor-server-resources = { group = "io.ktor", name = "ktor-server-resources", version.ref = "ktor" }
2828
ktor-server-content-negotiation = { group = "io.ktor", name = "ktor-server-content-negotiation", version.ref = "ktor" }
2929

30-
androidx-lifecycle-viewmodel-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel-compose", version = "2.9.0-alpha03" }
31-
compose-navigation = { group = "org.jetbrains.androidx.navigation", name = "navigation-compose", version = "2.8.0-alpha13" }
30+
androidx-lifecycle-viewmodel-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel-compose", version = "2.9.6" }
31+
compose-navigation = { group = "org.jetbrains.androidx.navigation", name = "navigation-compose", version = "2.9.1" }
3232

33-
kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.4" }
34-
logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.17" }
33+
kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.13" }
34+
logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.22" }
3535

3636
kord-gateway = { group = "dev.kord", name = "kord-gateway", version = "0.15.0" }
3737

@@ -41,4 +41,4 @@ jwt = { group = "com.auth0", name = "java-jwt", version = "4.5.0" }
4141
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
4242
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
4343
compose = { id = "org.jetbrains.compose", version.ref = "compose" }
44-
buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.5.1" }
44+
buildconfig = { id = "com.github.gmazzo.buildconfig", version = "6.0.6" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)