From 78cb93ef1cbbd47959f1207e35d7b145efc05f6c Mon Sep 17 00:00:00 2001 From: Dat Dang Date: Fri, 18 Jul 2025 10:15:25 +0700 Subject: [PATCH] Update Android API 35 (#3874) --- .github/workflows/build.yaml | 2 +- .github/workflows/release.yaml | 2 +- android/app/build.gradle | 7 +- android/app/src/debug/AndroidManifest.xml | 3 +- android/app/src/main/AndroidManifest.xml | 3 +- android/app/src/profile/AndroidManifest.xml | 3 +- android/build.gradle | 25 +++++++ android/gradle.properties | 5 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 2 +- contact/pubspec.lock | 35 ++++++---- core/lib/utils/file_utils.dart | 3 +- core/pubspec.lock | 35 ++++++---- core/pubspec.yaml | 11 +-- ios/Podfile.lock | 55 +++++++++------ ios/Runner.xcodeproj/project.pbxproj | 8 +-- model/pubspec.lock | 35 ++++++---- pubspec.lock | 68 +++++++++++-------- pubspec.yaml | 15 +++- 19 files changed, 191 insertions(+), 128 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0cfb823d6..e841305c8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -52,7 +52,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: "11" + java-version: "17" - name: Select Xcode version if: matrix.os == 'ios' diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4f0c5f0a5..95be54f5a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -55,7 +55,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: "11" + java-version: "17" - name: Select Xcode version if: matrix.os == 'ios' diff --git a/android/app/build.gradle b/android/app/build.gradle index 790094435..2fe2071a2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdk 34 + compileSdk 35 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -43,7 +43,7 @@ android { defaultConfig { applicationId "com.linagora.android.teammail" minSdkVersion flutterMinSdkVersion.toInteger() - targetSdkVersion 34 + targetSdkVersion 35 versionCode flutterVersionCode.toInteger() versionName flutterVersionName // The number of method references in a .dex file cannot exceed 64K @@ -85,6 +85,7 @@ android { execution "ANDROIDX_TEST_ORCHESTRATOR" } + namespace "com.linagora.android.tmail" } flutter { @@ -92,7 +93,7 @@ flutter { } dependencies { - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2' implementation 'androidx.work:work-runtime-ktx:2.7.0' implementation 'com.android.support:multidex:1.0.3' implementation 'androidx.window:window:1.0.0' diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 7c664b415..f880684a6 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 0e5e7e687..99702c146 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index 7c664b415..f880684a6 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/android/build.gradle b/android/build.gradle index b42eb3a73..f80173d8b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,6 +3,31 @@ allprojects { google() mavenCentral() } + + subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + compileSdk 35 + } + } + } + } + + tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { + kotlinOptions { + jvmTarget = "17" + } + } } rootProject.buildDir = '../build' diff --git a/android/gradle.properties b/android/gradle.properties index dfa0d8d59..c0d3f63be 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,7 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.jetifier.ignorelist=bcprov-jdk15on-1.68.jar \ No newline at end of file +android.jetifier.ignorelist=bcprov-jdk15on-1.68.jar +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index cc5527d78..7aeeb11c6 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 06170b7d0..9d973ea16 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '7.1.3' apply false + id "com.android.application" version '8.4.1' apply false id "org.jetbrains.kotlin.android" version "1.9.21" apply false id "com.google.gms.google-services" version "4.3.10" apply false } diff --git a/contact/pubspec.lock b/contact/pubspec.lock index ba09a07de..4f9299170 100644 --- a/contact/pubspec.lock +++ b/contact/pubspec.lock @@ -344,20 +344,27 @@ packages: flutter_charset_detector: dependency: transitive description: - path: flutter_charset_detector - ref: main - resolved-ref: "36c3ffeea65f7b362c1e47e608802f0ca941f4d4" - url: "https://github.com/dab246/flutter_charset_detector.git" - source: git - version: "5.0.0" + name: flutter_charset_detector + sha256: "5d4796d43dac2f37e14149b0f0c676fa08e8eb1ada8e99342a838d971d2fb9b1" + url: "https://pub.dev" + source: hosted + version: "3.0.0" flutter_charset_detector_android: dependency: transitive description: name: flutter_charset_detector_android - sha256: "443145e8fc8515b3b32aee375691e40dd59197a86a2ae153166bc88c8200d83b" + sha256: bee057133d5f134fe211523a27200dd22c782b93777f43359a571bd2c77da2cc url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "2.1.1" + flutter_charset_detector_darwin: + dependency: transitive + description: + name: flutter_charset_detector_darwin + sha256: "65d91133ea8ef06a440941b1126702b4735a8bd487430b41760e706a0b6b26d4" + url: "https://pub.dev" + source: hosted + version: "1.2.0" flutter_charset_detector_platform_interface: dependency: transitive description: @@ -370,10 +377,10 @@ packages: dependency: transitive description: name: flutter_charset_detector_web - sha256: e3ac65f94b12f4887937b21a19365d7927db816840cb93274e3861241cb0e9f2 + sha256: d8495115abada771c75f9395aae3e5809ffd506e8fc8f62b403ae11fc29e1d2b url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "1.0.2" flutter_image_compress: dependency: transitive description: @@ -804,18 +811,18 @@ packages: dependency: transitive description: name: package_info_plus - sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" + sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "8.0.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.2.0" path: dependency: transitive description: diff --git a/core/lib/utils/file_utils.dart b/core/lib/utils/file_utils.dart index a4a736b0a..ec37fc547 100644 --- a/core/lib/utils/file_utils.dart +++ b/core/lib/utils/file_utils.dart @@ -9,7 +9,7 @@ import 'package:flutter_charset_detector/flutter_charset_detector.dart'; import 'package:path_provider/path_provider.dart'; class FileUtils { - static const String DEFAULT_CHARSET = 'uft-8'; + static const String DEFAULT_CHARSET = 'utf-8'; static const String TEXT_PLAIN_MIME_TYPE = 'text/plain'; Future _getInternalStorageDirPath({ @@ -140,7 +140,6 @@ class FileUtils { Future getCharsetFromBytes(Uint8List bytes) async { try { - if (PlatformInfo.isIOS || PlatformInfo.isMacOS) return DEFAULT_CHARSET; final decodedResult = await CharsetDetector.autoDecode(bytes); log('FileUtils::getCharsetFromBytes: FILE_CHARSET = ${decodedResult.charset}'); return decodedResult.charset; diff --git a/core/pubspec.lock b/core/pubspec.lock index fd2dc5f7f..f3b22121a 100644 --- a/core/pubspec.lock +++ b/core/pubspec.lock @@ -337,20 +337,27 @@ packages: flutter_charset_detector: dependency: "direct main" description: - path: flutter_charset_detector - ref: main - resolved-ref: "36c3ffeea65f7b362c1e47e608802f0ca941f4d4" - url: "https://github.com/dab246/flutter_charset_detector.git" - source: git - version: "5.0.0" + name: flutter_charset_detector + sha256: "5d4796d43dac2f37e14149b0f0c676fa08e8eb1ada8e99342a838d971d2fb9b1" + url: "https://pub.dev" + source: hosted + version: "3.0.0" flutter_charset_detector_android: dependency: transitive description: name: flutter_charset_detector_android - sha256: "443145e8fc8515b3b32aee375691e40dd59197a86a2ae153166bc88c8200d83b" + sha256: bee057133d5f134fe211523a27200dd22c782b93777f43359a571bd2c77da2cc url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "2.1.1" + flutter_charset_detector_darwin: + dependency: transitive + description: + name: flutter_charset_detector_darwin + sha256: "65d91133ea8ef06a440941b1126702b4735a8bd487430b41760e706a0b6b26d4" + url: "https://pub.dev" + source: hosted + version: "1.2.0" flutter_charset_detector_platform_interface: dependency: transitive description: @@ -363,10 +370,10 @@ packages: dependency: transitive description: name: flutter_charset_detector_web - sha256: e3ac65f94b12f4887937b21a19365d7927db816840cb93274e3861241cb0e9f2 + sha256: d8495115abada771c75f9395aae3e5809ffd506e8fc8f62b403ae11fc29e1d2b url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "1.0.2" flutter_image_compress: dependency: "direct main" description: @@ -765,18 +772,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" + sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "8.0.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.2.0" path: dependency: transitive description: diff --git a/core/pubspec.yaml b/core/pubspec.yaml index 83db4a792..8106d880b 100644 --- a/core/pubspec.yaml +++ b/core/pubspec.yaml @@ -85,18 +85,11 @@ dependencies: printing: 5.12.0 - package_info_plus: 4.2.0 + package_info_plus: 8.0.2 fk_user_agent: 2.1.0 - # flutter_charset_detector: 3.0.0 - # TODO: Disable charset detector on IOS/MACOS to wait for migration status to complete. - # https://gitlab.freedesktop.org/uchardet/uchardet.git - flutter_charset_detector: - git: - url: https://github.com/dab246/flutter_charset_detector.git - ref: main - path: flutter_charset_detector + flutter_charset_detector: 3.0.0 debounce_throttle: 2.0.0 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 52ed9deeb..1aa21f46d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -55,19 +55,19 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - Firebase/CoreOnly (10.3.0): - - FirebaseCore (= 10.3.0) - - Firebase/Messaging (10.3.0): + - Firebase/CoreOnly (10.7.0): + - FirebaseCore (= 10.7.0) + - Firebase/Messaging (10.7.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.3.0) - - firebase_core (2.7.0): - - Firebase/CoreOnly (= 10.3.0) + - FirebaseMessaging (~> 10.7.0) + - firebase_core (2.11.0): + - Firebase/CoreOnly (= 10.7.0) - Flutter - - firebase_messaging (14.2.5): - - Firebase/Messaging (= 10.3.0) + - firebase_messaging (14.5.0): + - Firebase/Messaging (= 10.7.0) - firebase_core - Flutter - - FirebaseCore (10.3.0): + - FirebaseCore (10.7.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) @@ -78,7 +78,7 @@ PODS: - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.3.0): + - FirebaseMessaging (10.7.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.2) @@ -93,6 +93,10 @@ PODS: - flutter_appauth (0.0.1): - AppAuth (= 1.7.4) - Flutter + - flutter_charset_detector_darwin (0.0.1): + - Flutter + - FlutterMacOS + - UniversalDetector2 (= 2.0.1) - flutter_downloader (0.0.1): - Flutter - flutter_file_dialog (0.0.1): @@ -198,9 +202,9 @@ PODS: - ReachabilitySwift (5.2.4) - receive_sharing_intent (1.8.1): - Flutter - - SDWebImage (5.21.0): - - SDWebImage/Core (= 5.21.0) - - SDWebImage/Core (5.21.0) + - SDWebImage (5.21.1): + - SDWebImage/Core (= 5.21.1) + - SDWebImage/Core (5.21.1) - SDWebImageWebPCoder (0.14.6): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.17) @@ -210,6 +214,7 @@ PODS: - Flutter - FlutterMacOS - SwiftyGif (5.4.5) + - UniversalDetector2 (2.0.1) - url_launcher_ios (0.0.1): - Flutter - workmanager (0.0.1): @@ -229,6 +234,7 @@ DEPENDENCIES: - fk_user_agent (from `.symlinks/plugins/fk_user_agent/ios`) - Flutter (from `Flutter`) - flutter_appauth (from `.symlinks/plugins/flutter_appauth/ios`) + - flutter_charset_detector_darwin (from `.symlinks/plugins/flutter_charset_detector_darwin/darwin`) - flutter_downloader (from `.symlinks/plugins/flutter_downloader/ios`) - flutter_file_dialog (from `.symlinks/plugins/flutter_file_dialog/ios`) - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`) @@ -276,6 +282,7 @@ SPEC REPOS: - SDWebImage - SDWebImageWebPCoder - SwiftyGif + - UniversalDetector2 EXTERNAL SOURCES: app_links: @@ -304,6 +311,8 @@ EXTERNAL SOURCES: :path: Flutter flutter_appauth: :path: ".symlinks/plugins/flutter_appauth/ios" + flutter_charset_detector_darwin: + :path: ".symlinks/plugins/flutter_charset_detector_darwin/darwin" flutter_downloader: :path: ".symlinks/plugins/flutter_downloader/ios" flutter_file_dialog: @@ -357,23 +366,24 @@ SPEC CHECKSUMS: AppAuth: 182c5b88630569df5acb672720534756c29b3358 better_open_file: 03cf320415d4d3f46b6e00adc4a567d76c1a399d CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e + connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a contacts_service: 849e1f84281804c8bfbec1b4c3eedcb23c5d3eca device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 external_app_launcher: ad55ac844aa21f2d2197d7cec58ff0d0dc40bbc0 file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 - Firebase: f92fc551ead69c94168d36c2b26188263860acd9 - firebase_core: 128d8c43c3a453a4a67463314fc3761bedff860b - firebase_messaging: 8ac28baba96e69a58ad26b4bb5f9ee67c3e5efe2 - FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a + Firebase: 0219acf760880eeec8ce479895bd7767466d9f81 + firebase_core: dee76ded6c693fdb38b8ea39aef7129e32e587a3 + firebase_messaging: 67fbcdaf6a7c81849590e542eff2409dc49d9fa5 + FirebaseCore: e317665b9d744727a97e623edbbed009320afdd7 FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934 FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd - FirebaseMessaging: e345b219fd15d325f0cf2fef28cb8ce00d851b3f + FirebaseMessaging: ac9062bcc35ed56e15a0241d8fd317022499baf8 fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_appauth: 1ce438877bc111c5d8f42da47729909290624886 + flutter_charset_detector_darwin: fb3692d6d72cb6afcce7b0dd1a9516be6e78556e flutter_downloader: b7301ae057deadd4b1650dc7c05375f10ff12c39 flutter_file_dialog: 4c014a45b105709a27391e266c277d7e588e9299 flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e @@ -387,11 +397,11 @@ SPEC CHECKSUMS: GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8 lottie-ios: e047b1d2e6239b787cc5e9755b988869cf190494 - lottie_native: c2e590a297861fc32a0188cf8dab39aa97f86d81 + lottie_native: 96739b7fc232c7f440cbf5c2649100c51f117213 Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 - package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 patrol: 0564cee315ff6c86fb802b3647db05cc2d3d0624 pdfrx: 07fc287c47ea8d027c4ed56457f8a1aa74d73594 @@ -402,11 +412,12 @@ SPEC CHECKSUMS: PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda receive_sharing_intent: 79c848f5b045674ad60b9fea3bafea59962ad2c1 - SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868 + SDWebImage: f29024626962457f3470184232766516dee8dfea SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380 share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 + UniversalDetector2: 7c9ffd935cf050eeb19edf7e90f6febe3743a1af url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 31ba79215..03e25a3a0 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -49,7 +49,7 @@ F5BBBF512B2EEC37007930E1 /* NetworkExceptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BBBF502B2EEC37007930E1 /* NetworkExceptions.swift */; }; F5BBBF532B2EECAA007930E1 /* JmapExceptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BBBF522B2EECAA007930E1 /* JmapExceptions.swift */; }; F5BBBF552B2EEF3D007930E1 /* BundleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BBBF542B2EEF3D007930E1 /* BundleExtension.swift */; }; - F5CFE0352B335322005A90A9 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + F5CFE0352B335322005A90A9 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; F5D4EA032B2ABF090090DDFC /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5D4EA022B2ABF090090DDFC /* NotificationService.swift */; }; F5D4EA072B2ABF090090DDFC /* TwakeMailNSE.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = F5D4EA002B2ABF090090DDFC /* TwakeMailNSE.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; F5E7D8742B3578F90009BB8A /* JmapConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = F53D1E7E2B2E3C2600051FD0 /* JmapConstants.swift */; }; @@ -193,7 +193,7 @@ buildActionMask = 2147483647; files = ( CDFECA8C54311B749F044831 /* Pods_Runner.framework in Frameworks */, - F5CFE0352B335322005A90A9 /* (null) in Frameworks */, + F5CFE0352B335322005A90A9 /* BuildFile in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -681,14 +681,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; diff --git a/model/pubspec.lock b/model/pubspec.lock index dd5c3eb85..455f31a4f 100644 --- a/model/pubspec.lock +++ b/model/pubspec.lock @@ -344,20 +344,27 @@ packages: flutter_charset_detector: dependency: transitive description: - path: flutter_charset_detector - ref: main - resolved-ref: "36c3ffeea65f7b362c1e47e608802f0ca941f4d4" - url: "https://github.com/dab246/flutter_charset_detector.git" - source: git - version: "5.0.0" + name: flutter_charset_detector + sha256: "5d4796d43dac2f37e14149b0f0c676fa08e8eb1ada8e99342a838d971d2fb9b1" + url: "https://pub.dev" + source: hosted + version: "3.0.0" flutter_charset_detector_android: dependency: transitive description: name: flutter_charset_detector_android - sha256: "443145e8fc8515b3b32aee375691e40dd59197a86a2ae153166bc88c8200d83b" + sha256: bee057133d5f134fe211523a27200dd22c782b93777f43359a571bd2c77da2cc url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "2.1.1" + flutter_charset_detector_darwin: + dependency: transitive + description: + name: flutter_charset_detector_darwin + sha256: "65d91133ea8ef06a440941b1126702b4735a8bd487430b41760e706a0b6b26d4" + url: "https://pub.dev" + source: hosted + version: "1.2.0" flutter_charset_detector_platform_interface: dependency: transitive description: @@ -370,10 +377,10 @@ packages: dependency: transitive description: name: flutter_charset_detector_web - sha256: e3ac65f94b12f4887937b21a19365d7927db816840cb93274e3861241cb0e9f2 + sha256: d8495115abada771c75f9395aae3e5809ffd506e8fc8f62b403ae11fc29e1d2b url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "1.0.2" flutter_image_compress: dependency: transitive description: @@ -781,18 +788,18 @@ packages: dependency: transitive description: name: package_info_plus - sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" + sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "8.0.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.2.0" path: dependency: transitive description: diff --git a/pubspec.lock b/pubspec.lock index ed9122d11..c53f77ccd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "64fcb0dbca4386356386c085142fa6e79c00a3326ceaa778a2d25f5d9ba61441" + sha256: "867b77e2367bc502dcd4d5a66302615409f04eb20ed82ba1c0ba073f9107e018" url: "https://pub.dev" source: hosted - version: "1.0.16" + version: "1.2.0" analyzer: dependency: transitive description: @@ -269,10 +269,10 @@ packages: dependency: "direct main" description: name: connectivity_plus - sha256: "8875e8ed511a49f030e313656154e4bbbcef18d68dfd32eb853fac10bce48e96" + sha256: "45262924896ff72a8cd92b722bb7e3d5020f9e0724531a3e10e22ddae2005991" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "4.0.0" connectivity_plus_platform_interface: dependency: transitive description: @@ -613,10 +613,10 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: fe30ac230f12f8836bb97e6e09197340d3c584526825b1746ea362a82e1e43f7 + sha256: dcf54c170c5371ad0e79229d0fb372c58262ae0968b7de222bf28e51dd236be0 url: "https://pub.dev" source: hosted - version: "2.7.0" + version: "2.11.0" firebase_core_platform_interface: dependency: "direct overridden" description: @@ -637,26 +637,26 @@ packages: dependency: "direct main" description: name: firebase_messaging - sha256: "95f7565b8e992d2188cdd8dc5612330f7c309485fe425d3f9844f18e90741e3e" + sha256: "88a4bf569899344d863db26a73092681b590274f570f0a431051b92c4dd9bee3" url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.5.0" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: c5e79e15d1018cafffea1a6e45249db0d6bc42dbe35178634c77488179880e79 + sha256: "482fa6998f6cb10b30324ca8bfa0e2fcc0defed9484ccccce118b1b347e39a24" url: "https://pub.dev" source: hosted - version: "4.2.14" + version: "4.4.0" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: cd0cfcab7a63282049dec95a9955e7a487b5e580162310d12a82a10c0c32c546 + sha256: "61f7d323085704fbcc7b056a49d75211b2eb698610b878fec6cda18dd04d754f" url: "https://pub.dev" source: hosted - version: "3.2.15" + version: "3.4.0" fixnum: dependency: transitive description: @@ -722,20 +722,27 @@ packages: flutter_charset_detector: dependency: transitive description: - path: flutter_charset_detector - ref: main - resolved-ref: "36c3ffeea65f7b362c1e47e608802f0ca941f4d4" - url: "https://github.com/dab246/flutter_charset_detector.git" - source: git - version: "5.0.0" + name: flutter_charset_detector + sha256: "5d4796d43dac2f37e14149b0f0c676fa08e8eb1ada8e99342a838d971d2fb9b1" + url: "https://pub.dev" + source: hosted + version: "3.0.0" flutter_charset_detector_android: dependency: transitive description: name: flutter_charset_detector_android - sha256: "443145e8fc8515b3b32aee375691e40dd59197a86a2ae153166bc88c8200d83b" + sha256: bee057133d5f134fe211523a27200dd22c782b93777f43359a571bd2c77da2cc url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "2.1.1" + flutter_charset_detector_darwin: + dependency: transitive + description: + name: flutter_charset_detector_darwin + sha256: "65d91133ea8ef06a440941b1126702b4735a8bd487430b41760e706a0b6b26d4" + url: "https://pub.dev" + source: hosted + version: "1.2.0" flutter_charset_detector_platform_interface: dependency: transitive description: @@ -748,10 +755,10 @@ packages: dependency: transitive description: name: flutter_charset_detector_web - sha256: e3ac65f94b12f4887937b21a19365d7927db816840cb93274e3861241cb0e9f2 + sha256: d8495115abada771c75f9395aae3e5809ffd506e8fc8f62b403ae11fc29e1d2b url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "1.0.2" flutter_colorpicker: dependency: transitive description: @@ -780,10 +787,11 @@ packages: flutter_downloader: dependency: "direct main" description: - name: flutter_downloader - sha256: "6f2836668f33d0cd3ed275c3198d30967c42af53fa9b18c6b0edbf5fc12b599a" - url: "https://pub.dev" - source: hosted + path: "." + ref: "fixbug/android-api-35" + resolved-ref: "777e59823b7383ebb1acf3e777a14ce037ee9eb6" + url: "https://github.com/linagora/flutter_downloader.git" + source: git version: "1.10.2" flutter_file_dialog: dependency: "direct main" @@ -1534,18 +1542,18 @@ packages: dependency: transitive description: name: package_info_plus - sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" + sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "8.0.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.2.0" path: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index e5766ab99..e8fb1785e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -160,7 +160,7 @@ dependencies: rxdart: 0.27.7 - connectivity_plus: 3.0.3 + connectivity_plus: 4.0.0 dropdown_button2: 2.0.0 @@ -190,9 +190,9 @@ dependencies: url_launcher: 6.3.1 - firebase_core: 2.7.0 + firebase_core: 2.11.0 - firebase_messaging: 14.2.5 + firebase_messaging: 14.5.0 flutter_local_notifications: 17.2.1 @@ -317,6 +317,15 @@ dependency_overrides: ref: 18f92b53295e9eb77ebd4830d905a72cd404a126 path: overrides/hive + # TODO: The package publisher fixed the issue with android API 35. + # However, they bundled it with the Flutter 3.27.4. + # When this app upgrade to Flutter 3.27.4, we will update this package + # and remove this override. + flutter_downloader: + git: + url: https://github.com/linagora/flutter_downloader.git + ref: fixbug/android-api-35 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec