Kotlin 1.9.0 and Dokka 1.8.20 updates. #464

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [8, 11]
+        java-version: [8, 11, 17]
 
     steps:
     - name: Repository checkout

CHANGELOG.md

@@ -3,9 +3,11 @@ _See also: [the official libGDX changelog](https://github.com/libgdx/libgdx/blob
 #### 1.12.0-SNAPSHOT
 
 - **[UPDATE]** Updated to libGDX 1.12.0.
-- **[UPDATE]** Updated to Kotlin 1.8.22.
+- **[UPDATE]** Updated to Kotlin 1.9.0.
 - **[UPDATE]** Updated to Kotlin Coroutines 1.7.2.
 - **[UPDATE]** Updated to VisUI 1.5.2.
+- **[UPDATE]** Updated to Dokka 1.8.20.
+- **[MISC]** **KTX** project should now work locally under JDK 17, including the test suite.
 - **[FEATURE]** (`ktx-app`) `KtxInputAdapter` now supports the `touchCancelled` event handling.
 By default, it calls the `touchUp` method for consistency with the previous libGDX versions.
 

README.md

@@ -1,5 +1,5 @@
 [![GitHub Build](https://github.com/libktx/ktx/workflows/build/badge.svg)](https://github.com/libktx/ktx/actions?query=workflow%3Abuild)
-[![Kotlin](https://img.shields.io/badge/kotlin-1.8.22-orange.svg)](http://kotlinlang.org/)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.9.0-orange.svg)](http://kotlinlang.org/)
 [![libGDX](https://img.shields.io/badge/libgdx-1.12.0-red.svg)](https://libgdx.com/)
 [![Maven Central](https://img.shields.io/maven-central/v/io.github.libktx/ktx-async.svg)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.github.libktx%22)
 

actors/src/test/kotlin/ktx/actors/StagesTest.kt

@@ -9,15 +9,15 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.utils.Scaling.stretch
 import com.badlogic.gdx.utils.viewport.ScalingViewport
 import com.badlogic.gdx.utils.viewport.Viewport
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.doAnswer
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertSame
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
 import java.nio.IntBuffer
 
 class StagesTest {

actors/src/test/kotlin/ktx/actors/WidgetsTest.kt

@@ -9,10 +9,10 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label
 import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle
-import com.nhaarman.mockitokotlin2.mock
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.mock
 
 class WidgetsTest {
   @Before

actors/src/test/kotlin/ktx/actors/utils.kt

@@ -3,8 +3,8 @@ package ktx.actors
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.scenes.scene2d.Stage
 import com.badlogic.gdx.utils.viewport.Viewport
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
 
 /** @return [Stage] with mocked viewport and batch. */
 internal fun getMockStage(

app/src/test/kotlin/ktx/app/GraphicsTest.kt

@@ -2,9 +2,9 @@ package ktx.app
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.GL20
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
 import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 
 /**
  * Tests general utilities related to libGDX graphics API.

app/src/test/kotlin/ktx/app/PlatformTest.kt

@@ -4,15 +4,15 @@ import com.badlogic.gdx.Application
 import com.badlogic.gdx.Application.ApplicationType
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.utils.GdxRuntimeException
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
 import io.kotlintest.matchers.shouldThrow
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertSame
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
 
 /**
  * Tests [Platform] utilities.

app/src/test/kotlin/ktx/app/ProfilingTest.kt

@@ -2,11 +2,11 @@ package ktx.app
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.utils.PerformanceCounter
-import com.nhaarman.mockitokotlin2.mock
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.mock
 
 class ProfilingTest {
   @Before

app/src/test/kotlin/ktx/app/gameTest.kt

@@ -4,22 +4,22 @@ import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.Screen
 import com.badlogic.gdx.graphics.GL20
 import com.badlogic.gdx.utils.GdxRuntimeException
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.argThat
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.doThrow
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.never
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
 import org.junit.After
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertSame
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argThat
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.doThrow
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
 
 /**
  * Tests [KtxGame]: KTX equivalent of [com.badlogic.gdx.Game].

assets-async/src/test/kotlin/ktx/assets/async/AssetStorageTest.kt

@@ -26,12 +26,6 @@ import com.badlogic.gdx.utils.GdxRuntimeException
 import com.badlogic.gdx.utils.I18NBundle
 import com.badlogic.gdx.utils.Logger
 import com.google.common.collect.Sets
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.doAnswer
-import com.nhaarman.mockitokotlin2.doThrow
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
 import io.kotlintest.matchers.shouldThrow
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Deferred
@@ -60,6 +54,12 @@ import org.junit.BeforeClass
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestName
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.doThrow
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 import java.lang.Integer.min
 import java.util.IdentityHashMap
 import java.util.concurrent.CompletableFuture
@@ -294,7 +294,7 @@ class AssetStorageTest : AsyncTest() {
     assertEquals("Content.", storage.get<String>(path))
     assertEquals("Content.", storage.getOrNull<String>(path))
     assertEquals("Content.", runBlocking { storage.getAsync<String>(path).await() })
-    assertEquals(emptyList<String>(), storage.getDependencies<String>(path))
+    assertEquals(emptyList<Identifier<*>>(), storage.getDependencies<String>(path))
     assertEquals(storage.getIdentifier<String>(path), storage.getAssetIdentifiers(path).first())
     checkProgress(storage, loaded = 1, warn = true)
   }
@@ -314,7 +314,7 @@ class AssetStorageTest : AsyncTest() {
     assertEquals("Content.", storage[identifier])
     assertEquals("Content.", storage.getOrNull(identifier))
     assertEquals("Content.", runBlocking { storage.getAsync(identifier).await() })
-    assertEquals(emptyList<String>(), storage.getDependencies(identifier))
+    assertEquals(emptyList<Identifier<*>>(), storage.getDependencies(identifier))
     assertEquals(identifier, storage.getAssetIdentifiers(identifier.path).first())
     checkProgress(storage, loaded = 1, warn = true)
   }
@@ -334,7 +334,7 @@ class AssetStorageTest : AsyncTest() {
     assertEquals("Content.", storage[descriptor])
     assertEquals("Content.", storage.getOrNull(descriptor))
     assertEquals("Content.", runBlocking { storage.getAsync(descriptor).await() })
-    assertEquals(emptyList<String>(), storage.getDependencies(descriptor))
+    assertEquals(emptyList<Identifier<*>>(), storage.getDependencies(descriptor))
     assertEquals(descriptor.toIdentifier(), storage.getAssetIdentifiers(descriptor.fileName).first())
     checkProgress(storage, loaded = 1, warn = true)
   }
@@ -608,7 +608,7 @@ class AssetStorageTest : AsyncTest() {
     assertTrue(storage.isLoaded<Pixmap>(path))
     assertEquals(1, storage.getReferenceCount<Texture>(path))
     assertEquals(1, storage.getReferenceCount<Pixmap>(path))
-    assertNotSame(storage.get<Texture>(path), storage.get<Pixmap>(path))
+    assertNotSame(storage.get<Texture>(path), storage.get<Pixmap>(path) as Any)
     assertEquals(
       setOf(storage.getIdentifier<Pixmap>(path), storage.getIdentifier<Texture>(path)),
       storage.getAssetIdentifiers(path).toSet()

assets-async/src/test/kotlin/ktx/assets/async/AsyncAssetManagerTest.kt

@@ -33,7 +33,6 @@ import com.badlogic.gdx.graphics.glutils.ShaderProgram
 import com.badlogic.gdx.scenes.scene2d.ui.Skin
 import com.badlogic.gdx.utils.GdxRuntimeException
 import com.badlogic.gdx.utils.I18NBundle
-import com.nhaarman.mockitokotlin2.mock
 import io.kotlintest.matchers.shouldThrow
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
@@ -51,6 +50,7 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.BeforeClass
 import org.junit.Test
+import org.mockito.kotlin.mock
 import com.badlogic.gdx.graphics.g3d.particles.ParticleEffect as ParticleEffect3D
 import com.badlogic.gdx.graphics.g3d.particles.ParticleEffectLoader as ParticleEffect3dLoader