From 78fb7af2723e007220b4b286b8fcb5e46d86e9d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 May 2026 17:32:25 +0000
Subject: [PATCH 1/2] chore(deps): bump kotlin from 2.2.20 to 2.3.21

Bumps `kotlin` from 2.2.20 to 2.3.21.

Updates `org.jetbrains.kotlin:kotlin-gradle-plugin` from 2.2.20 to 2.3.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.2.20...v2.3.21)

Updates `org.jetbrains.kotlin:compose-compiler-gradle-plugin` from 2.2.20 to 2.3.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.2.20...v2.3.21)

Updates `org.jetbrains.kotlin.android` from 2.2.20 to 2.3.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.2.20...v2.3.21)

Updates `org.jetbrains.kotlin.multiplatform` from 2.2.20 to 2.3.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.2.20...v2.3.21)

Updates `org.jetbrains.kotlin.plugin.compose` from 2.2.20 to 2.3.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.2.20...v2.3.21)

Updates `org.jetbrains.kotlin.plugin.serialization` from 2.2.20 to 2.3.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.2.20...v2.3.21)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-version: 2.3.21
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jetbrains.kotlin:compose-compiler-gradle-plugin
  dependency-version: 2.3.21
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jetbrains.kotlin.android
  dependency-version: 2.3.21
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jetbrains.kotlin.multiplatform
  dependency-version: 2.3.21
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jetbrains.kotlin.plugin.compose
  dependency-version: 2.3.21
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jetbrains.kotlin.plugin.serialization
  dependency-version: 2.3.21
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0a2f5b1..c75e27e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 agp = "8.13.2"
-kotlin = "2.2.20"
+kotlin = "2.3.21"
 composeMultiplatform = "1.10.1"
 kotlinxSerialization = "1.8.1"
 kotlinxCoroutines = "1.9.0"

From 9f27425eba662b640fc1fd723107b60c93022738 Mon Sep 17 00:00:00 2001
From: Matt Mckenna <mmckenna@pm.me>
Date: Sat, 6 Jun 2026 11:13:11 -0400
Subject: [PATCH 2/2] Migrate Android Kotlin compiler options

---
 halogen-provider-nano/build.gradle.kts |  8 +++++---
 sample/build.gradle.kts                | 12 ++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/halogen-provider-nano/build.gradle.kts b/halogen-provider-nano/build.gradle.kts
index b18a73e..514b587 100644
--- a/halogen-provider-nano/build.gradle.kts
+++ b/halogen-provider-nano/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -7,6 +9,9 @@ plugins {
 
 kotlin {
     explicitApi()
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
 }
 
 android {
@@ -20,9 +25,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
 }
 
 dependencies {
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index bead007..a6498d7 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -1,9 +1,17 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 android {
     namespace = "me.mmckenna.halogen.sample"
     compileSdk = 36
@@ -38,10 +46,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
     buildFeatures {
         compose = true
         buildConfig = true