Update to KorGE 6.0.0

Author: soywiz

.github/workflows/gradle.yml

@@ -23,10 +23,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '21'
         distribution: 'temurin'
     - name: Build & Test with Gradle
       uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1

.gitignore

@@ -1,5 +1,6 @@
 /.gradle
 /.idea
+/.kotlin
 /build
 /deps
 /modules

build.gradle.kts

@@ -18,11 +18,15 @@ korge {
 
     targetJvm()
     targetJs()
-    targetIos()
-    targetAndroidDirect()
+    //targetIos()
+    targetAndroid()
     serializationJson()
 }
 
+kotlin {
+    jvmToolchain(21)
+}
+
 dependencies {
     add("commonMainApi", project(":deps"))
 }

gradle.properties

@@ -1,3 +1,3 @@
 [plugins]
-korge = { id = "com.soywiz.korge", version = "5.3.2" }
+korge = { id = "com.soywiz.korge", version = "6.0.0" }
 #korge = { id = "com.soywiz.korge", version = "999.0.0.999" }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -5,8 +5,9 @@ package korlibs.korge3d.tween
 import korlibs.korge.tween.get
 import korlibs.korge.tween.tween
 import korlibs.korge3d.View3D
-import korlibs.math.interpolation.Easing
+import korlibs.math.interpolation.*
 import korlibs.time.*
+import kotlin.time.*
 
 @PublishedApi
 internal val DEFAULT_EASING = Easing.EASE_IN_OUT_QUAD
@@ -20,9 +21,9 @@ internal val DEFAULT_TIME = 1.seconds
 //suspend fun View3D.hide(time: TimeSpan = DEFAULT_TIME, easing: Easing = DEFAULT_EASING) =
 //	tween(this::alpha[0.0], time = time, easing = easing)
 
-suspend inline fun View3D.moveTo(x: Float, y: Float, z: Float, time: TimeSpan = DEFAULT_TIME, easing: Easing = DEFAULT_EASING) = tween(this::x[x], this::y[y], this::z[z], time = time, easing = easing)
-suspend inline fun View3D.moveBy(dx: Float, dy: Float, dz: Float, time: TimeSpan = DEFAULT_TIME, easing: Easing = DEFAULT_EASING) = tween(this::x[this.x + dx], this::y[this.y + dy], this::z[this.z + dz], time = time, easing = easing)
-suspend inline fun View3D.scaleTo(sx: Float, sy: Float, sz: Float, time: TimeSpan = DEFAULT_TIME, easing: Easing = DEFAULT_EASING) = tween(this::scaleX[sx], this::scaleY[sy], this::scaleZ[sz], time = time, easing = easing)
+suspend inline fun View3D.moveTo(x: Float, y: Float, z: Float, time: Duration = DEFAULT_TIME, easing: Easing = DEFAULT_EASING) = tween(this::x[x], this::y[y], this::z[z], time = time, easing = easing)
+suspend inline fun View3D.moveBy(dx: Float, dy: Float, dz: Float, time: Duration = DEFAULT_TIME, easing: Easing = DEFAULT_EASING) = tween(this::x[this.x + dx], this::y[this.y + dy], this::z[this.z + dz], time = time, easing = easing)
+suspend inline fun View3D.scaleTo(sx: Float, sy: Float, sz: Float, time: Duration = DEFAULT_TIME, easing: Easing = DEFAULT_EASING) = tween(this::scaleX[sx], this::scaleY[sy], this::scaleZ[sz], time = time, easing = easing)
 
 //suspend inline fun View3D.rotateTo(deg: Angle, time: TimeSpan = DEFAULT_TIME, easing: Easing = DEFAULT_EASING) =
 //	tween(this::rotationRadians[deg.radians], time = time, easing = easing)