KTX 1.11.0-rc5 release. #454

libktx · Feb 24, 2023 · 203c7b0 · 203c7b0
2 parents 250e1b5 + 2632b70
commit 203c7b0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 _See also: [the official libGDX changelog](https://github.com/libgdx/libgdx/blob/master/CHANGES)._
 
+#### 1.11.0-rc5
+
+- **[UPDATE]** Updated to Kotlin 1.8.10.
+- **[FIX]** (`ktx-assets-async`) `AssetStorage` no longer uses `ConcurrentHashMap.getOrDefault` method unsupported on older Android devices.
+
 #### 1.11.0-rc4
 
 - **[UPDATE]** Updated to Kotlin 1.8.0.

diff --git a/README.md b/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.0-orange.svg)](http://kotlinlang.org/)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.8.10-orange.svg)](http://kotlinlang.org/)
 [![libGDX](https://img.shields.io/badge/libgdx-1.11.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)
 
@@ -220,7 +220,7 @@ with the `ktx-app` identifier would require the following changes in your `build
 // Groovy DSL:
 ext {
   // Update this version to match the latest KTX release:
-  ktxVersion = '1.11.0-rc4'
+  ktxVersion = '1.11.0-rc5'
 }
 
 dependencies {
@@ -234,7 +234,7 @@ dependencies {
 
 ```kotlin
 // Update this version to match the latest KTX release:
-val ktxVersion = "1.11.0-rc4"
+val ktxVersion = "1.11.0-rc5"
 
 dependencies {
   api(group = "io.github.libktx", name = "ktx-app", version = ktxVersion)

diff --git a/assets-async/src/main/kotlin/ktx/assets/async/storage.kt b/assets-async/src/main/kotlin/ktx/assets/async/storage.kt
@@ -1209,14 +1209,14 @@ class AssetStorage(
   /** Must be called with [lock]. Adds [identifier] to [pathToIdentifiers]. */
   private fun registerAssetPath(identifier: Identifier<*>) {
     val path = identifier.path
-    val identifiers = pathToIdentifiers.getOrDefault(path, emptyList())
+    val identifiers = getAssetIdentifiers(path)
     pathToIdentifiers[path] = identifiers + listOf(identifier)
   }
 
   /** Must be called with [lock]. Removes [identifier] from [pathToIdentifiers]. */
   private fun unregisterAssetPath(identifier: Identifier<*>) {
     val path = identifier.path
-    val identifiers = pathToIdentifiers.getOrDefault(path, emptyList())
+    val identifiers = getAssetIdentifiers(path)
     pathToIdentifiers[path] = identifiers.filterNot { it == identifier }
   }
 
@@ -1225,7 +1225,7 @@ class AssetStorage(
    * Do not attempt to modify the returned list. Changing the list might have an unpredictable effect
    * on the asset loaders.
    */
-  fun getAssetIdentifiers(path: String): List<Identifier<*>> = pathToIdentifiers.getOrDefault(path, emptyList())
+  fun getAssetIdentifiers(path: String): List<Identifier<*>> = pathToIdentifiers[path] ?: emptyList()
 
   /**
    * Creates a deep copy of the internal asset storage. Returns an [AssetStorageSnapshot]

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 libGroup=io.github.libktx
 
-kotlinVersion=1.8.0
+kotlinVersion=1.8.10
 
 dokkaVersion=1.7.20
 junitPlatformVersion=1.2.0

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.11.0-rc4
+1.11.0-rc5