Fix GWT inherits for WebSocket, WSS.

libgdx · Apr 12, 2024 · c4f5659 · c4f5659
1 parent 529e54f
commit c4f5659
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
   }
 }
 
-version = "1.12.1.7"
+version = "1.12.1.8-SNAPSHOT"
 mainClassName = 'gdx.liftoff.MainKt'
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 java.targetCompatibility = JavaVersion.VERSION_1_8

diff --git a/src/main/kotlin/gdx/liftoff/config/Configuration.kt b/src/main/kotlin/gdx/liftoff/config/Configuration.kt
@@ -39,7 +39,7 @@ import gdx.liftoff.views.widgets.ScrollableTextArea
 @Suppress("unused") // Fields accessed via reflection.
 class Configuration {
   companion object {
-    const val VERSION = "1.12.1.7"
+    const val VERSION = "1.12.1.8-SNAPSHOT"
     const val WIDTH = 600
     const val HEIGHT = 700
     const val PREFERENCES_PATH = "gdx-liftoff-prefs"

diff --git a/src/main/kotlin/gdx/liftoff/data/files/ProjectFiles.kt b/src/main/kotlin/gdx/liftoff/data/files/ProjectFiles.kt
@@ -5,7 +5,6 @@ import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.files.FileHandle
 import com.badlogic.gdx.graphics.Pixmap
 import com.badlogic.gdx.graphics.PixmapIO
-import com.badlogic.gdx.graphics.PixmapIO.PNG
 import com.github.czyzby.kiwi.util.common.Strings
 import gdx.liftoff.data.platforms.Platform
 import java.io.File
@@ -173,4 +172,3 @@ class GeneratedImageFile private constructor(override val path: String, val cont
     PixmapIO.writePNG(destination.child(path), content, 4, false)
   }
 }
-
diff --git a/src/main/kotlin/gdx/liftoff/data/libraries/unofficial/Lml.kt b/src/main/kotlin/gdx/liftoff/data/libraries/unofficial/Lml.kt
@@ -179,8 +179,9 @@ class WebSocket : WebSocketExtension() {
 
     addDependency(project, GWT.ID, "$group.gdx-websockets:core:sources")
     addDependency(project, GWT.ID, "$group.gdx-websockets:html:sources")
-    addGwtInherit(project, "com.github.czyzby.gdx-websockets.websocket.GdxWebSocket")
-    addGwtInherit(project, "com.github.czyzby.gdx-websockets.websocket.GdxWebSocketGwt")
+
+    addGwtInherit(project, "com.github.czyzby.websocket.GdxWebSocket")
+    addGwtInherit(project, "com.github.czyzby.websocket.GdxWebSocketGwt")
   }
 }
 
@@ -199,8 +200,7 @@ class WebSocketSerialization : WebSocketExtension() {
     addDependency(project, Server.ID, "$group.gdx-websockets:serialization")
 
     addDependency(project, GWT.ID, "$group.gdx-websockets:serialization:sources")
-    addGwtInherit(project, "com.github.czyzby.websocket.GdxWebSocket")
-    addGwtInherit(project, "com.github.czyzby.websocket.GdxWebSocketGwt")
+    addGwtInherit(project, "com.github.czyzby.websocket.GdxWebSocketSerialization")
 
     WebSocket().initiate(project)
   }