From e33cd29aa82a2361b88390f14b551074d661548c Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 14 Oct 2025 13:01:29 +0700 Subject: [PATCH] TF-4058 Upgrade native library Android/iOS to compatible with flutter version 3.32.8 --- android/app/build.gradle | 1 + android/app/src/debug/AndroidManifest.xml | 8 -- android/app/src/main/AndroidManifest.xml | 3 + android/gradle.properties | 5 +- android/settings.gradle | 2 +- ios/.gitignore | 1 + ios/Podfile | 2 +- ios/Podfile.lock | 104 +++++++++--------- ios/Runner.xcodeproj/project.pbxproj | 18 +++ .../xcshareddata/xcschemes/Runner.xcscheme | 3 + 10 files changed, 86 insertions(+), 61 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 2fe2071a2..d51c3d681 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -35,6 +35,7 @@ if (keystorePropertiesFile.exists()) { android { compileSdk 35 + ndkVersion "28.2.13676358" sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 7a68d1b86..f880684a6 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -3,12 +3,4 @@ to allow setting breakpoints, to provide hot reload, etc. --> - - - - - diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 99702c146..7b9ba3526 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -4,6 +4,9 @@ + diff --git a/android/gradle.properties b/android/gradle.properties index c0d3f63be..005accfb2 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,7 +1,8 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4096M android.useAndroidX=true android.enableJetifier=true 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 +android.nonFinalResIds=false +kotlin.jvm.target.validation.mode = IGNORE \ No newline at end of file diff --git a/android/settings.gradle b/android/settings.gradle index 9d973ea16..1ab6b8620 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 '8.4.1' apply false + id "com.android.application" version '8.5.2' 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/ios/.gitignore b/ios/.gitignore index e96ef602b..da38b0877 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -24,6 +24,7 @@ Flutter/flutter_assets/ Flutter/flutter_export_environment.sh ServiceDefinitions.json Runner/GeneratedPluginRegistrant.* +Flutter/ephemeral/ # Exceptions to above rules. !default.mode1v3 diff --git a/ios/Podfile b/ios/Podfile index 8148d1278..b38c1ac3b 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '12.0' +platform :ios, '14.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 07e29a3c0..e4b97aa4d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -9,8 +9,6 @@ PODS: - AppAuth/Core (2.0.0) - AppAuth/ExternalUserAgent (2.0.0): - AppAuth/Core - - better_open_file (0.0.1): - - Flutter - CocoaAsyncSocket (7.6.5) - connectivity_plus (0.0.1): - Flutter @@ -52,6 +50,8 @@ PODS: - SwiftyGif - external_app_launcher (0.0.1): - Flutter + - external_path (2.0.1): + - Flutter - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter @@ -176,6 +176,8 @@ PODS: - nanopb/encode (= 2.30909.1) - nanopb/decode (2.30909.1) - nanopb/encode (2.30909.1) + - open_file_ios (0.0.1): + - Flutter - OrderedSet (6.0.3) - package_info_plus (0.4.5): - Flutter @@ -186,10 +188,10 @@ PODS: - CocoaAsyncSocket (~> 7.6) - Flutter - FlutterMacOS - - pdfrx (0.0.3): + - pdfrx (0.0.6): - Flutter - FlutterMacOS - - permission_handler_apple (9.1.1): + - permission_handler_apple (9.3.0): - Flutter - photo_manager (2.0.0): - Flutter @@ -217,17 +219,17 @@ PODS: - UniversalDetector2 (2.0.1) - url_launcher_ios (0.0.1): - Flutter - - workmanager (0.0.1): + - workmanager_apple (0.0.1): - Flutter DEPENDENCIES: - app_links (from `.symlinks/plugins/app_links/ios`) - app_settings (from `.symlinks/plugins/app_settings/ios`) - - better_open_file (from `.symlinks/plugins/better_open_file/ios`) - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - contacts_service (from `.symlinks/plugins/contacts_service/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - external_app_launcher (from `.symlinks/plugins/external_app_launcher/ios`) + - external_path (from `.symlinks/plugins/external_path/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) @@ -245,6 +247,7 @@ DEPENDENCIES: - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) - flutter_web_auth_2 (from `.symlinks/plugins/flutter_web_auth_2/ios`) - lottie_native (from `.symlinks/plugins/lottie_native/ios`) + - open_file_ios (from `.symlinks/plugins/open_file_ios/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - patrol (from `.symlinks/plugins/patrol/darwin`) @@ -257,7 +260,7 @@ DEPENDENCIES: - share_plus (from `.symlinks/plugins/share_plus/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - - workmanager (from `.symlinks/plugins/workmanager/ios`) + - workmanager_apple (from `.symlinks/plugins/workmanager_apple/ios`) SPEC REPOS: trunk: @@ -289,8 +292,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/app_links/ios" app_settings: :path: ".symlinks/plugins/app_settings/ios" - better_open_file: - :path: ".symlinks/plugins/better_open_file/ios" connectivity_plus: :path: ".symlinks/plugins/connectivity_plus/ios" contacts_service: @@ -299,6 +300,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/device_info_plus/ios" external_app_launcher: :path: ".symlinks/plugins/external_app_launcher/ios" + external_path: + :path: ".symlinks/plugins/external_path/ios" file_picker: :path: ".symlinks/plugins/file_picker/ios" firebase_core: @@ -333,6 +336,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_web_auth_2/ios" lottie_native: :path: ".symlinks/plugins/lottie_native/ios" + open_file_ios: + :path: ".symlinks/plugins/open_file_ios/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: @@ -357,70 +362,71 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" - workmanager: - :path: ".symlinks/plugins/workmanager/ios" + workmanager_apple: + :path: ".symlinks/plugins/workmanager_apple/ios" SPEC CHECKSUMS: - app_links: e7a6750a915a9e161c58d91bc610e8cd1d4d0ad0 - app_settings: 017320c6a680cdc94c799949d95b84cb69389ebc + app_links: 3da4c36b46cac3bf24eb897f1a6ce80bda109874 + app_settings: 3507c575c2b18a462c99948f61d5de21d4420999 AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063 - better_open_file: 03cf320415d4d3f46b6e00adc4a567d76c1a399d CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a - contacts_service: 849e1f84281804c8bfbec1b4c3eedcb23c5d3eca - device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea + connectivity_plus: 4d5101c5877bedcda6cd1ccb825307911667d6b0 + contacts_service: 7c2ed10147f55891576c6a582f431e385d8de92d + device_info_plus: 8b1a7b1cce194cd48521ee7159feb70453ed4854 DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 - external_app_launcher: ad55ac844aa21f2d2197d7cec58ff0d0dc40bbc0 - file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49 + external_app_launcher: 3411245965270a74040a3de17e27bd02b8abb905 + external_path: fd37c654b69a1336e33a2403f48383ae6100e443 + file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be Firebase: 0219acf760880eeec8ce479895bd7767466d9f81 - firebase_core: dee76ded6c693fdb38b8ea39aef7129e32e587a3 - firebase_messaging: 67fbcdaf6a7c81849590e542eff2409dc49d9fa5 + firebase_core: 08a35f8b03042881dffe36b86a3bb287e76d52f8 + firebase_messaging: 4840ee73783211d456bd6b0f73c878ac5592dd00 FirebaseCore: e317665b9d744727a97e623edbbed009320afdd7 FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934 FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd FirebaseMessaging: ac9062bcc35ed56e15a0241d8fd317022499baf8 - fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545 + fk_user_agent: 137145b086229251761678fe034da53753f4ce59 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_appauth: 88fcbc27871cbedac400db9d39b1363e4850179d - flutter_charset_detector_darwin: fb3692d6d72cb6afcce7b0dd1a9516be6e78556e - flutter_downloader: b7301ae057deadd4b1650dc7c05375f10ff12c39 - flutter_file_dialog: 4c014a45b105709a27391e266c277d7e588e9299 - flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e - flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4 - flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 - flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 - flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef - flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be - flutter_web_auth_2: 051cf9f5dc366f31b5dcc4e2952c2b954767be8a + flutter_appauth: d4abcf54856e5d8ba82ed7646ffc83245d4aa448 + flutter_charset_detector_darwin: 14f055ebeed6896144cc96b046749df51127a0a3 + flutter_downloader: 78da0da1084e709cbfd3b723c7ea349c71681f09 + flutter_file_dialog: ca8d7fbd1772d4f0c2777b4ab20a7787ef4e7dd8 + flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1 + flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99 + flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619 + flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100 + flutter_native_splash: 9e672d3818957718ee006a491730c09deeecace9 + flutter_secure_storage: 2c2ff13db9e0a5647389bff88b0ecac56e3f3418 + flutter_web_auth_2: 5c8d9dcd7848b5a9efb086d24e7a9adcae979c80 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8 lottie-ios: e047b1d2e6239b787cc5e9755b988869cf190494 - lottie_native: 96739b7fc232c7f440cbf5c2649100c51f117213 + lottie_native: c2e590a297861fc32a0188cf8dab39aa97f86d81 Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 + open_file_ios: 5ff7526df64e4394b4fe207636b67a95e83078bb OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 - package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c - path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 - patrol: 0564cee315ff6c86fb802b3647db05cc2d3d0624 - pdfrx: 07fc287c47ea8d027c4ed56457f8a1aa74d73594 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 - photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a - pointer_interceptor_ios: 9280618c0b2eeb80081a343924aa8ad756c21375 - printing: 233e1b73bd1f4a05615548e9b5a324c98588640b + package_info_plus: 580e9a5f1b6ca5594e7c9ed5f92d1dfb2a66b5e1 + path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + patrol: 5df5d241d7f95f0df12a6906bbf45acb43a1e537 + pdfrx: 310e84d01e06fd2af26e16507a0e48c27e99195c + permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d + photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413 + pointer_interceptor_ios: 6c19a55ea369c3f64424c9a95441e2b0e8beb8f3 + printing: 54ff03f28fe9ba3aa93358afb80a8595a071dd07 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda - receive_sharing_intent: 79c848f5b045674ad60b9fea3bafea59962ad2c1 + receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00 SDWebImage: f29024626962457f3470184232766516dee8dfea SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380 - share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + share_plus: de6030e33b4e106470e09322d87cf2a4258d2d1d + shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 UniversalDetector2: 7c9ffd935cf050eeb19edf7e90f6febe3743a1af - url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe - workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6 + url_launcher_ios: 694010445543906933d732453a59da0a173ae33d + workmanager_apple: 904529ae31e97fc5be632cf628507652294a0778 -PODFILE CHECKSUM: f2eb8f5a17c320a935d112236893d073c572e17e +PODFILE CHECKSUM: 40b12ce0bc437886ee4f4050970375d7d253708d -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 03e25a3a0..86df3a02f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -511,6 +511,7 @@ 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + C0BEA1D661C28FBC88584C44 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -743,6 +744,23 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; }; + C0BEA1D661C28FBC88584C44 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; E791D44F3C4EDE784D610B9E /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 7bdae17d1..67880a9de 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -26,6 +26,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit" shouldUseLaunchSchemeArgsEnv = "YES">