From 2c7b68e21ea8f8d0964631a4d995ebe916077603 Mon Sep 17 00:00:00 2001
From: Edison Jwa <me@edison.network>
Date: Fri, 5 Jun 2026 20:54:51 +0900
Subject: [PATCH] chore(android): upgrade toolchain to AGP 8.13.1 / Kotlin
 2.3.0 (#23)

Bump Android Gradle Plugin from 8.11.1 to 8.13.1 and Kotlin from
2.2.20 to 2.3.0 to align with newer plugin version requirements.

Kotlin 2.3.0 removed the kotlinOptions DSL free-string assignment.
Migrate to the compilerOptions DSL for JVM target configuration.

Gradle wrapper remains at 8.14 (compatible with AGP 8.13.1).
---
 apps/chanora_flutter/android/app/build.gradle.kts | 6 ++++--
 apps/chanora_flutter/android/settings.gradle.kts  | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/chanora_flutter/android/app/build.gradle.kts b/apps/chanora_flutter/android/app/build.gradle.kts
index 3700d44..5f0fb16 100644
--- a/apps/chanora_flutter/android/app/build.gradle.kts
+++ b/apps/chanora_flutter/android/app/build.gradle.kts
@@ -63,8 +63,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     defaultConfig {
diff --git a/apps/chanora_flutter/android/settings.gradle.kts b/apps/chanora_flutter/android/settings.gradle.kts
index ca7fe06..6324377 100644
--- a/apps/chanora_flutter/android/settings.gradle.kts
+++ b/apps/chanora_flutter/android/settings.gradle.kts
@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.11.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("com.android.application") version "8.13.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
 }
 
 include(":app")