Fix Korge version and compiler errors

Hexworks · Jan 20, 2024 · 893f26e · 893f26e
1 parent 3bb51c8
commit 893f26e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/buildSrc/src/main/kotlin/Libraries.kt b/buildSrc/src/main/kotlin/Libraries.kt
@@ -18,7 +18,7 @@ object Libraries {
 
     const val snakeYaml = "org.yaml:snakeyaml:$snakeyamlVersion"
 
-    const val korge = "com.soywiz.korlibs.korge2:korge:$korVersion"
+    const val korge = "com.soywiz.korge:korge:$korVersion"
 
     // TEST
     const val kotlinTestCommon = "org.jetbrains.kotlin:kotlin-test-common"

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -4,7 +4,7 @@ object Versions {
     const val kotlinxCollectionsImmutableVersion = "0.3.4"
 
     const val cobaltVersion = "2023.0.0-RELEASE"
-    const val korVersion = "4.0.7"
+    const val korVersion = "5.3.0"
 
     const val snakeyamlVersion = "1.29"
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,4 +1,4 @@
-pluginManagement { repositories {  mavenLocal(); mavenCentral(); google(); gradlePluginPortal()  }  }
+pluginManagement { repositories { mavenLocal(); mavenCentral(); google(); gradlePluginPortal() } }
 
 rootProject.name = "zircon"
 

diff --git a/.../commonMain/kotlin/org/hexworks/zircon/renderer/korge/tileset/KorgeTrueTypeFontTileset.kt b/.../commonMain/kotlin/org/hexworks/zircon/renderer/korge/tileset/KorgeTrueTypeFontTileset.kt
@@ -104,7 +104,7 @@ class KorgeTrueTypeFontTileset(
             for (n in 0 until 256) {
                 tiles += atlas.add(
                     font.renderGlyphToBitmap(
-                        16f,
+                        16.0,
                         CP437Utils.convertCp437toUnicode(n).code,
                         Colors.WHITE
                     ).bmp.toBMP32()

diff --git a/zircon.examples/src/commonMain/kotlin/Components.kt b/zircon.examples/src/commonMain/kotlin/Components.kt
@@ -2,6 +2,7 @@ import korlibs.io.async.delay
 import korlibs.io.async.launch
 import korlibs.time.seconds
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import org.hexworks.cobalt.databinding.api.extension.toProperty
 import org.hexworks.zircon.api.CP437TilesetResources
 import org.hexworks.zircon.api.ComponentDecorations