From e4997681a2d08adc9b9055b0b2a1dc52d54edd47 Mon Sep 17 00:00:00 2001 From: ilotterytea Date: Tue, 21 Jan 2025 20:34:02 +0500 Subject: upd: gdx-websocket dependencies (special fork which supports gwt) --- core/build.gradle | 2 +- .../main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java | 5 +++-- gradle.properties | 3 +-- html/build.gradle | 7 ++++--- lwjgl3/build.gradle | 2 +- shared/build.gradle | 3 ++- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 18766c3..a86da85 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -3,7 +3,7 @@ eclipse.project.name = appName + '-core' dependencies { api "com.github.mgsx-dev.gdx-gltf:gltf:$gdxGltfVersion" - api "com.github.MrStahlfelge.gdx-websockets:core:$gdxWsVersion" + api "com.crashinvaders.lml:gdx-websocket:$gdxWsVersion" api project(':shared') if (enableGraalNative == 'true') { diff --git a/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java b/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java index 0e097a7..c775e57 100644 --- a/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java +++ b/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java @@ -3,6 +3,7 @@ package kz.ilotterytea.frogartha.sessions; import com.github.czyzby.websocket.WebSocket; import com.github.czyzby.websocket.WebSocketListener; import com.github.czyzby.websocket.WebSockets; +import com.github.czyzby.websocket.data.WebSocketCloseCode; import com.github.czyzby.websocket.serialization.impl.ManualSerializer; import kz.ilotterytea.frogartha.FrogarthaConstants; import kz.ilotterytea.frogartha.FrogarthaGame; @@ -38,8 +39,8 @@ public class SessionClient implements WebSocketListener { } @Override - public boolean onClose(WebSocket webSocket, int closeCode, String reason) { - log.log("Connection closed! Reason: {} {}", closeCode, reason); + public boolean onClose(WebSocket webSocket, WebSocketCloseCode code, String reason) { + log.log("Connection closed! Reason: {} {}", code.getCode(), reason); game.getIdentityClient().setAuthorized(false); return true; } diff --git a/gradle.properties b/gradle.properties index 80f67f8..ac7c536 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,6 @@ gwtFrameworkVersion=2.11.0 gwtPluginVersion=1.1.29 enableGraalNative=false gdxVersion=1.13.1 -gdxWsVersion=1.9.10.3 -gdxWsLibVersion=1.9.1.9.6 +gdxWsVersion=1.10.1.12.0 javaWebsocketVersion=1.6.0 projectVersion=1.0.0 diff --git a/html/build.gradle b/html/build.gradle index 89d07bd..aae6549 100644 --- a/html/build.gradle +++ b/html/build.gradle @@ -36,9 +36,10 @@ dependencies { implementation "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources" implementation "com.badlogicgames.gdx:gdx:$gdxVersion:sources" implementation "com.github.mgsx-dev.gdx-gltf:gltf:$gdxGltfVersion:sources" - implementation "com.github.MrStahlfelge.gdx-websockets:core:$gdxWsVersion:sources" - implementation "com.github.MrStahlfelge.gdx-websockets:html:$gdxWsVersion" - implementation "com.github.MrStahlfelge.gdx-websockets:html:$gdxWsVersion:sources" + implementation "com.crashinvaders.lml:gdx-websocket:$gdxWsVersion:sources" + implementation "com.crashinvaders.lml:gdx-websocket-serialization:$gdxWsVersion:sources" + implementation "com.crashinvaders.lml:gdx-websocket-gwt:$gdxWsVersion" + implementation "com.crashinvaders.lml:gdx-websocket-gwt:$gdxWsVersion:sources" implementation project(':core') } diff --git a/lwjgl3/build.gradle b/lwjgl3/build.gradle index ac9b29f..472a8ae 100644 --- a/lwjgl3/build.gradle +++ b/lwjgl3/build.gradle @@ -30,7 +30,7 @@ if (JavaVersion.current().isJava9Compatible()) { dependencies { implementation "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" - implementation "com.github.MrStahlfelge.gdx-websockets:common:$gdxWsVersion" + implementation "com.crashinvaders.lml:gdx-websocket-common:$gdxWsVersion" implementation project(':core') if (enableGraalNative == 'true') { diff --git a/shared/build.gradle b/shared/build.gradle index d2344a1..78a5f8d 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -2,5 +2,6 @@ eclipse.project.name = appName + '-shared' dependencies { api "com.badlogicgames.gdx:gdx:$gdxVersion" - api "com.github.czyzby:gdx-websocket-serialization:$gdxWsLibVersion" + api "com.crashinvaders.lml:gdx-websocket:$gdxWsVersion" + api "com.crashinvaders.lml:gdx-websocket-serialization:$gdxWsVersion" } -- cgit v1.2.3