Merge pull request #59 from saschpe/saschpe.updates

Updates!

.github/workflows/main.yml

@@ -10,23 +10,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Run Spotless
         run: ./gradlew spotlessCheck
 
   build:
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Build with Gradle
         run: ./gradlew build
       - name: Archive build artifacts
@@ -54,11 +54,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: refs/heads/main
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Download build artifacts
         uses: actions/download-artifact@v4
         with:

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- Dependency updates:
+  - [kotlinx-io 0.5.3](https://github.com/Kotlin/kotlinx-io/releases/tag/0.5.3)
+  - [kotlin-wrappers pre.805](https://github.com/JetBrains/kotlin-wrappers/releases/tag/pre.805)
+  - [androidx-activity-compose 1.9.2](https://developer.android.com/jetpack/androidx/releases/activity#1.9.2)
+  - [Kotlin 2.0.20](https://github.com/JetBrains/kotlin/releases/tag/v2.0.20)
 
 ## [1.3.4] - 2024-08-09
 - Dependency updates:

build.gradle.kts

@@ -14,10 +14,10 @@ spotless {
     }
     kotlin {
         target("**/*.kt")
-        ktlint("1.3.1").setEditorConfigPath("${project.rootDir}/.editorconfig")
+        ktlint(libs.versions.ktlint.get()).setEditorConfigPath("${project.rootDir}/.editorconfig")
     }
     kotlinGradle {
-        ktlint("1.3.1").setEditorConfigPath("${project.rootDir}/.editorconfig")
+        ktlint(libs.versions.ktlint.get()).setEditorConfigPath("${project.rootDir}/.editorconfig")
     }
 }
 

demo/compose/build.gradle.kts

@@ -81,22 +81,20 @@ android {
         }
     }
     buildTypes {
-        getByName("release") {
+        release {
             isMinifyEnabled = false
         }
     }
     buildFeatures {
         compose = true
     }
-    compileOptions {
-        sourceCompatibility(libs.versions.java.get())
-        targetCompatibility(libs.versions.java.get())
-    }
     dependencies {
         debugImplementation(compose.uiTooling)
     }
 }
 
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get()))
+
 compose.desktop {
     application {
         mainClass = "MainKt"

gradle/libs.versions.toml

@@ -3,18 +3,19 @@ android-compileSdk = "34"
 android-minSdk = "21"
 android-targetSdk = "34"
 compose = "1.6.11"
-log4k-demo = "1.0.0"
 gradle-android = "8.5.2"
 jacoco = "0.8.11"
-java = "17"
-kotlin = "2.0.10"
+java = "21"
+kotlin = "2.0.20"
+ktlint = "1.3.1"
+log4k-demo = "1.0.0"
 mockk = "1.13.12"
 
 [libraries]
-androidx-activity-compose = "androidx.activity:activity-compose:1.9.1"
-kotlin-wrappers = "org.jetbrains.kotlin-wrappers:kotlin-node:20.14.10-pre.788"
-kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.0"
-kotlinx-io = "org.jetbrains.kotlinx:kotlinx-io-core:0.5.1"
+androidx-activity-compose = "androidx.activity:activity-compose:1.9.2"
+kotlin-wrappers = "org.jetbrains.kotlin-wrappers:kotlin-node:22.5.4-pre.805"
+kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.1"
+kotlinx-io = "org.jetbrains.kotlinx:kotlinx-io-core:0.5.3"
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }
 slf4j-api = "org.slf4j:slf4j-api:1.7.36"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME