From 21a84fee9c87df26e9a4c6602477cbc1eac7cffa Mon Sep 17 00:00:00 2001
From: jwabo <113924261+jwabo@users.noreply.github.com>
Date: Tue, 23 Apr 2024 09:22:59 -0600
Subject: [PATCH 1/4] Update build.gradle for AGP 8

---
 android/build.gradle | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/android/build.gradle b/android/build.gradle
index 61fb0f9..f439ffe 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -25,7 +25,16 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

From 605c866b34917115aa2402316095507076c6e04e Mon Sep 17 00:00:00 2001
From: jwabo <113924261+jwabo@users.noreply.github.com>
Date: Tue, 23 Apr 2024 09:23:55 -0600
Subject: [PATCH 2/4] Update build.gradle

---
 android/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android/build.gradle b/android/build.gradle
index f439ffe..5a87672 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -25,6 +25,10 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    if (project.android.hasProperty('namespace')) { 
+        namespace 'com.byneapp.flutter_config'
+    }
+    
     compileSdkVersion 30
 
     compileOptions {

From 4b12e3b88ce84b4b5f9c58724757b599fe303cc6 Mon Sep 17 00:00:00 2001
From: jwabo <113924261+jwabo@users.noreply.github.com>
Date: Tue, 23 Apr 2024 09:24:40 -0600
Subject: [PATCH 3/4] Update dotenv.gradle

---
 android/dotenv.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android/dotenv.gradle b/android/dotenv.gradle
index 6d0e963..f75a358 100644
--- a/android/dotenv.gradle
+++ b/android/dotenv.gradle
@@ -69,6 +69,10 @@ def loadDotEnv(flavor = getCurrentFlavor()) {
 loadDotEnv()
 
 android {
+    if (project.android.hasProperty('namespace')) { 
+        namespace 'com.byneapp.flutter_config'
+    }
+    
     defaultConfig {
         project.env.each { k, v ->
             def escaped = v.replaceAll("%", "\\\\u0025")

From 697dd088e1657c36398af7d41c2f16fd429d4d22 Mon Sep 17 00:00:00 2001
From: jwabo <113924261+jwabo@users.noreply.github.com>
Date: Tue, 18 Mar 2025 11:28:12 -0600
Subject: [PATCH 4/4] Fix registar issue

---
 .../com/byneapp/flutter_config/FlutterConfigPlugin.kt    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/android/src/main/kotlin/com/byneapp/flutter_config/FlutterConfigPlugin.kt b/android/src/main/kotlin/com/byneapp/flutter_config/FlutterConfigPlugin.kt
index 2df6d05..af6111b 100644
--- a/android/src/main/kotlin/com/byneapp/flutter_config/FlutterConfigPlugin.kt
+++ b/android/src/main/kotlin/com/byneapp/flutter_config/FlutterConfigPlugin.kt
@@ -10,7 +10,6 @@ import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
-import io.flutter.plugin.common.PluginRegistry.Registrar
 import java.lang.IllegalArgumentException
 import java.lang.reflect.Field
 
@@ -31,14 +30,6 @@ class FlutterConfigPlugin(private val context: Context? = null): FlutterPlugin,
     applicationContext = null
   }
 
-  companion object {
-    @JvmStatic
-    fun registerWith(registrar: Registrar) {
-      val channel = MethodChannel(registrar.messenger(), "flutter_config")
-      channel.setMethodCallHandler(FlutterConfigPlugin(registrar.activity()))
-    }
-  }
-
   override fun onMethodCall(call: MethodCall, result: Result) {
     if (call.method == "loadEnvVariables") {
       val variables = loadEnvVariables()