From 610eb3f50b1c3a919d26e4c5420a1fcfece54c69 Mon Sep 17 00:00:00 2001 From: Jeremiah Ogbomo Date: Mon, 20 Nov 2023 08:59:51 +0100 Subject: [PATCH 1/6] Include TODO comment --- lib/presentation/widgets/app_icon.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/widgets/app_icon.dart b/lib/presentation/widgets/app_icon.dart index b4b1f93..f959878 100644 --- a/lib/presentation/widgets/app_icon.dart +++ b/lib/presentation/widgets/app_icon.dart @@ -19,7 +19,7 @@ class AppIcon extends StatelessWidget { color: backgroundColor ?? context.theme.colorScheme.onBackground, borderRadius: BorderRadius.circular(size.shortestSide / 4), ), - child: const FlutterLogo(), + child: const FlutterLogo(), // TODO(Jogboms): fix icon ), ); } From 87c2d0076dbd473351ed06ff8e77ef2d08e57758 Mon Sep 17 00:00:00 2001 From: Jeremiah Ogbomo Date: Mon, 20 Nov 2023 09:01:29 +0100 Subject: [PATCH 2/6] Bump flutter to `3.16.0` --- .fvm/fvm_config.json | 4 ++-- pubspec.lock | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 4f96768..f1f9cee 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "3.13.2", + "flutterSdkVersion": "3.16.0", "flavors": {} -} +} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index b85ee07..728c900 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -617,10 +617,10 @@ packages: dependency: "direct main" description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mfsao: dependency: "direct dev" description: @@ -1048,10 +1048,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" state_notifier: dependency: transitive description: @@ -1064,10 +1064,10 @@ packages: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -1104,26 +1104,26 @@ packages: dependency: transitive description: name: test - sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46" + sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f url: "https://pub.dev" source: hosted - version: "1.24.3" + version: "1.24.9" test_api: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" test_core: dependency: transitive description: name: test_core - sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e" + sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a url: "https://pub.dev" source: hosted - version: "0.5.3" + version: "0.5.9" timing: dependency: transitive description: @@ -1256,10 +1256,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1317,5 +1317,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.10.0" From b7f4a0fa5d8a6330dc12fc6dc0c7668e7957b456 Mon Sep 17 00:00:00 2001 From: Jeremiah Ogbomo Date: Mon, 20 Nov 2023 09:05:08 +0100 Subject: [PATCH 3/6] Update dependencies --- ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- pubspec.lock | 356 +++++++++--------- pubspec.yaml | 54 +-- 4 files changed, 207 insertions(+), 207 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 1820776..da46d4f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -217,7 +217,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 9a1995f..d4d779c 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =3.2.0-194.0.dev <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.16.0" diff --git a/pubspec.yaml b/pubspec.yaml index a6b1c75..d773b62 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,65 +8,65 @@ environment: dependencies: clock: ^1.1.1 - collection: ^1.17.2 - cupertino_icons: ^1.0.5 - device_info_plus: ^9.0.2 - drift: ^2.9.0 + collection: ^1.18.0 + cupertino_icons: ^1.0.6 + device_info_plus: ^9.1.0 + drift: ^2.13.1 equatable: ^2.0.5 faker: ^2.1.0 - file_picker: ^5.3.2 - fl_chart: ^0.63.0 + file_picker: ^6.1.1 + fl_chart: ^0.64.0 flutter: sdk: flutter flutter_localizations: sdk: flutter - flutter_riverpod: ^2.3.6 - flutter_secure_storage: ^8.0.0 - flutter_slidable: ^3.0.0 + flutter_riverpod: ^2.4.6 + flutter_secure_storage: ^9.0.0 + flutter_slidable: ^3.0.1 flutter_sticky_header: ^0.6.5 intl: ^0.18.1 logging: ^1.2.0 - meta: ^1.9.1 + meta: ^1.11.0 money: git: https://github.com/jogboms/money.dart.git - package_info_plus: ^4.0.2 + package_info_plus: ^4.2.0 path: ^1.8.3 - path_provider: ^2.0.15 - platform: ^3.1.0 + path_provider: ^2.1.1 + platform: ^3.1.3 registry: git: https://github.com/jogboms/registry.dart.git - riverpod: ^2.3.6 - riverpod_annotation: ^2.1.1 + riverpod: ^2.4.6 + riverpod_annotation: ^2.3.1 rxdart: ^0.27.7 - share_plus: ^7.0.2 - shared_preferences: ^2.2.0 + share_plus: ^7.2.1 + shared_preferences: ^2.2.2 sliver_tools: ^0.2.12 - sqlite3_flutter_libs: ^0.5.15 + sqlite3_flutter_libs: ^0.5.18 tabler_icons: ^2.5.0+1 universal_io: ^2.2.2 - url_launcher: ^6.1.12 - uuid: ^3.0.7 + url_launcher: ^6.2.1 + uuid: ^4.2.1 dependency_overrides: - collection: 1.17.1 # required by flutter_test - intl: 0.18.0 # required by flutter_localizations + meta: 1.11.0 # required by analyzer dev_dependencies: args: build_runner: ^2.4.6 device_info_plus_platform_interface: ^7.0.0 dotenv: - drift_dev: ^2.9.0 + drift_dev: ^2.13.2 fake_async: ^1.3.1 flutter_launcher_icons: ^0.13.1 flutter_test: sdk: flutter mfsao: ^3.0.0 - mocktail: ^0.3.0 + mocktail: ^1.0.1 package_info_plus_platform_interface: ^2.0.1 - plugin_platform_interface: ^2.1.4 - riverpod_generator: ^2.2.3 - riverpod_lint: ^1.3.2 + plugin_platform_interface: ^2.1.7 + riverpod_generator: ^2.3.6 + riverpod_lint: ^2.3.4 + test: ^1.24.9 flutter: uses-material-design: true From 9ba4725170967af18bccfa067290490b49880ea9 Mon Sep 17 00:00:00 2001 From: Jeremiah Ogbomo Date: Mon, 20 Nov 2023 09:16:02 +0100 Subject: [PATCH 4/6] Remove unnecessary build flags --- .github/workflows/android_production_release.yml | 2 +- .github/workflows/ios_production_release.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/production_release.yml | 2 +- makefile | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android_production_release.yml b/.github/workflows/android_production_release.yml index 776dbf3..4ee34b0 100644 --- a/.github/workflows/android_production_release.yml +++ b/.github/workflows/android_production_release.yml @@ -60,7 +60,7 @@ jobs: # Flutter actions - run: flutter doctor - run: flutter pub get - - run: flutter packages pub run build_runner build --enable-experiment=records,patterns,sealed-class + - run: flutter packages pub run build_runner build - run: flutter build appbundle --flavor prod --dart-define=env.mode=prod # Fastlane deploy diff --git a/.github/workflows/ios_production_release.yml b/.github/workflows/ios_production_release.yml index d0f46a3..cad033d 100644 --- a/.github/workflows/ios_production_release.yml +++ b/.github/workflows/ios_production_release.yml @@ -52,7 +52,7 @@ jobs: # Flutter actions - run: flutter doctor - run: flutter pub get - - run: flutter packages pub run build_runner build --enable-experiment=records,patterns,sealed-class + - run: flutter packages pub run build_runner build - run: flutter build ios --flavor prod --dart-define=env.mode=prod --release --no-codesign # Fastlane deploy diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2c3a82a..784eb41 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,7 @@ jobs: - run: flutter doctor - run: flutter pub get - run: dart format --set-exit-if-changed -l 120 lib - - run: flutter pub run build_runner build --enable-experiment=records,patterns,sealed-class + - run: flutter pub run build_runner build - run: flutter analyze lib - run: flutter test --no-pub --coverage --test-randomize-ordering-seed random diff --git a/.github/workflows/production_release.yml b/.github/workflows/production_release.yml index 946deb5..be6f2f9 100644 --- a/.github/workflows/production_release.yml +++ b/.github/workflows/production_release.yml @@ -60,7 +60,7 @@ jobs: - if: ${{ !inputs.skip_analysis_checks }} run: flutter format --set-exit-if-changed -l 120 lib - - run: flutter packages pub run build_runner build --enable-experiment=records,patterns,sealed-class + - run: flutter packages pub run build_runner build - if: ${{ !inputs.skip_analysis_checks }} run: flutter analyze lib diff --git a/makefile b/makefile index cc2b0c8..e386cf8 100644 --- a/makefile +++ b/makefile @@ -29,10 +29,10 @@ generate_intl: fvm flutter gen-l10n build_runner_build: - fvm flutter packages pub run build_runner build -d --enable-experiment=records,patterns,sealed-class + fvm flutter packages pub run build_runner build -d build_runner_watch: - fvm flutter packages pub run build_runner watch -d --enable-experiment=records,patterns,sealed-class + fvm flutter packages pub run build_runner watch -d # iOS mock_ios: From e729afd14d291205f80263495be16b1f2755726a Mon Sep 17 00:00:00 2001 From: Jeremiah Ogbomo Date: Mon, 20 Nov 2023 09:22:13 +0100 Subject: [PATCH 5/6] Update iOS dependencies --- ios/Podfile.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ed7f84d..3ea851b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -43,26 +43,26 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - SDWebImage (5.15.8): - - SDWebImage/Core (= 5.15.8) - - SDWebImage/Core (5.15.8) + - SDWebImage (5.18.5): + - SDWebImage/Core (= 5.18.5) + - SDWebImage/Core (5.18.5) - share_plus (0.0.1): - Flutter - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - sqlite3 (3.41.2): - - sqlite3/common (= 3.41.2) - - sqlite3/common (3.41.2) - - sqlite3/fts5 (3.41.2): + - sqlite3 (3.44.0): + - sqlite3/common (= 3.44.0) + - sqlite3/common (3.44.0) + - sqlite3/fts5 (3.44.0): - sqlite3/common - - sqlite3/perf-threadsafe (3.41.2): + - sqlite3/perf-threadsafe (3.44.0): - sqlite3/common - - sqlite3/rtree (3.41.2): + - sqlite3/rtree (3.44.0): - sqlite3/common - sqlite3_flutter_libs (0.0.1): - Flutter - - sqlite3 (~> 3.41.2) + - sqlite3 (~> 3.44.0) - sqlite3/fts5 - sqlite3/perf-threadsafe - sqlite3/rtree @@ -113,22 +113,22 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: - device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea + device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: ce3938a0df3cc1ef404671531facef740d03f920 + file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be - package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 - path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9 - SDWebImage: cb032eba469c54e0000e78bcb0a13cdde0a52798 - share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028 - shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c - sqlite3: fd89671d969f3e73efe503ce203e28b016b58f68 - sqlite3_flutter_libs: 04ba0d14a04335a2fbf9a331e8664f401fbccdd5 + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + SDWebImage: 7ac2b7ddc5e8484c79aa90fc4e30b149d6a2c88f + share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + sqlite3: 6e2d4a4879854d0ec86b476bf3c3e30870bac273 + sqlite3_flutter_libs: eb769059df0356dc52ddda040f09cacc9391a7cf SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f - url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b PODFILE CHECKSUM: 70454884eb41cf00b82e30346d4b841e751268ae -COCOAPODS: 1.12.1 +COCOAPODS: 1.13.0 From 786ea7fff415568fe7f88700e602a2a963998755 Mon Sep 17 00:00:00 2001 From: Jeremiah Ogbomo Date: Mon, 20 Nov 2023 10:24:31 +0100 Subject: [PATCH 6/6] Include devtools options config --- devtools_options.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 devtools_options.yaml diff --git a/devtools_options.yaml b/devtools_options.yaml new file mode 100644 index 0000000..e0b5c91 --- /dev/null +++ b/devtools_options.yaml @@ -0,0 +1,2 @@ +extensions: + - drift: true \ No newline at end of file