From 8599917edfa3e0e095f2fc8f86d9d406c3be0c6f Mon Sep 17 00:00:00 2001
From: Volodymyr <v.buberenko@gmail.com>
Date: Sun, 21 Jun 2026 16:16:27 +0300
Subject: [PATCH 1/2] feat(device_info_plus): Add support of built-in Kotlin

---
 .../device_info_plus/android/build.gradle.kts         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/device_info_plus/device_info_plus/android/build.gradle.kts b/packages/device_info_plus/device_info_plus/android/build.gradle.kts
index e0a04a07f2..932be2ac4d 100644
--- a/packages/device_info_plus/device_info_plus/android/build.gradle.kts
+++ b/packages/device_info_plus/device_info_plus/android/build.gradle.kts
@@ -24,10 +24,15 @@ allprojects {
 
 plugins {
     id("com.android.library")
-    id("kotlin-android")
 }
 
-kotlin {
+val agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.substringBefore('.').toInt()
+
+if (agpMajor < 9) {
+    apply(plugin = "org.jetbrains.kotlin.android")
+}
+
+project.extensions.configure(org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension::class.java) {
     compilerOptions {
         jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
     }
@@ -43,7 +48,7 @@ android {
     }
 
     defaultConfig {
-        minSdk = 19
+        minSdk = 21
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 

From 396b362e42622f10f3e7361f7d2853675d0bd0a4 Mon Sep 17 00:00:00 2001
From: Volodymyr <v.buberenko@gmail.com>
Date: Sun, 21 Jun 2026 17:23:13 +0300
Subject: [PATCH 2/2] feat(device_info_plus): Update example app to use
 built-in Kotlin

---
 .../device_info_plus/example/android/app/build.gradle.kts     | 2 +-
 .../device_info_plus/example/android/gradle.properties        | 4 ++++
 .../example/android/gradle/wrapper/gradle-wrapper.properties  | 2 +-
 .../device_info_plus/example/android/settings.gradle.kts      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/device_info_plus/device_info_plus/example/android/app/build.gradle.kts b/packages/device_info_plus/device_info_plus/example/android/app/build.gradle.kts
index 236109c106..ae651dc175 100644
--- a/packages/device_info_plus/device_info_plus/example/android/app/build.gradle.kts
+++ b/packages/device_info_plus/device_info_plus/example/android/app/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("dev.flutter.flutter-gradle-plugin")
 }
 
@@ -25,6 +24,7 @@ android {
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
+        ndkVersion = flutter.ndkVersion
     }
 
     lint {
diff --git a/packages/device_info_plus/device_info_plus/example/android/gradle.properties b/packages/device_info_plus/device_info_plus/example/android/gradle.properties
index d9cf55df7c..e514eeddca 100644
--- a/packages/device_info_plus/device_info_plus/example/android/gradle.properties
+++ b/packages/device_info_plus/device_info_plus/example/android/gradle.properties
@@ -1,2 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false
diff --git a/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties
index f3dd2fa1bd..ed0d9c035b 100644
--- a/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Oct 05 15:15:38 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/device_info_plus/device_info_plus/example/android/settings.gradle.kts b/packages/device_info_plus/device_info_plus/example/android/settings.gradle.kts
index 388d07202a..c5bededd98 100644
--- a/packages/device_info_plus/device_info_plus/example/android/settings.gradle.kts
+++ b/packages/device_info_plus/device_info_plus/example/android/settings.gradle.kts
@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
     id("com.android.application") version "8.12.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }
 
 include(":app")