From 1fd23e56090e61de40d88cb0aee56077da99f4a3 Mon Sep 17 00:00:00 2001
From: Konstantin Yeftifeyev <konstantin@cy-mac-lp-yeftifeyev-k.local>
Date: Mon, 4 Nov 2024 13:09:18 +0200
Subject: [PATCH 1/3] feat: Upgrade build.grandle

---
 .../android/build.gradle                      | 52 ++++++++++++++-----
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/flutter_keyboard_visibility/android/build.gradle b/flutter_keyboard_visibility/android/build.gradle
index 96df462..d2f8d7c 100644
--- a/flutter_keyboard_visibility/android/build.gradle
+++ b/flutter_keyboard_visibility/android/build.gradle
@@ -1,44 +1,68 @@
-group 'com.jrai.flutter_keyboard_visibility'
-version '1.0'
+group = "com.jrai.flutter_keyboard_visibility"
+version = "1.0"
 
 buildscript {
+    ext.kotlin_version = "1.8.22"
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath("com.android.tools.build:gradle:8.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
-rootProject.allprojects {
+allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
 android {
-    // Conditional for compatibility with AGP <4.2.
     if (project.android.hasProperty("namespace")) {
-        namespace 'com.jrai.flutter_keyboard_visibility'
+        namespace = "com.jrai.flutter_keyboard_visibility"
     }
 
-    compileSdkVersion 31
+    compileSdk = 34
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
+    }
+
+    sourceSets {
+        main.java.srcDirs += "src/main/kotlin"
+        test.java.srcDirs += "src/test/kotlin"
+    }
 
     defaultConfig {
-        minSdkVersion 16
+        minSdk = 21
     }
 
-    lint {
-        disable 'InvalidPackage'
+    dependencies {
+        testImplementation("org.jetbrains.kotlin:kotlin-test")
+        testImplementation("org.mockito:mockito-core:5.0.0")
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+
+            testLogging {
+                events "passed", "skipped", "failed", "standardOut", "standardError"
+                outputs.upToDateWhen {false}
+                showStandardStreams = true
+            }
+        }
     }
 }

From c1a017d7c36d8919d0b85c19ed64337286a37dc6 Mon Sep 17 00:00:00 2001
From: Konstantin Yeftifeyev <zoxo@outlook.com>
Date: Sun, 26 Jan 2025 10:17:24 +0200
Subject: [PATCH 2/3] feat: Remove test dependencies

---
 .../android/build.gradle                       | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/flutter_keyboard_visibility/android/build.gradle b/flutter_keyboard_visibility/android/build.gradle
index d2f8d7c..deea3a2 100644
--- a/flutter_keyboard_visibility/android/build.gradle
+++ b/flutter_keyboard_visibility/android/build.gradle
@@ -48,21 +48,5 @@ android {
     defaultConfig {
         minSdk = 21
     }
-
-    dependencies {
-        testImplementation("org.jetbrains.kotlin:kotlin-test")
-        testImplementation("org.mockito:mockito-core:5.0.0")
-    }
-
-    testOptions {
-        unitTests.all {
-            useJUnitPlatform()
-
-            testLogging {
-                events "passed", "skipped", "failed", "standardOut", "standardError"
-                outputs.upToDateWhen {false}
-                showStandardStreams = true
-            }
-        }
-    }
+    
 }

From ffa5a566dd020a5b2fff1fd15f490ff4b2871288 Mon Sep 17 00:00:00 2001
From: Konstantin Yeftifeyev <zoxo@outlook.com>
Date: Sun, 26 Jan 2025 10:18:50 +0200
Subject: [PATCH 3/3] feat: Remove Kotlin dependencies

---
 flutter_keyboard_visibility/android/build.gradle | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/flutter_keyboard_visibility/android/build.gradle b/flutter_keyboard_visibility/android/build.gradle
index deea3a2..4513935 100644
--- a/flutter_keyboard_visibility/android/build.gradle
+++ b/flutter_keyboard_visibility/android/build.gradle
@@ -2,7 +2,6 @@ group = "com.jrai.flutter_keyboard_visibility"
 version = "1.0"
 
 buildscript {
-    ext.kotlin_version = "1.8.22"
     repositories {
         google()
         mavenCentral()
@@ -10,7 +9,6 @@ buildscript {
 
     dependencies {
         classpath("com.android.tools.build:gradle:8.1.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
@@ -48,5 +46,5 @@ android {
     defaultConfig {
         minSdk = 21
     }
-    
+
 }