From 8c7b99a19979e57a0d5f51f39db43a096bfbf7ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 07:54:57 +0000 Subject: [PATCH 01/11] Bump org.jetbrains.kotlin.jvm from 2.0.21 to 2.1.0 Bumps [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) from 2.0.21 to 2.1.0. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1b92b7b..c87d1ef 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id 'org.jetbrains.kotlin.jvm' version '2.0.21' + id 'org.jetbrains.kotlin.jvm' version '2.1.0' id "org.jetbrains.kotlin.kapt" version "2.0.21" id 'com.gradleup.shadow' version '8.3.5' } From e78b092278e270a5dbc519843ffaad1a3ff56e5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 07:56:13 +0000 Subject: [PATCH 02/11] Bump org.jetbrains.kotlin.kapt from 2.0.21 to 2.1.0 Bumps [org.jetbrains.kotlin.kapt](https://github.com/JetBrains/kotlin) from 2.0.21 to 2.1.0. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.kapt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1b92b7b..4537ff0 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { id 'org.jetbrains.kotlin.jvm' version '2.0.21' - id "org.jetbrains.kotlin.kapt" version "2.0.21" + id "org.jetbrains.kotlin.kapt" version "2.1.0" id 'com.gradleup.shadow' version '8.3.5' } From 94dad7b80d93b916e354d8de04f528e4ef8bb2f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 07:40:37 +0000 Subject: [PATCH 03/11] Bump io.lettuce:lettuce-core from 6.5.0.RELEASE to 6.5.1.RELEASE Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.5.0.RELEASE to 6.5.1.RELEASE. - [Release notes](https://github.com/lettuce-io/lettuce-core/releases) - [Changelog](https://github.com/redis/lettuce/blob/main/RELEASE-NOTES.md) - [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.5.0.RELEASE...6.5.1.RELEASE) --- updated-dependencies: - dependency-name: io.lettuce:lettuce-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1b92b7b..bd03ad9 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation 'io.fabric8:kubernetes-client:6.13.4' implementation 'io.fabric8:kubernetes-httpclient-okhttp:6.13.4' implementation 'com.github.fkorotkov:k8s-kotlin-dsl:3.3.0' - implementation 'io.lettuce:lettuce-core:6.5.0.RELEASE' + implementation 'io.lettuce:lettuce-core:6.5.1.RELEASE' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-reactive' // lettuce need this implementation 'one.oktw:galaxy-lib:c328418' } From 77b5f2c299f4996fa1f284fdb0018c375ae60c42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 07:48:44 +0000 Subject: [PATCH 04/11] Bump io.fabric8:kubernetes-httpclient-okhttp from 6.13.4 to 7.0.0 Bumps [io.fabric8:kubernetes-httpclient-okhttp](https://github.com/fabric8io/kubernetes-client) from 6.13.4 to 7.0.0. - [Release notes](https://github.com/fabric8io/kubernetes-client/releases) - [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.13.4...v7.0.0) --- updated-dependencies: - dependency-name: io.fabric8:kubernetes-httpclient-okhttp dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1b92b7b..636e495 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ dependencies { kapt 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT' compileOnly 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT' implementation 'io.fabric8:kubernetes-client:6.13.4' - implementation 'io.fabric8:kubernetes-httpclient-okhttp:6.13.4' + implementation 'io.fabric8:kubernetes-httpclient-okhttp:7.0.0' implementation 'com.github.fkorotkov:k8s-kotlin-dsl:3.3.0' implementation 'io.lettuce:lettuce-core:6.5.0.RELEASE' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-reactive' // lettuce need this From b32df66f566c14fac04fde17a0c34b91d1d20b4f Mon Sep 17 00:00:00 2001 From: jimchen5209 Date: Wed, 4 Dec 2024 21:33:37 +0800 Subject: [PATCH 05/11] build: bump kubernetes client to 7.0.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 466cace..8a82d84 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ repositories { dependencies { kapt 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT' compileOnly 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT' - implementation 'io.fabric8:kubernetes-client:6.13.4' + implementation 'io.fabric8:kubernetes-client:7.0.0' implementation 'io.fabric8:kubernetes-httpclient-okhttp:7.0.0' implementation 'com.github.fkorotkov:k8s-kotlin-dsl:3.3.0' implementation 'io.lettuce:lettuce-core:6.5.1.RELEASE' From 7b64c79e83e30eba746bf7e078a366a1a0d47ca8 Mon Sep 17 00:00:00 2001 From: jimchen5209 Date: Wed, 4 Dec 2024 21:33:51 +0800 Subject: [PATCH 06/11] build: bump galaxy lib to bcf8f61 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8a82d84..5b5dc30 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation 'com.github.fkorotkov:k8s-kotlin-dsl:3.3.0' implementation 'io.lettuce:lettuce-core:6.5.1.RELEASE' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-reactive' // lettuce need this - implementation 'one.oktw:galaxy-lib:c328418' + implementation 'one.oktw:galaxy-lib:bcf8f61' } compileKotlin { From 7bab93959bd2eb9146e6a5b08a97dce59b65d179 Mon Sep 17 00:00:00 2001 From: jimchen5209 Date: Wed, 4 Dec 2024 21:35:30 +0800 Subject: [PATCH 07/11] feat: bump minecraft version 1.21.4 --- Dockerfile | 2 +- .../kotlin/one/oktw/galaxy/proxy/config/model/ProxyConfig.kt | 2 +- src/main/resources/config/proxy.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47b3fbd..dd1ec02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /app COPY --chown=1000 --link docker /app # Download Velocity -ADD --chown=1000 --checksum=sha256:845cb2c1891544ad9e432883d7ddf059284d9d178b97be4977e5f805746c9edd --link https://api.papermc.io/v2/projects/velocity/versions/3.4.0-SNAPSHOT/builds/450/downloads/velocity-3.4.0-SNAPSHOT-450.jar /app/velocity.jar +ADD --chown=1000 --checksum=sha256:bb54dcd34751bf8e345d0a39199eb985d64d07f8626810ed7b0e058f47d595c0 --link https://api.papermc.io/v2/projects/velocity/versions/3.4.0-SNAPSHOT/builds/453/downloads/velocity-3.4.0-SNAPSHOT-453.jar /app/velocity.jar # Run Server EXPOSE 25565 diff --git a/src/main/kotlin/one/oktw/galaxy/proxy/config/model/ProxyConfig.kt b/src/main/kotlin/one/oktw/galaxy/proxy/config/model/ProxyConfig.kt index e7c13a6..2fc74cc 100644 --- a/src/main/kotlin/one/oktw/galaxy/proxy/config/model/ProxyConfig.kt +++ b/src/main/kotlin/one/oktw/galaxy/proxy/config/model/ProxyConfig.kt @@ -1,5 +1,5 @@ package one.oktw.galaxy.proxy.config.model data class ProxyConfig( - val ProtocolVersion: Int = 768 // default Minecraft 1.21.3 + val ProtocolVersion: Int = 769 // default Minecraft 1.21.4 ) diff --git a/src/main/resources/config/proxy.json b/src/main/resources/config/proxy.json index 35c63c2..a493bf9 100644 --- a/src/main/resources/config/proxy.json +++ b/src/main/resources/config/proxy.json @@ -1,3 +1,3 @@ { - "ProtocolVersion": 768 + "ProtocolVersion": 769 } From a01484db1d5b662964e35fc86ee71f98627e146c Mon Sep 17 00:00:00 2001 From: jimchen5209 Date: Wed, 4 Dec 2024 21:49:56 +0800 Subject: [PATCH 08/11] build: bump gradle to 8.11.1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 97d1cd95d9f4785cc53de872fbbee2b39e5dd65e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 07:27:38 +0000 Subject: [PATCH 09/11] Bump io.fabric8:kubernetes-httpclient-okhttp from 6.13.4 to 7.0.1 Bumps [io.fabric8:kubernetes-httpclient-okhttp](https://github.com/fabric8io/kubernetes-client) from 6.13.4 to 7.0.1. - [Release notes](https://github.com/fabric8io/kubernetes-client/releases) - [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.13.4...v7.0.1) --- updated-dependencies: - dependency-name: io.fabric8:kubernetes-httpclient-okhttp dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1b92b7b..bec4ed4 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ dependencies { kapt 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT' compileOnly 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT' implementation 'io.fabric8:kubernetes-client:6.13.4' - implementation 'io.fabric8:kubernetes-httpclient-okhttp:6.13.4' + implementation 'io.fabric8:kubernetes-httpclient-okhttp:7.0.1' implementation 'com.github.fkorotkov:k8s-kotlin-dsl:3.3.0' implementation 'io.lettuce:lettuce-core:6.5.0.RELEASE' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-reactive' // lettuce need this From 7e1f186917c9bb4918d98915c5ad5a1736553525 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 07:27:42 +0000 Subject: [PATCH 10/11] Bump io.fabric8:kubernetes-client from 6.13.4 to 7.0.1 Bumps [io.fabric8:kubernetes-client](https://github.com/fabric8io/kubernetes-client) from 6.13.4 to 7.0.1. - [Release notes](https://github.com/fabric8io/kubernetes-client/releases) - [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.13.4...v7.0.1) --- updated-dependencies: - dependency-name: io.fabric8:kubernetes-client dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1b92b7b..6220b4d 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ repositories { dependencies { kapt 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT' compileOnly 'com.velocitypowered:velocity-api:3.4.0-SNAPSHOT' - implementation 'io.fabric8:kubernetes-client:6.13.4' + implementation 'io.fabric8:kubernetes-client:7.0.1' implementation 'io.fabric8:kubernetes-httpclient-okhttp:6.13.4' implementation 'com.github.fkorotkov:k8s-kotlin-dsl:3.3.0' implementation 'io.lettuce:lettuce-core:6.5.0.RELEASE' From 0b5ad85bb04cadf1254850467d72458e9ba5e9ec Mon Sep 17 00:00:00 2001 From: jimchen5209 Date: Wed, 25 Dec 2024 20:35:12 +0800 Subject: [PATCH 11/11] build: update velocity --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dd1ec02..e868307 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /app COPY --chown=1000 --link docker /app # Download Velocity -ADD --chown=1000 --checksum=sha256:bb54dcd34751bf8e345d0a39199eb985d64d07f8626810ed7b0e058f47d595c0 --link https://api.papermc.io/v2/projects/velocity/versions/3.4.0-SNAPSHOT/builds/453/downloads/velocity-3.4.0-SNAPSHOT-453.jar /app/velocity.jar +ADD --chown=1000 --checksum=sha256:0ed9a02dcb102b3a665ce9615691df32e919a0e7e986d86e932d52adf1bd3119 --link https://api.papermc.io/v2/projects/velocity/versions/3.4.0-SNAPSHOT/builds/458/downloads/velocity-3.4.0-SNAPSHOT-458.jar /app/velocity.jar # Run Server EXPOSE 25565