From b36de7d7d4a8295df077d3afa94e7e61d56b45c8 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 5 Nov 2024 10:34:24 -0600 Subject: [PATCH] chore(mobile): upgrade gradle (#13901) * chore(mobile): upgrade gradle * update photo_manager * migrate from kapt to ksp pumps kotlin and other dependency version to fix build issues * increase java heap size --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> --- mobile/android/app/build.gradle | 23 ++++++------ .../android/app/src/debug/AndroidManifest.xml | 4 +-- .../android/app/src/main/AndroidManifest.xml | 2 +- .../app/src/profile/AndroidManifest.xml | 4 +-- mobile/android/build.gradle | 2 +- mobile/android/gradle.properties | 6 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 +-- mobile/android/settings.gradle | 6 ++-- mobile/lib/entities/album.entity.g.dart | Bin 51237 -> 51235 bytes .../android_device_asset.entity.g.dart | Bin 13568 -> 13566 bytes mobile/lib/entities/asset.entity.g.dart | Bin 95839 -> 95837 bytes .../lib/entities/backup_album.entity.g.dart | Bin 18669 -> 18667 bytes .../entities/duplicated_asset.entity.g.dart | Bin 12886 -> 12884 bytes mobile/lib/entities/etag.entity.g.dart | Bin 20833 -> 20831 bytes mobile/lib/entities/exif_info.entity.g.dart | Bin 79872 -> 79870 bytes .../entities/ios_device_asset.entity.g.dart | Bin 21489 -> 21487 bytes .../lib/entities/logger_message.entity.g.dart | Bin 36915 -> 36913 bytes mobile/lib/entities/store.entity.g.dart | Bin 16291 -> 16289 bytes mobile/lib/entities/user.entity.g.dart | Bin 55454 -> 55452 bytes mobile/pubspec.lock | 34 +++++++++--------- mobile/pubspec.yaml | 18 +++++++--- 21 files changed, 58 insertions(+), 45 deletions(-) diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index 52750232c..506ee9d1a 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -2,7 +2,7 @@ plugins { id "com.android.application" id "kotlin-android" id "dev.flutter.flutter-gradle-plugin" - id "kotlin-kapt" + id 'com.google.devtools.ksp' } def localProperties = new Properties() @@ -31,12 +31,13 @@ android { compileSdkVersion 34 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + coreLibraryDesugaringEnabled true } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } sourceSets { @@ -74,6 +75,7 @@ android { signingConfig signingConfigs.release } } + namespace 'app.alextran.immich' } flutter { @@ -81,11 +83,11 @@ flutter { } dependencies { - def kotlin_version = '1.9.24' - def kotlin_coroutines_version = '1.8.1' - def work_version = '2.9.0' - def concurrent_version = '1.1.0' - def guava_version = '33.2.0-android' + 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' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" @@ -94,7 +96,8 @@ dependencies { implementation "androidx.concurrent:concurrent-futures:$concurrent_version" implementation "com.google.guava:guava:$guava_version" implementation "com.github.bumptech.glide:glide:$glide_version" - kapt "com.github.bumptech.glide:compiler:$glide_version" + ksp "com.github.bumptech.glide:ksp:$glide_version" + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2' } // This is uncommented in F-Droid build script diff --git a/mobile/android/app/src/debug/AndroidManifest.xml b/mobile/android/app/src/debug/AndroidManifest.xml index e33c470b4..ac7c0c7e5 100644 --- a/mobile/android/app/src/debug/AndroidManifest.xml +++ b/mobile/android/app/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml index 17c2830b4..c85ce1368 100644 --- a/mobile/android/app/src/main/AndroidManifest.xml +++ b/mobile/android/app/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - diff --git a/mobile/android/app/src/profile/AndroidManifest.xml b/mobile/android/app/src/profile/AndroidManifest.xml index e33c470b4..ac7c0c7e5 100644 --- a/mobile/android/app/src/profile/AndroidManifest.xml +++ b/mobile/android/app/src/profile/AndroidManifest.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle index 87cc79281..7a39a8d3c 100644 --- a/mobile/android/build.gradle +++ b/mobile/android/build.gradle @@ -1,5 +1,5 @@ allprojects { - ext.kotlin_version = '1.9.24' + ext.kotlin_version = '2.0.20' repositories { google() diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties index 4d3226abc..8da887529 100644 --- a/mobile/android/gradle.properties +++ b/mobile/android/gradle.properties @@ -1,3 +1,5 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4096M android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file +android.enableJetifier=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/mobile/android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/gradle/wrapper/gradle-wrapper.properties index 6357330c9..dedd5d1e6 100644 --- a/mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip -distributionSha256Sum=fe696c020f241a5f69c30f763c5a7f38eec54b490db19cd2b0962dda420d7d12 \ No newline at end of file diff --git a/mobile/android/settings.gradle b/mobile/android/settings.gradle index e809a0aba..74f8904a1 100644 --- a/mobile/android/settings.gradle +++ b/mobile/android/settings.gradle @@ -18,9 +18,9 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.4.2" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false - id "org.jetbrains.kotlin.kapt" version "1.9.0" apply false + id "com.android.application" version '8.7.2' apply false + id "org.jetbrains.kotlin.android" version "2.0.20" apply false + id 'com.google.devtools.ksp' version '2.0.20-1.0.24' apply false } include ":app" diff --git a/mobile/lib/entities/album.entity.g.dart b/mobile/lib/entities/album.entity.g.dart index 11046ec1e0d67e2d077ea269b1bd35811301c6a6..b1e322e397cb280a67414dde791e839b38f31abc 100644 GIT binary patch delta 16 YcmZ2FfqC%+<_$Y}87(&N;mzCy06Am^y#N3J delta 18 acmZ2HfqCf!<_$Y}nGLiJH}B%j+ywwbw+9gb diff --git a/mobile/lib/entities/android_device_asset.entity.g.dart b/mobile/lib/entities/android_device_asset.entity.g.dart index 9b1eef0ae59d792a9e3b46af6586f97d7a4ef375..eaa7658565f1cb2193ce3b35cd2eb37b6eb4a70e 100644 GIT binary patch delta 31 ncmZq3`j@#uiJi+rU5884nu{wlZ}LM9(aG~zcsBd9Z`1_HBMeGbvd^H_K``?7D;1pu)23M2pk diff --git a/mobile/lib/entities/asset.entity.g.dart b/mobile/lib/entities/asset.entity.g.dart index 23bf23604635ddfdc7105d2f328aefa1f7770e8b..07eee4825e0bd2698b530fb6ab97c8ec55ff2756 100644 GIT binary patch delta 20 bcmccrhV||n)(zT1j26v$LfiF(7!6YZT*3zx delta 22 dcmccnhV}j%)(zT1%m&(q%{oHcb%YoVQvhkH2WJ2P diff --git a/mobile/lib/entities/backup_album.entity.g.dart b/mobile/lib/entities/backup_album.entity.g.dart index 7fb6c0e03b6b2c518aa9e3aaaa4c85b1df5fdde7..23d00e43cadbe92b17f1cfbf8572d25bb3af7f5e 100644 GIT binary patch delta 16 YcmaDmk@59J#tp047%euhW3zVx06(S%e*gdg delta 18 acmaDok@4+B#tp04m<_ZIH?Lu{cLD%P>ju*R diff --git a/mobile/lib/entities/duplicated_asset.entity.g.dart b/mobile/lib/entities/duplicated_asset.entity.g.dart index 28faa05b6d0f930d4d6b4ead691dd6ffa61fbeb4..8965d47c97e330f6f7451c4784aa39d15eec3426 100644 GIT binary patch delta 14 VcmcbXawTQMC00g@%~x3)bpSTw25kTU delta 16 XcmcbTaxG=UC01qwZNtr%SsQf#L1G5M diff --git a/mobile/lib/entities/etag.entity.g.dart b/mobile/lib/entities/etag.entity.g.dart index 5327f6041afcafd3969c296b3fc7a6d5f11dee94..afabca4aeaa4eff46ca26e66a7f368588daba6a8 100644 GIT binary patch delta 16 XcmaF3i1Gd+#tmBRj24@9*-g9vIfVs= delta 18 Zcmcb=i1Fbf#tmBR%m&(qo3+_ZyZ}Sq1=;`r diff --git a/mobile/lib/entities/exif_info.entity.g.dart b/mobile/lib/entities/exif_info.entity.g.dart index 016f6d71260d097b15bc2b792b62a247eaa1974b..015983abf289f497755075ac67bdb2d9eb575bc2 100644 GIT binary patch delta 20 bcmZqp!1C`s%Z4s)MvLZN?(MzYjKw+tVKWEr delta 22 dcmezOo~7Xf%Z4s)W&>@*=5Fro-Q0}DIsk9g2tWV; diff --git a/mobile/lib/entities/ios_device_asset.entity.g.dart b/mobile/lib/entities/ios_device_asset.entity.g.dart index 6ecf9f0b730983120531757177eff0e0b4d0650a..ffed338c916fb62a57f89cae70a0e118fff3d193 100644 GIT binary patch delta 16 Xcmeykobml~#tjJ^j24@dIr_W-KUxNP delta 18 ZcmaFAoblsw#tjJ^%m&(qn-e+uya7se2F(Bf diff --git a/mobile/lib/entities/logger_message.entity.g.dart b/mobile/lib/entities/logger_message.entity.g.dart index 50c7fcf8ed2810f2c6d3ee8b1dade088b3ce36cd..e292e7173a48d1a8c42dce64d3cd2bcc68857980 100644 GIT binary patch delta 16 YcmdnIfNA3brVanu87($5aTs<006RVg4gdfE delta 17 ZcmdnEfNAprrVanunGLiJH*pwt002PX24MgI diff --git a/mobile/lib/entities/store.entity.g.dart b/mobile/lib/entities/store.entity.g.dart index eb8fa62f4078d98da06133df7f045f8c60023ac7..7d3210ff85a7aab0f8e464c5b3d126f7a8fdd34c 100644 GIT binary patch delta 14 WcmZ2nzp#G8FIGm2&3{>!SponyoCd!D delta 16 YcmZ2jzqo$GFIHv)ZNtsKS(jM?06_}}6951J diff --git a/mobile/lib/entities/user.entity.g.dart b/mobile/lib/entities/user.entity.g.dart index a0ecc4705c7381bb8fa54d64a07f38ed8d76a349..a7aaee44bf164221d15e3134bb2e3551d3cf491b 100644 GIT binary patch delta 16 YcmbQYk$KKW<_+_B87($1=3.3.0 <4.0.0' flutter: 3.24.4 +isar_version: &isar_version 3.1.8 # define the version to be used + dependencies: flutter: sdk: flutter path_provider_ios: - photo_manager: ^3.5.1 + photo_manager: ^3.6.1 photo_manager_image_provider: ^2.2.0 flutter_hooks: ^0.20.4 hooks_riverpod: ^2.4.9 @@ -23,7 +25,7 @@ dependencies: intl: ^0.19.0 auto_route: ^9.2.0 fluttertoast: ^8.2.4 - video_player: ^2.8.2 + video_player: ^2.9.2 chewie: ^1.7.4 socket_io_client: ^2.0.3+1 maplibre_gl: 0.19.0+2 @@ -44,8 +46,12 @@ dependencies: http_parser: ^4.0.2 flutter_web_auth: ^0.6.0 easy_image_viewer: ^1.4.0 - isar: ^3.1.0+1 - isar_flutter_libs: ^3.1.0+1 + isar: + version: *isar_version + hosted: https://pub.isar-community.dev/ + isar_flutter_libs: # contains Isar Core + version: *isar_version + hosted: https://pub.isar-community.dev/ permission_handler: ^11.2.0 device_info_plus: ^11.0.0 connectivity_plus: ^6.0.0 @@ -92,7 +98,9 @@ dev_dependencies: auto_route_generator: ^9.0.0 flutter_launcher_icons: ^0.14.0 flutter_native_splash: ^2.3.9 - isar_generator: ^3.1.0+1 + isar_generator: + version: *isar_version + hosted: https://pub.isar-community.dev/ integration_test: sdk: flutter custom_lint: ^0.6.4