Update android build files to have legacy packaging and use new kotlin config

Author: CodeDoctorDE

.github/workflows/build.yml

@@ -870,4 +870,4 @@ jobs:
           identifier: LinwoodDev.Flow.Nightly
           version: ${{ needs.deploy.outputs.version }}
           release-tag: v${{ needs.deploy.outputs.version }}
-          token: ${{ secrets.CI_PAT }}
+          token: ${{ secrets.CI_PAT }}

app/android/.gitignore

@@ -4,12 +4,17 @@ gradle-wrapper.jar
 /gradlew
 /gradlew.bat
 /local.properties
-GeneratedPluginRegistrant.java
 /app/.cxx/
+GeneratedPluginRegistrant.java
+/.kotlin/
 /build/
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
-key.jks
+**/*.keystore
+**/*.jks
 play-store-credentials.json
+
+# Fastlane
+.bundle

app/android/Gemfile.lock

@@ -227,6 +227,7 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw-ucrt
   x86_64-linux
 
 DEPENDENCIES

app/android/app/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.util.Properties
 import java.io.FileInputStream
 
@@ -19,16 +20,21 @@ android {
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
+    // Flutter-friendly toggles:
+    // - Env: USE_LEGACY_PACKAGING=true
+    val useLegacy = (System.getenv("USE_LEGACY_PACKAGING") ?: "false").toBoolean()
+
+    packaging {
+        jniLibs {
+            useLegacyPackaging = useLegacy
+        }
+    }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
         isCoreLibraryDesugaringEnabled = true
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
-
     flavorDimensions += "default"
     productFlavors {
         create("production") {
@@ -56,7 +62,6 @@ android {
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
-        multiDexEnabled = true
     }
 
     signingConfigs {
@@ -85,11 +90,16 @@ android {
         includeInBundle = false
     }
 }
-
 dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.fromTarget("17")
+    }
+}
+
 flutter {
     source = "../.."
 }

app/android/build.gradle.kts

@@ -12,6 +12,26 @@ subprojects {
     val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
     project.layout.buildDirectory.value(newSubprojectBuildDir)
 }
+
+subprojects {
+    afterEvaluate {
+        if (project.extensions.findByName("android") != null) {
+            project.extensions.configure<com.android.build.gradle.BaseExtension>("android") {
+                if (compileSdkVersion == "android-31" || compileSdkVersion == "android-33" || compileSdkVersion == "android-34") {
+                    val appProject = rootProject.project(":app")
+                    val appAndroid = appProject.extensions.findByType(com.android.build.gradle.BaseExtension::class.java)
+                    if (appAndroid != null && appAndroid.compileSdkVersion != null) {
+                        println("Setting compileSdkVersion to ${appAndroid.compileSdkVersion} for ${project.name}")
+                        compileSdkVersion = appAndroid.compileSdkVersion
+                    } else {
+                        println("Could not find compileSdkVersion from app project for ${project.name}")
+                    }
+                }
+            }
+        }
+    }
+}
+
 subprojects {
     project.evaluationDependsOn(":app")
 }

app/android/settings.gradle.kts

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.12.2" apply false
+    id("com.android.application") version "8.13.2" apply false
     id("org.jetbrains.kotlin.android") version "2.3.0" apply false
 }
 

app/pubspec.lock

@@ -302,10 +302,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
+      sha256: d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   file:
     dependency: transitive
     description:

docs/pnpm-lock.yaml

@@ -2,6 +2,7 @@
   * Support for more ical properties (status, location)
   * Better handling of malformed ical data
 * Improve dashboard layout
+* Add legacy android binaries
 * Fix markdown field does not exit edit mode on tap outside
 * Fix note description not updated when note changes
 * Fix setup not running on mobile platforms