diff --git a/CHANGELOG.md b/CHANGELOG.md index c0f92b5e..7e570f5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ _See also: [the official libGDX changelog](https://github.com/libgdx/libgdx/blob #### 1.10.0-SNAPSHOT +- **[UPDATE]** Updated to Kotlin 1.6.21. +- **[UPDATE]** Updated to Kotlin Coroutines 1.6.1. - **[FEATURE]** (`ktx-ashley`) Added utilities for working with Ashley's `EntityListener` interface: - `EntityAdditionListener`: an interface extending `EntityListener` that only requires implementation of the `entityAdded` method. - `EntityRemovalListener`: an interface extending `EntityListener` that only requires implementation of the `entityRemoved` method. diff --git a/README.md b/README.md index 0654ddcd..50d8f41c 100644 --- 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.6.10-orange.svg)](http://kotlinlang.org/) +[![Kotlin](https://img.shields.io/badge/kotlin-1.6.21-orange.svg)](http://kotlinlang.org/) [![libGDX](https://img.shields.io/badge/libgdx-1.10.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) diff --git a/assets-async/src/main/kotlin/ktx/assets/async/storage.kt b/assets-async/src/main/kotlin/ktx/assets/async/storage.kt index bea6b34c..1d66c456 100644 --- a/assets-async/src/main/kotlin/ktx/assets/async/storage.kt +++ b/assets-async/src/main/kotlin/ktx/assets/async/storage.kt @@ -279,6 +279,7 @@ class AssetStorage( * * See also [get] and [getAsync]. */ + @OptIn(ExperimentalCoroutinesApi::class) fun getOrNull(identifier: Identifier): T? { val asset = assets[identifier] @Suppress("UNCHECKED_CAST", "EXPERIMENTAL_API_USAGE") // Avoids runBlocking call. diff --git a/async/README.md b/async/README.md index 511ccd41..fd3bc37d 100644 --- a/async/README.md +++ b/async/README.md @@ -1,4 +1,4 @@ -[![Kotlin Coroutines](https://img.shields.io/badge/kotlin--coroutines-1.6.0-orange.svg)](http://kotlinlang.org/) +[![Kotlin Coroutines](https://img.shields.io/badge/kotlin--coroutines-1.6.1-orange.svg)](http://kotlinlang.org/) [![Maven Central](https://img.shields.io/maven-central/v/io.github.libktx/ktx-async.svg)](https://search.maven.org/artifact/io.github.libktx/ktx-async) # KTX: Coroutines support and parallelization utilities diff --git a/async/src/main/kotlin/ktx/async/http.kt b/async/src/main/kotlin/ktx/async/http.kt index 14f5d772..d1446c5d 100644 --- a/async/src/main/kotlin/ktx/async/http.kt +++ b/async/src/main/kotlin/ktx/async/http.kt @@ -96,7 +96,7 @@ class HttpRequestResult( override fun toString() = "HttpRequestResult(url=$url, method=$method, status=$statusCode)" override fun equals(other: Any?) = when (other) { null -> false - other === this -> true + (other === this) -> true is HttpRequestResult -> url == other.url && method == other.method && diff --git a/build.gradle.kts b/build.gradle.kts index 9819fee1..a4a0c3cf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -83,7 +83,7 @@ subprojects { tasks.withType { kotlinOptions { jvmTarget = "1.8" - freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" + freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" } } diff --git a/buildSrc/src/main/kotlin/ktx/Versions.kt b/buildSrc/src/main/kotlin/ktx/Versions.kt index a237c453..ad77249c 100644 --- a/buildSrc/src/main/kotlin/ktx/Versions.kt +++ b/buildSrc/src/main/kotlin/ktx/Versions.kt @@ -1,7 +1,7 @@ package ktx const val gdxVersion = "1.10.0" -const val kotlinCoroutinesVersion = "1.6.0" +const val kotlinCoroutinesVersion = "1.6.1" const val ashleyVersion = "1.7.4" const val visUiVersion = "1.5.0" diff --git a/gradle.properties b/gradle.properties index b19a63ac..373281a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ libGroup=io.github.libktx -kotlinVersion=1.6.10 +kotlinVersion=1.6.21 dokkaVersion=1.5.30 junitPlatformVersion=1.2.0