From 85b616e3db660b86fd9f0da4cebc9bfe42371029 Mon Sep 17 00:00:00 2001 From: Moseco Date: Sat, 9 Aug 2025 20:00:21 +0900 Subject: [PATCH 1/2] build: update for flutter 3.32 upgrade --- android/settings.gradle.kts | 4 +- ios/Podfile.lock | 224 +++++++++--------- .../xcshareddata/xcschemes/Runner.xcscheme | 2 + pubspec.lock | 204 ++++++++-------- pubspec.yaml | 14 +- 5 files changed, 228 insertions(+), 220 deletions(-) diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index f2ceda0..27a702f 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -18,8 +18,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.7.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.22" apply false + id("com.android.application") version "8.7.3" apply false + id("org.jetbrains.kotlin.android") version "2.2.0" apply false id("com.google.gms.google-services") version "4.3.15" apply false id("com.google.firebase.crashlytics") version "2.8.1" apply false } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 84a351f..150f47b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -3,75 +3,70 @@ PODS: - Flutter - disk_space_plus (0.0.1): - Flutter - - Firebase/Analytics (11.10.0): - - Firebase/Core - - Firebase/Core (11.10.0): + - Firebase/CoreOnly (12.0.0): + - FirebaseCore (~> 12.0.0) + - Firebase/Crashlytics (12.0.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 11.10.0) - - Firebase/CoreOnly (11.10.0): - - FirebaseCore (~> 11.10.0) - - Firebase/Crashlytics (11.10.0): - - Firebase/CoreOnly - - FirebaseCrashlytics (~> 11.10.0) - - firebase_analytics (11.4.5): - - Firebase/Analytics (= 11.10.0) + - FirebaseCrashlytics (~> 12.0.0) + - firebase_analytics (12.0.0): - firebase_core + - FirebaseAnalytics (= 12.0.0) - Flutter - - firebase_core (3.13.0): - - Firebase/CoreOnly (= 11.10.0) + - firebase_core (4.0.0): + - Firebase/CoreOnly (= 12.0.0) - Flutter - - firebase_crashlytics (4.3.5): - - Firebase/Crashlytics (= 11.10.0) + - firebase_crashlytics (5.0.0): + - Firebase/Crashlytics (= 12.0.0) - firebase_core - Flutter - - FirebaseAnalytics (11.10.0): - - FirebaseAnalytics/AdIdSupport (= 11.10.0) - - FirebaseCore (~> 11.10.0) - - FirebaseInstallations (~> 11.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" + - FirebaseAnalytics (12.0.0): + - FirebaseAnalytics/Default (= 12.0.0) + - FirebaseCore (~> 12.0.0) + - FirebaseInstallations (~> 12.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.1) + - GoogleUtilities/MethodSwizzler (~> 8.1) + - GoogleUtilities/Network (~> 8.1) + - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.10.0): - - FirebaseCore (~> 11.10.0) - - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" + - FirebaseAnalytics/Default (12.0.0): + - FirebaseCore (~> 12.0.0) + - FirebaseInstallations (~> 12.0.0) + - GoogleAppMeasurement/Default (= 12.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.1) + - GoogleUtilities/MethodSwizzler (~> 8.1) + - GoogleUtilities/Network (~> 8.1) + - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - FirebaseCore (11.10.0): - - FirebaseCoreInternal (~> 11.10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.10.0): - - FirebaseCore (~> 11.10.0) - - FirebaseCoreInternal (11.10.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseCrashlytics (11.10.0): - - FirebaseCore (~> 11.10.0) - - FirebaseInstallations (~> 11.0) - - FirebaseRemoteConfigInterop (~> 11.0) - - FirebaseSessions (~> 11.0) - - GoogleDataTransport (~> 10.0) - - GoogleUtilities/Environment (~> 8.0) + - FirebaseCore (12.0.0): + - FirebaseCoreInternal (~> 12.0.0) + - GoogleUtilities/Environment (~> 8.1) + - GoogleUtilities/Logger (~> 8.1) + - FirebaseCoreExtension (12.0.0): + - FirebaseCore (~> 12.0.0) + - FirebaseCoreInternal (12.0.0): + - "GoogleUtilities/NSData+zlib (~> 8.1)" + - FirebaseCrashlytics (12.0.0): + - FirebaseCore (~> 12.0.0) + - FirebaseInstallations (~> 12.0.0) + - FirebaseRemoteConfigInterop (~> 12.0.0) + - FirebaseSessions (~> 12.0.0) + - GoogleDataTransport (~> 10.1) + - GoogleUtilities/Environment (~> 8.1) - nanopb (~> 3.30910.0) - PromisesObjC (~> 2.4) - - FirebaseInstallations (11.10.0): - - FirebaseCore (~> 11.10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) + - FirebaseInstallations (12.0.0): + - FirebaseCore (~> 12.0.0) + - GoogleUtilities/Environment (~> 8.1) + - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseRemoteConfigInterop (11.11.0) - - FirebaseSessions (11.10.0): - - FirebaseCore (~> 11.10.0) - - FirebaseCoreExtension (~> 11.10.0) - - FirebaseInstallations (~> 11.0) - - GoogleDataTransport (~> 10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) + - FirebaseRemoteConfigInterop (12.0.0) + - FirebaseSessions (12.0.0): + - FirebaseCore (~> 12.0.0) + - FirebaseCoreExtension (~> 12.0.0) + - FirebaseInstallations (~> 12.0.0) + - GoogleDataTransport (~> 10.1) + - GoogleUtilities/Environment (~> 8.1) + - GoogleUtilities/UserDefaults (~> 8.1) - nanopb (~> 3.30910.0) - PromisesSwift (~> 2.1) - Flutter (1.0.0) @@ -94,25 +89,31 @@ PODS: - Flutter - google_mlkit_commons - GoogleMLKit/TextRecognition (~> 7.0.0) - - GoogleAppMeasurement (11.10.0): - - GoogleAppMeasurement/AdIdSupport (= 11.10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" + - GoogleAdsOnDeviceConversion (2.1.0): + - GoogleUtilities/Logger (~> 8.1) + - GoogleUtilities/Network (~> 8.1) - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.10.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" + - GoogleAppMeasurement/Core (12.0.0): + - GoogleUtilities/AppDelegateSwizzler (~> 8.1) + - GoogleUtilities/MethodSwizzler (~> 8.1) + - GoogleUtilities/Network (~> 8.1) + - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.10.0): - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" + - GoogleAppMeasurement/Default (12.0.0): + - GoogleAdsOnDeviceConversion (= 2.1.0) + - GoogleAppMeasurement/Core (= 12.0.0) + - GoogleAppMeasurement/IdentitySupport (= 12.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.1) + - GoogleUtilities/MethodSwizzler (~> 8.1) + - GoogleUtilities/Network (~> 8.1) + - "GoogleUtilities/NSData+zlib (~> 8.1)" + - nanopb (~> 3.30910.0) + - GoogleAppMeasurement/IdentitySupport (12.0.0): + - GoogleAppMeasurement/Core (= 12.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.1) + - GoogleUtilities/MethodSwizzler (~> 8.1) + - GoogleUtilities/Network (~> 8.1) + - "GoogleUtilities/NSData+zlib (~> 8.1)" - nanopb (~> 3.30910.0) - GoogleDataTransport (10.1.0): - nanopb (~> 3.30910.0) @@ -133,31 +134,31 @@ PODS: - GoogleToolboxForMac/Defines (= 4.2.1) - "GoogleToolboxForMac/NSData+zlib (4.2.1)": - GoogleToolboxForMac/Defines (= 4.2.1) - - GoogleUtilities/AppDelegateSwizzler (8.0.2): + - GoogleUtilities/AppDelegateSwizzler (8.1.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.0.2): + - GoogleUtilities/Environment (8.1.0): - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): + - GoogleUtilities/Logger (8.1.0): - GoogleUtilities/Environment - GoogleUtilities/Privacy - - GoogleUtilities/MethodSwizzler (8.0.2): + - GoogleUtilities/MethodSwizzler (8.1.0): - GoogleUtilities/Logger - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.0.2): + - GoogleUtilities/Network (8.1.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.0.2)": + - "GoogleUtilities/NSData+zlib (8.1.0)": - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/Reachability (8.0.2): + - GoogleUtilities/Privacy (8.1.0) + - GoogleUtilities/Reachability (8.1.0): - GoogleUtilities/Logger - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.0.2): + - GoogleUtilities/UserDefaults (8.1.0): - GoogleUtilities/Logger - GoogleUtilities/Privacy - GTMSessionFetcher/Core (3.5.0) @@ -218,28 +219,31 @@ PODS: - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - sqlite3 (3.49.1): - - sqlite3/common (= 3.49.1) - - sqlite3/common (3.49.1) - - sqlite3/dbstatvtab (3.49.1): + - sqlite3 (3.50.4): + - sqlite3/common (= 3.50.4) + - sqlite3/common (3.50.4) + - sqlite3/dbstatvtab (3.50.4): + - sqlite3/common + - sqlite3/fts5 (3.50.4): - sqlite3/common - - sqlite3/fts5 (3.49.1): + - sqlite3/math (3.50.4): - sqlite3/common - - sqlite3/math (3.49.1): + - sqlite3/perf-threadsafe (3.50.4): - sqlite3/common - - sqlite3/perf-threadsafe (3.49.1): + - sqlite3/rtree (3.50.4): - sqlite3/common - - sqlite3/rtree (3.49.1): + - sqlite3/session (3.50.4): - sqlite3/common - sqlite3_flutter_libs (0.0.1): - Flutter - FlutterMacOS - - sqlite3 (~> 3.49.1) + - sqlite3 (~> 3.50.4) - sqlite3/dbstatvtab - sqlite3/fts5 - sqlite3/math - sqlite3/perf-threadsafe - sqlite3/rtree + - sqlite3/session - SSZipArchive (2.6.0) - url_launcher_ios (0.0.1): - Flutter @@ -281,6 +285,7 @@ SPEC REPOS: - FirebaseInstallations - FirebaseRemoteConfigInterop - FirebaseSessions + - GoogleAdsOnDeviceConversion - GoogleAppMeasurement - GoogleDataTransport - GoogleMLKit @@ -352,18 +357,18 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: app_links: 76b66b60cc809390ca1ad69bfd66b998d2387ac7 disk_space_plus: a36391fb5f732dbdd29628b0bac5a1acbd43aaef - Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2 - firebase_analytics: 1998960b8fa16fd0cd9e77a6f9fd35a2009ad65e - firebase_core: 2d4534e7b489907dcede540c835b48981d890943 - firebase_crashlytics: 961a0812ba79ed8f89a8d5d1e3763daa6267a87a - FirebaseAnalytics: 4e42333f02cf78ed93703a5c36f36dd518aebdef - FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7 - FirebaseCoreExtension: 6f357679327f3614e995dc7cf3f2d600bdc774ac - FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679 - FirebaseCrashlytics: 84b073c997235740e6a951b7ee49608932877e5c - FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3 - FirebaseRemoteConfigInterop: 85bdce8babed7814816496bb6f082bc05b0a45e1 - FirebaseSessions: 9b3b30947b97a15370e0902ee7a90f50ef60ead6 + Firebase: 800d487043c0557d9faed71477a38d9aafb08a41 + firebase_analytics: cd56fc56f75c1df30a6ff5290cd56e230996a76d + firebase_core: 633e1851ffe1b9ab875f6467a4f574c79cef02e4 + firebase_crashlytics: 2c6c1a17900a38081d938330e9f48e60ec5b255d + FirebaseAnalytics: 6d790cd1b159b4eb61a99948df0934ce505a34f7 + FirebaseCore: 055f4ab117d5964158c833f3d5e7ec6d91648d4a + FirebaseCoreExtension: 639afb3de6abd611952be78a794c54a47fa0f361 + FirebaseCoreInternal: dedc28e569a4be85f38f3d6af1070a2e12018d55 + FirebaseCrashlytics: db75aa0cab8d00f68406fa247c32fe17ade884d7 + FirebaseInstallations: d4c7c958f99c8860d7fcece786314ae790e2f988 + FirebaseRemoteConfigInterop: bfa0ea72ba3dc5af739777296424e46bd6f42613 + FirebaseSessions: 4e784acda213108aafef536535cdfc03504acc42 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_exif_rotation: 5406455759acacf1f7b1b83e85dbb545340d6e9c flutter_file_dialog: ca8d7fbd1772d4f0c2777b4ab20a7787ef4e7dd8 @@ -372,11 +377,12 @@ SPEC CHECKSUMS: google_mlkit_commons: 2abe6a70e1824e431d16a51085cb475b672c8aab google_mlkit_digital_ink_recognition: 17bf08581ec4c778fe1ac525302fd3a10e8799e6 google_mlkit_text_recognition: ec2122ec89bfe0d7200763336a6e4ef44810674c - GoogleAppMeasurement: 36684bfb3ee034e2b42b4321eb19da3a1b81e65d + GoogleAdsOnDeviceConversion: 2be6297a4f048459e0ae17fad9bfd2844e10cf64 + GoogleAppMeasurement: 8f6ab04ad6ae493b53fcf56bd26323fb2f1384f3 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleMLKit: eff9e23ec1d90ea4157a1ee2e32a4f610c5b3318 GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d + GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a in_app_review: 5596fe56fab799e8edb3561c03d053363ab13457 @@ -397,8 +403,8 @@ SPEC CHECKSUMS: security_scoped_resource: 8b95b9c0e93ae4e03b60e9b6be9c2d61e3751ec1 share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 - sqlite3: fc1400008a9b3525f5914ed715a5d1af0b8f4983 - sqlite3_flutter_libs: f6acaa2172e6bb3e2e70c771661905080e8ebcf2 + sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b + sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1 SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea url_launcher_ios: 694010445543906933d732453a59da0a173ae33d diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c53e2b3..9c12df5 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"> =3.7.2 <4.0.0" - flutter: ">=3.29.3" + dart: ">=3.8.0 <4.0.0" + flutter: ">=3.32.8" diff --git a/pubspec.yaml b/pubspec.yaml index 4ed5c8b..2dcf9c5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ version: 1.4.2+23 environment: sdk: '>=3.0.5 <4.0.0' - flutter: 3.29.3 + flutter: 3.32.8 isar_version: &isar_version 3.1.8 @@ -24,9 +24,9 @@ dependencies: stacked_themes: ^0.3.13 # Firebase - firebase_core: 3.13.0 - firebase_analytics: 11.4.5 - firebase_crashlytics: 4.3.5 + firebase_core: 4.0.0 + firebase_analytics: 12.0.0 + firebase_crashlytics: 5.0.0 # UI google_nav_bar: ^5.0.6 @@ -35,9 +35,9 @@ dependencies: git: url: https://github.com/Moseco/flip_card keyboard_actions: ^4.2.0 - fl_chart: ^0.71.0 + fl_chart: ^1.0.0 flutter_svg: ^2.0.7 - flutter_sticky_header: ^0.7.0 + flutter_sticky_header: ^0.8.0 shimmer: ^3.0.0 ruby_text: ^3.0.3 introduction_screen: ^3.1.11 @@ -99,7 +99,7 @@ dependency_overrides: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^5.0.0 + flutter_lints: ^6.0.0 build_runner: any stacked_generator: ^1.4.0 From 578641828ecac7b50c16acf419e53e71d4cd2b38 Mon Sep 17 00:00:00 2001 From: Hampus Hammarlund Date: Sun, 10 Aug 2025 10:20:33 +0900 Subject: [PATCH 2/2] build: upgrade dependencies --- pubspec.lock | 17 +++++++++-------- pubspec.yaml | 5 ++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index bcc461e..ff32da9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -489,10 +489,10 @@ packages: dependency: "direct main" description: name: flutter_hooks - sha256: "6a126f703b89499818d73305e4ce1e3de33b4ae1c5512e3b8eab4b986f46774c" + sha256: cde36b12f7188c85286fba9b38cc5a902e7279f36dd676967106c041dc9dde70 url: "https://pub.dev" source: hosted - version: "0.18.6" + version: "0.20.5" flutter_keyboard_visibility: dependency: transitive description: @@ -1148,10 +1148,11 @@ packages: ruby_text: dependency: "direct main" description: - name: ruby_text - sha256: c9fe49dfe703c240f2ef8274d75c33654ec893685fa7180fd0dcdaf32b850511 - url: "https://pub.dev" - source: hosted + path: "." + ref: "24c7a22" + resolved-ref: "24c7a220113efe750772c420befdce7e834e965c" + url: "https://github.com/Moseco/RubyText" + source: git version: "3.0.3" rxdart: dependency: transitive @@ -1363,10 +1364,10 @@ packages: dependency: "direct main" description: name: stacked_hooks - sha256: "7716851ee173988bd0808503fe96e2f1ac5410c5f71dc3c6648b7d4a9fb370c5" + sha256: ba2b0d777c69d4d38e5c08edbacc4dfe68eac94672447d067c2edc86fff9ed25 url: "https://pub.dev" source: hosted - version: "0.2.3" + version: "0.2.4" stacked_services: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 2dcf9c5..8818205 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,10 @@ dependencies: flutter_svg: ^2.0.7 flutter_sticky_header: ^0.8.0 shimmer: ^3.0.0 - ruby_text: ^3.0.3 + ruby_text: + git: + url: https://github.com/Moseco/RubyText + ref: '24c7a22' introduction_screen: ^3.1.11 percent_indicator: ^4.2.3 tutorial_coach_mark: ^1.2.11