From 115499753177f92f47efab02600a5abdc8bc214f Mon Sep 17 00:00:00 2001
From: checkedear <271323618+checkedear@users.noreply.github.com>
Date: Mon, 8 Jun 2026 20:55:55 +0200
Subject: [PATCH] fix: gradle build

---
 firka/android/app/build.gradle.kts                 | 14 ++++++++------
 firka/android/build.gradle.kts                     |  2 +-
 firka/android/gradle.properties                    |  4 ++++
 .../gradle/wrapper/gradle-wrapper.properties       |  2 +-
 firka/android/settings.gradle.kts                  |  6 +++---
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/firka/android/app/build.gradle.kts b/firka/android/app/build.gradle.kts
index 6d79275..b011564 100644
--- a/firka/android/app/build.gradle.kts
+++ b/firka/android/app/build.gradle.kts
@@ -3,7 +3,6 @@ import java.util.Properties
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("org.jetbrains.kotlin.plugin.compose")
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id("dev.flutter.flutter-gradle-plugin")
@@ -23,10 +22,6 @@ android {
         compose = true
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
     defaultConfig {
         applicationId = "app.firka.naplo"
         // You can update the following values to match your application needs.
@@ -74,6 +69,13 @@ android {
         }
     }
 }
+
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
+}
+
 dependencies {
     implementation("androidx.glance:glance-appwidget:1.1.1")
     implementation("com.google.android.gms:play-services-wearable:18.1.0")
@@ -96,4 +98,4 @@ tasks.matching { it.name.startsWith("compileFlutterBuild") }.configureEach {
 
 flutter {
     source = "../.."
-}
\ No newline at end of file
+}
diff --git a/firka/android/build.gradle.kts b/firka/android/build.gradle.kts
index 1134383..7214646 100644
--- a/firka/android/build.gradle.kts
+++ b/firka/android/build.gradle.kts
@@ -22,7 +22,7 @@ subprojects {
         if (plugins.hasPlugin("com.android.application") || plugins.hasPlugin("com.android.library")) {
             val androidExtension = extensions.getByName("android") as BaseExtension
             androidExtension.apply {
-                compileSdkVersion(36)
+                compileSdkVersion(37)
                 buildToolsVersion = "36.1.0"
             }
         }
diff --git a/firka/android/gradle.properties b/firka/android/gradle.properties
index 9468f57..5126356 100644
--- a/firka/android/gradle.properties
+++ b/firka/android/gradle.properties
@@ -11,3 +11,7 @@ org.gradle.parallel=true
 org.gradle.daemon=true
 # Better Kotlin incremental compilation (warm builds)
 kotlin.incremental.useClasspathSnapshot=true
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+
+android.newDsl=false
diff --git a/firka/android/gradle/wrapper/gradle-wrapper.properties b/firka/android/gradle/wrapper/gradle-wrapper.properties
index e4ef43f..2f745f9 100644
--- a/firka/android/gradle/wrapper/gradle-wrapper.properties
+++ b/firka/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
diff --git a/firka/android/settings.gradle.kts b/firka/android/settings.gradle.kts
index e841be4..a1152aa 100644
--- a/firka/android/settings.gradle.kts
+++ b/firka/android/settings.gradle.kts
@@ -18,9 +18,9 @@ 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.1.0" apply false
-    id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false
+    id("com.android.application") version "9.2.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.3.10" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.3.10" apply false
 }
 
 include(":app")