From b6bcd236678fddc3f20b70a068553e89af52fda6 Mon Sep 17 00:00:00 2001
From: Doug Borg <dougborg@dougborg.org>
Date: Mon, 9 Feb 2026 21:52:21 -0700
Subject: [PATCH] chore(android): bump Dart SDK floor, desugar_jdk_libs, and
 fix Kotlin DSL deprecation

- Bump Dart SDK constraint from >=3.8.0 to >=3.10.3 to match resolved dependency floor
- Upgrade desugar_jdk_libs from 2.0.4 to 2.1.5 (adds Stream.toList(), better locale support)
- Migrate deprecated kotlinOptions { jvmTarget } to kotlin { compilerOptions { jvmTarget } }
- Remove stale comments and non-breaking space characters

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 android/app/build.gradle.kts | 14 ++++++--------
 pubspec.lock                 |  2 +-
 pubspec.yaml                 |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index b7f63de..a700f92 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -17,7 +17,6 @@ if (keystorePropertiesFile.exists()) {
 android {
     namespace = "me.deflock.deflockapp"
 
-    // Matches current stable Flutter (compileSdk 34 as of July 2025)
     compileSdk = 36
 
     // NDK only needed if you build native plugins; keep your pinned version
@@ -28,17 +27,17 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
         isCoreLibraryDesugaringEnabled = true
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    kotlin {
+        compilerOptions {
+            jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+        }
     }
 
     defaultConfig {
         // Application ID (package name)
         applicationId = "me.deflock.deflockapp"
 
-        // ────────────────────────────────────────────────────────────
-        // oauth2_client 4.x & flutter_web_auth_2 5.x require minSdk 23
-        // ────────────────────────────────────────────────────────────
+        // oauth2_client 4.x & flutter_web_auth_2 5.x require minSdk 23
         minSdk = maxOf(flutter.minSdkVersion, 23)
         targetSdk = 36
 
@@ -76,6 +75,5 @@ flutter {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
 }
-
diff --git a/pubspec.lock b/pubspec.lock
index a337d12..64a68bb 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1079,4 +1079,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.10.0 <4.0.0"
-  flutter: ">=3.38.0"
+  flutter: ">=3.38.1"
diff --git a/pubspec.yaml b/pubspec.yaml
index 055a64c..14f81d2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: "none"
 version: 2.7.2+48   # The thing after the + is the version code, incremented with each release
 
 environment:
-  sdk: ">=3.8.0 <4.0.0"   # RadioGroup widget requires Dart 3.8+ (Flutter 3.35+)
+  sdk: ">=3.10.3 <4.0.0"   # Resolved dependency floor (Dart 3.10.3 = Flutter 3.38+)
 
 dependencies:
   flutter: