From 55e2c2e2a5e38dab67cadc554d8108aad2289434 Mon Sep 17 00:00:00 2001
From: Mahdijamebozorg <Mahdijamebozorg@email.com>
Date: Sat, 13 Jun 2026 15:52:49 +0330
Subject: [PATCH 1/2] fix: Lock socket_io_client version to 3.1.2 to fix
 breaking compiler errors

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index aed2422e3..fb32acd1d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -35,7 +35,7 @@ dependencies:
   markdown: ^7.3.0
   pdfrx: ^2.4.3
   flutter_inappwebview: ^6.1.5
-  socket_io_client: ^3.1.2
+  socket_io_client: 3.1.2
   yaml: ^3.1.2
   
   

From c5ed632371e4fddcbe47b0e0d21e383e93cad7b4 Mon Sep 17 00:00:00 2001
From: Mahdijamebozorg <Mahdijamebozorg@email.com>
Date: Sat, 13 Jun 2026 17:34:45 +0330
Subject: [PATCH 2/2] feat: added flutter 3.44 compatibility configurations,
 and reduced apk output size by 20 MB

---
 android/app/build.gradle.kts                  | 35 ++++++++++++++++---
 android/gradle.properties                     |  2 ++
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 android/settings.gradle.kts                   |  4 +--
 pubspec.yaml                                  |  2 +-
 5 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index bb3fe907c..a134b43bb 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -17,7 +17,7 @@ if (keystorePropertiesFile.exists()) {
 android {
     namespace = "app.cogwheel.conduit"
     compileSdk = 36
-    ndkVersion = "29.0.14206865"
+    ndkVersion = flutter.ndkVersion  
 
     defaultConfig {
     applicationId = "app.cogwheel.conduit"
@@ -35,10 +35,10 @@ android {
         isCoreLibraryDesugaringEnabled = true
     }
 
-    kotlinOptions {
-        // Generate JVM bytecode targeting Java 17
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
+    // kotlinOptions {
+    //     // Generate JVM bytecode targeting Java 17
+    //     jvmTarget = JavaVersion.VERSION_17.toString()
+    // }
 
     signingConfigs {
         if (keystorePropertiesFile.exists()) {
@@ -68,6 +68,31 @@ android {
             applicationIdSuffix = ".debug"
         }
     }
+    // exclude some common metadata files that inflate APK size
+    packagingOptions {
+        jniLibs { useLegacyPackaging = true }
+        resources {
+            excludes +=
+                    setOf(
+                            "META-INF/*.kotlin_module",
+                            "META-INF/*.version",
+                            "META-INF/AL2.0",
+                            "META-INF/LGPL2.1",
+                            "META-INF/LICENSE*",
+                            "META-INF/NOTICE*",
+                            "META-INF/DEPENDENCIES",
+                            "META-INF/proguard/*",
+                            "META-INF/gradle/incremental.annotation.processors"
+                    )
+        }
+    }
+}
+
+// AGP +9 migration
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
 }
 
 dependencies {
diff --git a/android/gradle.properties b/android/gradle.properties
index 407403501..ff7c40e70 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,6 +1,8 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
+# to fix Could not close incremental caches
+kotlin.incremental=false
 # Keep legacy Kotlin/AGP behavior until Flutter plugins migrate to built-in Kotlin.
 android.builtInKotlin=false
 android.newDsl=false
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 74b269f35..2d428bfb1 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/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.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index da20e6dac..bf7df2add 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -18,8 +18,8 @@ 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.2.20" apply false
+    id("com.android.application") version "9.0.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.3.20" apply false
 }
 
 include(":app")
diff --git a/pubspec.yaml b/pubspec.yaml
index fb32acd1d..f1dc6aa26 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -34,7 +34,7 @@ dependencies:
   # UI Components - Markdown Rendering
   markdown: ^7.3.0
   pdfrx: ^2.4.3
-  flutter_inappwebview: ^6.1.5
+  flutter_inappwebview: ^6.2.0-beta.3
   socket_io_client: 3.1.2
   yaml: ^3.1.2