Update to the latest Kotlin 1 release. #488

libktx · Aug 25, 2024 · bacbc0a · bacbc0a
1 parent 605ba80
commit bacbc0a
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [8, 11, 17]
+        java-version: [11, 17]
 
     steps:
     - name: Repository checkout

diff --git a/.github/workflows/upload-snapshot.yml b/.github/workflows/upload-snapshot.yml
@@ -14,7 +14,7 @@ jobs:
       - name: JDK setup
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: temurin
       - name: Gradle setup
         uses: gradle/gradle-build-action@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,11 @@ _See also: [the official libGDX changelog](https://github.com/libgdx/libgdx/blob
 
 #### 1.12.1-SNAPSHOT
 
-- **[UPDATE]** Updated to Kotlin 1.9.22.
-- **[UPDATE]** Updated to Gradle 7.6.3.
+- **[UPDATE]** Updated to Kotlin 1.9.25.
+- **[UPDATE]** Updated to Kotlin Coroutines 1.8.1.
+- **[UPDATE]** Updated to Gradle 7.6.4.
+- **[UPDATE]** Updated to Dokka 1.9.20.
+- **[MISC]** JDK 11 or newer is now required to build the KTX project.
 - **[CHANGE]** (`ktx-assets`) The `pool` factory method now attempts to reset `Poolable` objects with the default `discard` lambda
   to match the default libGDX pool behavior. Pass a custom function to override it.
 - **[FEATURE]** (`ktx-math`) Added component deconstructing operators for 2D shapes:

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.9.22-orange.svg)](http://kotlinlang.org/)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.9.25-orange.svg)](http://kotlinlang.org/)
 [![libGDX](https://img.shields.io/badge/libgdx-1.12.1-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/async/README.md b/async/README.md
@@ -1,4 +1,4 @@
-[![Kotlin Coroutines](https://img.shields.io/badge/kotlin--coroutines-1.7.3-orange.svg)](http://kotlinlang.org/)
+[![Kotlin Coroutines](https://img.shields.io/badge/kotlin--coroutines-1.8.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/build.gradle.kts b/build.gradle.kts
@@ -81,6 +81,8 @@ subprojects {
       freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
     }
   }
+  val compileTestKotlin: KotlinCompile by tasks
+  compileTestKotlin.kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
 
   dependencies {
     val kotlinVersion: String by project

diff --git 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.12.1"
-const val kotlinCoroutinesVersion = "1.7.3"
+const val kotlinCoroutinesVersion = "1.8.1"
 
 const val artemisOdbVersion = "2.3.0"
 const val ashleyVersion = "1.7.4"
@@ -10,9 +10,9 @@ const val visUiVersion = "1.5.3"
 
 const val spekVersion = "1.1.5"
 const val kotlinTestVersion = "2.0.7"
-const val kotlinMockitoVersion = "4.1.0"
-const val assertjVersion = "3.11.1"
-const val junitVersion = "4.12"
-const val slf4jVersion = "1.7.26"
-const val wireMockVersion = "2.24.0"
+const val kotlinMockitoVersion = "5.4.0"
+const val assertjVersion = "3.26.3"
+const val junitVersion = "4.13.2"
+const val slf4jVersion = "1.7.36"
+const val wireMockVersion = "2.27.2"
 const val ktlintVersion = "0.50.0"
diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 libGroup=io.github.libktx
 
-kotlinVersion=1.9.22
+kotlinVersion=1.9.25
 
-dokkaVersion=1.9.10
+dokkaVersion=1.9.20
 junitPlatformVersion=1.2.0
 configurationsPluginVersion=3.0.3
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists