chore: pump flutter to 3.41.6 (#27834)

* chore: pump flutter to 3.41.6 * more isar cleanup * ignore experimental use for TableMigration --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
2026-05-18 03:10:24 +03:00 · 2026-04-16 22:26:46 +05:30
parent 6aadb7b5bd
commit 2a47c35eb7
22 changed files with 167 additions and 1057 deletions
@@ -1,27 +1,10 @@
 plugins {
-  id "com.android.application"
-  id "kotlin-android"
+  alias(libs.plugins.android.application)
+  alias(libs.plugins.kotlin.android)
  id "dev.flutter.flutter-gradle-plugin"
-  id 'com.google.devtools.ksp'
-  id 'org.jetbrains.kotlin.plugin.serialization'
-  id 'org.jetbrains.kotlin.plugin.compose' version '2.0.20' // this version matches your Kotlin version
-
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-  localPropertiesFile.withInputStream { localProperties.load(it) }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-  flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-  flutterVersionName = '1.0'
+  alias(libs.plugins.ksp)
+  alias(libs.plugins.kotlin.serialization)
+  alias(libs.plugins.kotlin.compose)
 }

 def keystoreProperties = new Properties()
@@ -31,8 +14,8 @@ if (keystorePropertiesFile.exists()) {
 }

 android {
-  compileSdkVersion 35
-  ndkVersion = "28.2.13676358"
+  compileSdk = flutter.compileSdkVersion
+  ndkVersion = flutter.ndkVersion

  compileOptions {
    sourceCompatibility JavaVersion.VERSION_17
@@ -55,10 +38,10 @@ android {

  defaultConfig {
    applicationId "app.alextran.immich"
-    minSdkVersion 26
-    targetSdkVersion 35
-    versionCode flutterVersionCode.toInteger()
-    versionName flutterVersionName
+    minSdk = 26
+    targetSdk = flutter.targetSdkVersion
+    versionCode flutter.versionCode
+    versionName flutter.versionName
  }

  signingConfigs {
@@ -67,10 +50,10 @@ android {
      def keyPasswordVal = System.getenv("ANDROID_KEY_PASSWORD")
      def storePasswordVal = System.getenv("ANDROID_STORE_PASSWORD")

-      keyAlias keyAliasVal ? keyAliasVal : keystoreProperties['keyAlias']
-      keyPassword keyPasswordVal ? keyPasswordVal : keystoreProperties['keyPassword']
-      storeFile file("../key.jks") ? file("../key.jks") : file(keystoreProperties['storeFile'])
-      storePassword storePasswordVal ? storePasswordVal : keystoreProperties['storePassword']
+      keyAlias keyAliasVal ?: keystoreProperties['keyAlias']
+      keyPassword keyPasswordVal ?: keystoreProperties['keyPassword']
+      storeFile file("../key.jks").exists() ? file("../key.jks") : file(keystoreProperties['storeFile'] ?: '../key.jks')
+      storePassword storePasswordVal ?: keystoreProperties['storePassword']
    }
  }

@@ -99,43 +82,31 @@ flutter {
 }

 dependencies {
-  def kotlin_version = '2.0.20'
-  def kotlin_coroutines_version = '1.9.0'
-  def work_version = '2.9.1'
-  def concurrent_version = '1.2.0'
-  def guava_version = '33.3.1-android'
-  def glide_version = '4.16.0'
-  def serialization_version = '1.8.1'
-  def compose_version = '1.1.1'
-  def gson_version = '2.10.1'
-  def okhttp_version = '4.12.0'
+  implementation libs.okhttp
+  implementation libs.cronet.embedded
+  implementation libs.media3.datasource.okhttp
+  implementation libs.media3.datasource.cronet
+  implementation libs.kotlinx.coroutines.android
+  implementation libs.work.runtime.ktx
+  implementation libs.concurrent.futures
+  implementation libs.guava
+  implementation libs.glide
+  implementation libs.kotlinx.serialization.json

-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-  implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
-  implementation 'org.chromium.net:cronet-embedded:143.7445.0'
-  implementation("androidx.media3:media3-datasource-okhttp:1.10.0")
-  implementation("androidx.media3:media3-datasource-cronet:1.10.0")
-  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
-  implementation "androidx.work:work-runtime-ktx:$work_version"
-  implementation "androidx.concurrent:concurrent-futures:$concurrent_version"
-  implementation "com.google.guava:guava:$guava_version"
-  implementation "com.github.bumptech.glide:glide:$glide_version"
-  implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
-
-  ksp "com.github.bumptech.glide:ksp:$glide_version"
-  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
+  ksp libs.glide.ksp
+  coreLibraryDesugaring libs.desugar.jdk.libs

  //Glance Widget
-  implementation "androidx.glance:glance-appwidget:$compose_version"
-  implementation "com.google.code.gson:gson:$gson_version"
+  implementation libs.glance.appwidget
+  implementation libs.gson

  // Glance Configure
-  implementation "androidx.activity:activity-compose:1.8.2"
-  implementation "androidx.compose.ui:ui:$compose_version"
-  implementation "androidx.compose.ui:ui-tooling:$compose_version"
-  implementation "androidx.compose.material3:material3:1.2.1"
-  implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
-  implementation "com.google.android.material:material:1.12.0"
+  implementation libs.activity.compose
+  implementation libs.compose.ui
+  implementation libs.compose.ui.tooling
+  implementation libs.compose.material3
+  implementation libs.lifecycle.runtime.ktx
+  implementation libs.material
 }

 // This is uncommented in F-Droid build script
@@ -39,10 +39,6 @@
      android:exported="false"
      android:foregroundServiceType="dataSync|shortService" />

-    <meta-data
-      android:name="io.flutter.embedding.android.EnableImpeller"
-      android:value="false" />
-
    <meta-data
      android:name="com.google.firebase.messaging.default_notification_icon"
      android:resource="@drawable/notification_icon" />
@@ -1,6 +1,4 @@
 allprojects {
-    ext.kotlin_version = '2.2.20'
-
    repositories {
        google()
        mavenCentral()
@@ -10,22 +8,7 @@ allprojects {
 rootProject.buildDir = '../build'

 subprojects {
-  //  fix for verifyReleaseResources
-  // ============
-  afterEvaluate { project ->
-        if (project.plugins.hasPlugin("com.android.application") ||
-                project.plugins.hasPlugin("com.android.library")) {
-            project.android {
-                compileSdkVersion 36
-                buildToolsVersion "36.0.0"
-            }
-        }
-    }
-    // ============
    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-
-subprojects {
    project.evaluationDependsOn(':app')
 }

@@ -36,4 +19,3 @@ tasks.register("clean", Delete) {
 tasks.named('wrapper') {
    distributionType = Wrapper.DistributionType.ALL
 }
-
@@ -0,0 +1,51 @@
+[versions]
+agp = "8.11.2"
+kotlin = "2.2.20"
+ksp = "2.2.20-2.0.3"
+coroutines = "1.9.0"
+work = "2.9.1"
+concurrent = "1.2.0"
+guava = "33.3.1-android"
+glide = "4.16.0"
+serialization-json = "1.8.1"
+glance = "1.1.1"
+gson = "2.10.1"
+okhttp = "4.12.0"
+cronet = "143.7445.0"
+media3 = "1.10.0"
+desugar = "2.1.2"
+activity-compose = "1.8.2"
+compose-ui = "1.1.1"
+material3 = "1.2.1"
+lifecycle = "2.6.2"
+material = "1.12.0"
+
+[libraries]
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
+cronet-embedded = { module = "org.chromium.net:cronet-embedded", version.ref = "cronet" }
+media3-datasource-okhttp = { module = "androidx.media3:media3-datasource-okhttp", version.ref = "media3" }
+media3-datasource-cronet = { module = "androidx.media3:media3-datasource-cronet", version.ref = "media3" }
+kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
+work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work" }
+concurrent-futures = { module = "androidx.concurrent:concurrent-futures", version.ref = "concurrent" }
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
+glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
+glide-ksp = { module = "com.github.bumptech.glide:ksp", version.ref = "glide" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization-json" }
+desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar" }
+glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "glance" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
+compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-ui" }
+compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-ui" }
+compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
+lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+# TODO: update to version.ref = "kotlin" when background_downloader is removed
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "1.9.22" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -18,10 +18,11 @@ pluginManagement {

 plugins {
  id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-  id "com.android.application" version '8.11.2' apply false
+  id "com.android.application" version "8.11.2" apply false
  id "org.jetbrains.kotlin.android" version "2.2.20" apply false
-  id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.22' apply false
-  id 'com.google.devtools.ksp' version '2.2.20-2.0.3' apply false
+  // TODO: update to match kotlin version when background_downloader is removed
+  id "org.jetbrains.kotlin.plugin.serialization" version "1.9.22" apply false
+  id "com.google.devtools.ksp" version "2.2.20-2.0.3" apply false
 }

 include ":app"