From baf86846a4d7dd2e5055853d3193a974a4a7f8fd Mon Sep 17 00:00:00 2001 From: YumNumm Date: Sat, 15 Feb 2025 18:30:17 +0900 Subject: [PATCH 1/7] =?UTF-8?q?chore:=20=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=9E=E3=83=83=E3=82=BF=E3=81=AE=E3=83=9A=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E5=B9=85=E3=82=9280=E6=96=87=E5=AD=97=E3=81=AB=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cursor/rules/commit-rules.mdc | 12 ++++++++++++ .cursorrules => .cursor/rules/dart-rules.mdc | 4 ++++ .../eqmonitor_lints/lib/analysis_options.yaml | 3 +++ scripts/fix.sh | 18 ------------------ 4 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 .cursor/rules/commit-rules.mdc rename .cursorrules => .cursor/rules/dart-rules.mdc (98%) delete mode 100755 scripts/fix.sh diff --git a/.cursor/rules/commit-rules.mdc b/.cursor/rules/commit-rules.mdc new file mode 100644 index 00000000..1dfb5273 --- /dev/null +++ b/.cursor/rules/commit-rules.mdc @@ -0,0 +1,12 @@ +--- +description: commit +globs: +--- +# コミット作成手段 + +差分をチェックして 適切な粒度でコミットしてください。1コミットあたり30~100行程度の差分が望ましいです。コミットが完了したらpushすること。 + +コミットメッセージは 英語1単語のprefixをつけ 説明は1行で簡潔な日本語で示すこと +もし、1行で内容を要約できないのであれば コミットを分割するか コミットメッセージを複数行で記述することを検討してください + +差分を取得する時は、`--no-pager`を使うこと \ No newline at end of file diff --git a/.cursorrules b/.cursor/rules/dart-rules.mdc similarity index 98% rename from .cursorrules rename to .cursor/rules/dart-rules.mdc index 6a65543e..9e68b1bc 100644 --- a/.cursorrules +++ b/.cursor/rules/dart-rules.mdc @@ -1,3 +1,7 @@ +--- +description: dart +globs: *.dart +--- // // (CC0 1.0 Universal License) // Flutter App Expert .cursorrules diff --git a/packages/eqmonitor_lints/lib/analysis_options.yaml b/packages/eqmonitor_lints/lib/analysis_options.yaml index 79517ad8..7709c3e3 100644 --- a/packages/eqmonitor_lints/lib/analysis_options.yaml +++ b/packages/eqmonitor_lints/lib/analysis_options.yaml @@ -23,3 +23,6 @@ custom_lint: - avoid_hardcoded_color: false - avoid_hardcoded_japanese: false - avoid_single_child: false + +formatter: + page_width: 80 diff --git a/scripts/fix.sh b/scripts/fix.sh deleted file mode 100755 index 10b43b31..00000000 --- a/scripts/fix.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -# https://github.com/yumemi-inc/flutter-mobile-project-template/blob/main/scripts/fix.sh - -source "$(dirname "${BASH_SOURCE[0]}")/common.sh" - -files=() -while IFS= read -r -d $'\0' file; do - files+=("$file") -done < <(find_custom_dart_files) - -for file in "${files[@]}"; do - # limit jobs to 5 - if [ "$(jobs -r | wc -l)" -ge 5 ]; then - wait "$(jobs -r -p | head -1)" - fi - dart fix --apply "$file" & -done -wait From b56c26d5c7955134b04e2381479a4b43c35406e7 Mon Sep 17 00:00:00 2001 From: YumNumm Date: Sat, 15 Feb 2025 18:30:22 +0900 Subject: [PATCH 2/7] =?UTF-8?q?ci:=20PR=E3=83=81=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=81=ABdart=20fix=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/check-pull-request.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/check-pull-request.yaml b/.github/workflows/check-pull-request.yaml index bf272838..080c73e0 100644 --- a/.github/workflows/check-pull-request.yaml +++ b/.github/workflows/check-pull-request.yaml @@ -67,6 +67,9 @@ jobs: - name: format run: melos format + - name: fix + run: dart fix --apply . + - name: check difference run: | git add -N . From 9a8edb28c483b3a78292a33ba94c028f50ceff1f Mon Sep 17 00:00:00 2001 From: YumNumm Date: Sat, 15 Feb 2025 18:30:27 +0900 Subject: [PATCH 3/7] =?UTF-8?q?style:=20Dart=E3=82=B3=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=AE=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=88=E3=83=88=E3=83=AC=E3=82=A4=E3=83=AA?= =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=82=AB=E3=83=B3=E3=83=9E=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/estimated_intensity_provider.dart | 4 ++-- .../ui/components/earthquake_history_list_tile.dart | 2 +- .../ui/earthquake_history_screen.dart | 4 ++-- .../ui/component/earthquake_map.dart | 10 +++++----- .../ui/component/prefecture_intensity.dart | 4 ++-- .../ui/component/prefecture_lpgm_intensity.dart | 4 ++-- .../chip/earthquake_history_early_sort_chip.dart | 2 +- .../ui/earthquake_history_early_screen.dart | 2 +- .../debug/kyoshin_monitor/debug_kyoshin_monitor.dart | 8 ++++---- .../features/display_settings/ui/display_settings.dart | 2 +- app/lib/feature/setup/component/background_image.dart | 2 +- .../lib/jma_parameter_api_client.dart | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/lib/core/provider/estimated_intensity/provider/estimated_intensity_provider.dart b/app/lib/core/provider/estimated_intensity/provider/estimated_intensity_provider.dart index 4459fca0..c9f4167c 100644 --- a/app/lib/core/provider/estimated_intensity/provider/estimated_intensity_provider.dart +++ b/app/lib/core/provider/estimated_intensity/provider/estimated_intensity_provider.dart @@ -113,7 +113,7 @@ class EstimatedIntensity extends _$EstimatedIntensity { regionCode: region.code, cityCode: city.code, station: station, - )); + ),); } } } @@ -129,7 +129,7 @@ class EstimatedIntensity extends _$EstimatedIntensity { lat: point.station.latitude, lon: point.station.longitude, arv400: point.station.arv400, - )); + ),); } return result; } diff --git a/app/lib/feature/earthquake_history/ui/components/earthquake_history_list_tile.dart b/app/lib/feature/earthquake_history/ui/components/earthquake_history_list_tile.dart index a3f718ae..d5b2466a 100644 --- a/app/lib/feature/earthquake_history/ui/components/earthquake_history_list_tile.dart +++ b/app/lib/feature/earthquake_history/ui/components/earthquake_history_list_tile.dart @@ -56,7 +56,7 @@ class EarthquakeHistoryListTile extends HookConsumerWidget { return codeTable.areaEpicenter.items .firstWhereOrNull((e) => int.tryParse(e.code) == item.epicenterCode) ?.name; - }, [item]); + }, [item],); final hypoDetailName = useMemoized( () => codeTable.areaEpicenterDetail.items.firstWhereOrNull( (e) => int.tryParse(e.code) == item.epicenterDetailCode, diff --git a/app/lib/feature/earthquake_history/ui/earthquake_history_screen.dart b/app/lib/feature/earthquake_history/ui/earthquake_history_screen.dart index 7baea31a..361e930c 100644 --- a/app/lib/feature/earthquake_history/ui/earthquake_history_screen.dart +++ b/app/lib/feature/earthquake_history/ui/earthquake_history_screen.dart @@ -37,7 +37,7 @@ class EarthquakeHistoryScreen extends HookConsumerWidget { }), ); return null; - }, [parameter.value]); + }, [parameter.value],); return Scaffold( appBar: AppBar( @@ -157,7 +157,7 @@ class _SliverListBody extends HookConsumerWidget { } }); return null; - }, [controller, state, onScrollEnd, onRefresh]); + }, [controller, state, onScrollEnd, onRefresh],); Widget listView({ required (List, int) data, diff --git a/app/lib/feature/earthquake_history_details/ui/component/earthquake_map.dart b/app/lib/feature/earthquake_history_details/ui/component/earthquake_map.dart index cef4c4a1..b6610db1 100644 --- a/app/lib/feature/earthquake_history_details/ui/component/earthquake_map.dart +++ b/app/lib/feature/earthquake_history_details/ui/component/earthquake_map.dart @@ -75,7 +75,7 @@ class EarthquakeMapWidget extends HookConsumerWidget { // ignore: discarded_futures final itemCalculateFutureing = useMemoized(() async { return _compute(colorModel, item, earthquakeParams); - }, [colorModel, item, earthquakeParams]); + }, [colorModel, item, earthquakeParams],); final itemCalculateFuture = useFuture(itemCalculateFutureing); final result = itemCalculateFuture.data; if (itemCalculateFuture.hasError) { @@ -122,7 +122,7 @@ class EarthquakeMapWidget extends HookConsumerWidget { bbox = bbox.add(jma_map.LatLng(lat: latitude, lng: longitude)); } return bbox; - }, [regionsItem]); + }, [regionsItem],); final mapController = useState(null); @@ -148,7 +148,7 @@ class EarthquakeMapWidget extends HookConsumerWidget { right: 10, top: 10, ); - }, [bbox, item]); + }, [bbox, item],); // * Display mode related List<_Action> getActions(EarthquakeHistoryDetailConfig config) => [ @@ -247,7 +247,7 @@ class EarthquakeMapWidget extends HookConsumerWidget { }), ); return null; - }, [item]); + }, [item],); final maxZoomLevel = useState(6); return RepaintBoundary( @@ -414,7 +414,7 @@ class EarthquakeMapWidget extends HookConsumerWidget { regionsLpgmItem, stationsLpgmItem, ); - }, (earthquake, earthquakeParams, colorModel)); + }, (earthquake, earthquakeParams, colorModel),); } } diff --git a/app/lib/feature/earthquake_history_details/ui/component/prefecture_intensity.dart b/app/lib/feature/earthquake_history_details/ui/component/prefecture_intensity.dart index 3abf52cc..176f81d8 100644 --- a/app/lib/feature/earthquake_history_details/ui/component/prefecture_intensity.dart +++ b/app/lib/feature/earthquake_history_details/ui/component/prefecture_intensity.dart @@ -113,7 +113,7 @@ Future>> _calculator( .reversed .toList(); return Map.fromEntries(reorderedResult); -}, arg); +}, arg,); class PrefectureIntensityWidget extends HookConsumerWidget { const PrefectureIntensityWidget({required this.item, super.key}); @@ -133,7 +133,7 @@ class PrefectureIntensityWidget extends HookConsumerWidget { prefectures: item.intensityPrefectures!, cities: item.intensityCities, stations: item.intensityStations, - )), + ),), ); return switch (mergedPrefecturesFuture) { AsyncLoading() => const Center( diff --git a/app/lib/feature/earthquake_history_details/ui/component/prefecture_lpgm_intensity.dart b/app/lib/feature/earthquake_history_details/ui/component/prefecture_lpgm_intensity.dart index 6619c0e4..11ed1acb 100644 --- a/app/lib/feature/earthquake_history_details/ui/component/prefecture_lpgm_intensity.dart +++ b/app/lib/feature/earthquake_history_details/ui/component/prefecture_lpgm_intensity.dart @@ -61,7 +61,7 @@ Future>> _lpgmCalculator( } } return result; - }, arg); + }, arg,); class PrefectureLpgmIntensityWidget extends HookConsumerWidget { const PrefectureLpgmIntensityWidget({required this.item, super.key}); @@ -77,7 +77,7 @@ class PrefectureLpgmIntensityWidget extends HookConsumerWidget { _LpgmCalculatorProvider(( prefectures: item.lpgmIntensityPrefectures, stations: item.lpgmIntenstiyStations, - )), + ),), ); return switch (mergedPrefecturesFuture) { diff --git a/app/lib/feature/earthquake_history_early/ui/components/chip/earthquake_history_early_sort_chip.dart b/app/lib/feature/earthquake_history_early/ui/components/chip/earthquake_history_early_sort_chip.dart index 1090d6b8..934c1b0d 100644 --- a/app/lib/feature/earthquake_history_early/ui/components/chip/earthquake_history_early_sort_chip.dart +++ b/app/lib/feature/earthquake_history_early/ui/components/chip/earthquake_history_early_sort_chip.dart @@ -136,7 +136,7 @@ class _SortModal extends HookConsumerWidget { (EarthquakeEarlySortType.origin_time, true) => '地震発生時刻の古い順', (EarthquakeEarlySortType.max_intensity, false) => '最大観測震度の大きい順', (EarthquakeEarlySortType.max_intensity, true) => '最大観測震度の小さい順', - }), + },), value: ascending.value, onChanged: (v) => ascending.value = v, ), diff --git a/app/lib/feature/earthquake_history_early/ui/earthquake_history_early_screen.dart b/app/lib/feature/earthquake_history_early/ui/earthquake_history_early_screen.dart index 2308f017..eb810fde 100644 --- a/app/lib/feature/earthquake_history_early/ui/earthquake_history_early_screen.dart +++ b/app/lib/feature/earthquake_history_early/ui/earthquake_history_early_screen.dart @@ -194,7 +194,7 @@ class _SliverListBody extends HookConsumerWidget { } }); return null; - }, [controller, state, onScrollEnd, onRefresh]); + }, [controller, state, onScrollEnd, onRefresh],); final theme = Theme.of(context); final colorSchema = theme.colorScheme; diff --git a/app/lib/feature/settings/children/config/debug/kyoshin_monitor/debug_kyoshin_monitor.dart b/app/lib/feature/settings/children/config/debug/kyoshin_monitor/debug_kyoshin_monitor.dart index 61f9e679..8d90af04 100644 --- a/app/lib/feature/settings/children/config/debug/kyoshin_monitor/debug_kyoshin_monitor.dart +++ b/app/lib/feature/settings/children/config/debug/kyoshin_monitor/debug_kyoshin_monitor.dart @@ -85,7 +85,7 @@ class _Body extends ConsumerWidget { }), AsyncError(:final error) => error.toString(), _ => 'Loading...', - }, style: bodyTextStyle), + }, style: bodyTextStyle,), ], ), ), @@ -98,7 +98,7 @@ class _Body extends ConsumerWidget { AsyncData(:final value) => value.toString(), AsyncError(:final error) => error.toString(), _ => 'Loading...', - }, style: bodyTextStyle), + }, style: bodyTextStyle,), ], ), ), @@ -130,7 +130,7 @@ class _Body extends ConsumerWidget { }), AsyncError(:final error) => error.toString(), _ => 'Loading...', - }, style: bodyTextStyle), + }, style: bodyTextStyle,), if (state.valueOrNull?.currentImageRaw != null) ColoredBox( color: Colors.white, @@ -160,7 +160,7 @@ class _Body extends ConsumerWidget { ).convert(value.toJson()), AsyncError(:final error) => error.toString(), _ => 'Loading...', - }, style: bodyTextStyle), + }, style: bodyTextStyle,), ], ), ), diff --git a/app/lib/feature/settings/features/display_settings/ui/display_settings.dart b/app/lib/feature/settings/features/display_settings/ui/display_settings.dart index 7843ca67..f5de6fcf 100644 --- a/app/lib/feature/settings/features/display_settings/ui/display_settings.dart +++ b/app/lib/feature/settings/features/display_settings/ui/display_settings.dart @@ -83,7 +83,7 @@ class _ThemeSelector extends ConsumerWidget { ThemeMode.light => 'ライト', ThemeMode.dark => 'ダーク', _ => throw UnimplementedError(), - }), + },), const SizedBox(height: 4), Radio.adaptive( value: diff --git a/app/lib/feature/setup/component/background_image.dart b/app/lib/feature/setup/component/background_image.dart index 890fe5b5..f931ed81 100644 --- a/app/lib/feature/setup/component/background_image.dart +++ b/app/lib/feature/setup/component/background_image.dart @@ -30,7 +30,7 @@ class SetupBackgroundImageWidget extends HookWidget { useEffect(() { startTime.value = DateTime.now().millisecondsSinceEpoch; return null; - }, [context]); + }, [context],); if (shader.hasData) { return AnimatedBuilder( animation: animationController, diff --git a/packages/jma_parameter_api_client/lib/jma_parameter_api_client.dart b/packages/jma_parameter_api_client/lib/jma_parameter_api_client.dart index 70ff7361..7eb5a72e 100644 --- a/packages/jma_parameter_api_client/lib/jma_parameter_api_client.dart +++ b/packages/jma_parameter_api_client/lib/jma_parameter_api_client.dart @@ -47,7 +47,7 @@ class JmaParameterApiClient { @RestApi() abstract class _JmaParameterApiClient { - factory _JmaParameterApiClient(Dio dio, {String baseUrl}) = + factory _JmaParameterApiClient(Dio dio) = __JmaParameterApiClient; @GET('/parameter/earthquake') From b72432e0ec6da392feceb381a4c81ab141b88dd7 Mon Sep 17 00:00:00 2001 From: YumNumm Date: Sat, 15 Feb 2025 19:28:38 +0900 Subject: [PATCH 4/7] chore: Update dependencies and remove package overrides --- .github/workflows/check-pull-request.yaml | 2 +- pubspec.lock | 219 +++++++++++----------- pubspec.yaml | 12 -- 3 files changed, 110 insertions(+), 123 deletions(-) diff --git a/.github/workflows/check-pull-request.yaml b/.github/workflows/check-pull-request.yaml index 080c73e0..37b9460c 100644 --- a/.github/workflows/check-pull-request.yaml +++ b/.github/workflows/check-pull-request.yaml @@ -121,7 +121,7 @@ jobs: - name: Report custom_lint result run: | echo "::add-matcher::.github/problem_matchers/custom_lint.json" - melos run report_custom_lint:ci --no-select || result=$? + melos run ci:report:custom_lint --no-select || result=$? echo "::remove-matcher owner=custom_lint::" if [ -n "$result" ]; then diff --git a/pubspec.lock b/pubspec.lock index 97954dfb..2b92f519 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: e4f2a7ef31b0ab2c89d2bde35ef3e6e6aff1dce5e66069c6540b0e9cfe33ee6b + sha256: e051259913915ea5bc8fe18664596bea08592fd123930605d562969cd7315fcd url: "https://pub.dev" source: hosted - version: "1.3.50" + version: "1.3.51" _macros: dependency: transitive description: dart @@ -34,10 +34,10 @@ packages: dependency: transitive description: name: altive_lints - sha256: "910021271a39aee964fd453726daa7d1077fbb2024384ba325ba4255e2c17f01" + sha256: "2b4d1475e2e36b7f864f9197530b0b6e004a2c7de00799a61896404f77c3ba2d" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" analyzer: dependency: transitive description: @@ -82,10 +82,10 @@ packages: dependency: transitive description: name: app_settings - sha256: "09bc7fe0313a507087bec1a3baf555f0576e816a760cbb31813a88890a09d9e5" + sha256: "476df1d85cec143c3d27dd1c7451629a59c0c5ccf70a0adcbfa92a0a2d928705" url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "5.2.0" appkit_ui_element_colors: dependency: transitive description: @@ -154,26 +154,26 @@ packages: dependency: transitive description: name: build_daemon - sha256: "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948" + sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa" url: "https://pub.dev" source: hosted - version: "4.0.3" + version: "4.0.4" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e" + sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0 url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.4" build_runner: dependency: transitive description: name: build_runner - sha256: "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573" + sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99" url: "https://pub.dev" source: hosted - version: "2.4.14" + version: "2.4.15" build_runner_core: dependency: transitive description: @@ -362,10 +362,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820" url: "https://pub.dev" source: hosted - version: "2.3.7" + version: "2.3.8" dartx: dependency: transitive description: @@ -402,10 +402,10 @@ packages: dependency: transitive description: name: device_info_plus - sha256: b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544 + sha256: "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da" url: "https://pub.dev" source: hosted - version: "11.2.1" + version: "11.3.0" device_info_plus_platform_interface: dependency: transitive description: @@ -418,18 +418,18 @@ packages: dependency: transitive description: name: dio - sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260" + sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9" url: "https://pub.dev" source: hosted - version: "5.7.0" + version: "5.8.0+1" dio_web_adapter: dependency: transitive description: name: dio_web_adapter - sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" + sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" dynamic_color: dependency: transitive description: @@ -479,7 +479,7 @@ packages: source: hosted version: "2.1.3" file: - dependency: "direct overridden" + dependency: transitive description: name: file sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 @@ -490,66 +490,66 @@ packages: dependency: transitive description: name: file_picker - sha256: cacfdc5abe93e64d418caa9256eef663499ad791bb688d9fd12c85a311968fba + sha256: ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810 url: "https://pub.dev" source: hosted - version: "8.3.2" + version: "8.3.7" firebase_analytics: dependency: transitive description: name: firebase_analytics - sha256: eac382bbcd5ae78c1d1ce5619d13f5a7424429f4bf55df9e3ad5110da34d1060 + sha256: "47428047a0778f72af53a3c7cb5d556e1cb25e2327cc8aa40d544971dc6245b2" url: "https://pub.dev" source: hosted - version: "11.4.1" + version: "11.4.2" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface - sha256: a34db46c367265c4c961626e4b128bfb7b7e50958e7add4c27ba103f5f81b9b0 + sha256: "1076f4b041f76143e14878c70f0758f17fe5910c0cd992db9e93bd3c3584512b" url: "https://pub.dev" source: hosted - version: "4.3.1" + version: "4.3.2" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web - sha256: b6b4cef08e45e4c7d48476d9fc49fe9577081809a59026fe95b1a1b1eea165fa + sha256: "8f6dd64ea6d28b7f5b9e739d183a9e1c7f17027794a3e9aba1879621d42426ef" url: "https://pub.dev" source: hosted - version: "0.5.10+7" + version: "0.5.10+8" firebase_app_installations: dependency: transitive description: name: firebase_app_installations - sha256: f30081592a258f69080297e8f8070ae1fbed121a70db396d57023546fe98fe59 + sha256: "8aed716c98e15c529f66544008b52d61c6f09888c21696a84ad3b31647f7b2c5" url: "https://pub.dev" source: hosted - version: "0.3.2+1" + version: "0.3.2+2" firebase_app_installations_platform_interface: dependency: transitive description: name: firebase_app_installations_platform_interface - sha256: cde086a58766b1669e4a4f02bc29fde5bbec414945a73e062803fdb05f779daf + sha256: "3e3a7a3444e52578f99160078d2723fca44d0e0888138c41ace918de6c90fcaa" url: "https://pub.dev" source: hosted - version: "0.1.4+49" + version: "0.1.4+50" firebase_app_installations_web: dependency: transitive description: name: firebase_app_installations_web - sha256: ec977483fab7aae69faf3c7bf9dcd72cc3b25f7ee5fffdeb0c52f3e597be0368 + sha256: "3beab3774036fe9896c4474907f02b87beb6829a71bae369aa4d9ef5d75c686b" url: "https://pub.dev" source: hosted - version: "0.1.6+7" + version: "0.1.6+8" firebase_core: dependency: transitive description: name: firebase_core - sha256: d851c1ca98fd5a4c07c747f8c65dacc2edd84a4d9ac055d32a5f0342529069f5 + sha256: "93dc4dd12f9b02c5767f235307f609e61ed9211047132d07f9e02c668f0bfc33" url: "https://pub.dev" source: hosted - version: "3.10.1" + version: "3.11.0" firebase_core_platform_interface: dependency: transitive description: @@ -562,50 +562,50 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: fbc008cf390d909b823763064b63afefe9f02d8afdb13eb3f485b871afee956b + sha256: "0e13c80f0de8acaa5d0519cbe23c8b4cc138a2d5d508b5755c861bdfc9762678" url: "https://pub.dev" source: hosted - version: "2.19.0" + version: "2.20.0" firebase_crashlytics: dependency: transitive description: name: firebase_crashlytics - sha256: f3e8fc2ffc7b43b18e9a533976b4cef6af3021b7aabc4115ab9ff11dd24ca15d + sha256: "6273ed71bcd8a6fb4d0ca13d3abddbb3301796807efaad8782b5f90156f26f03" url: "https://pub.dev" source: hosted - version: "4.3.1" + version: "4.3.2" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: ed90e2971d20989bcec77e99eda7d24d4b08f45053525c9189e1386e2ced0ef3 + sha256: "94f3986e1a10e5a883f2ad5e3d719aef98a8a0f9a49357f6e45b7d3696ea6a97" url: "https://pub.dev" source: hosted - version: "3.8.1" + version: "3.8.2" firebase_messaging: dependency: transitive description: name: firebase_messaging - sha256: e20ea2a0ecf9b0971575ab3ab42a6e285a94e50092c555b090c1a588a81b4d54 + sha256: "3dee3b0cbfe719e64773cb7d1cad57c58b2235a8c136f5715fe733a54058c783" url: "https://pub.dev" source: hosted - version: "15.2.1" + version: "15.2.2" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: c57a92b5ae1857ef4fe4ae2e73452b44d32e984e15ab8b53415ea1bb514bdabd + sha256: e9ea726b9bb864fc6223bb66422bd9877b9973ae51967754a769b0d01e201c1e url: "https://pub.dev" source: hosted - version: "4.6.1" + version: "4.6.2" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "83694a990d8525d6b01039240b97757298369622ca0253ad0ebcfed221bf8ee0" + sha256: "5f7b40e8bf861a37f8b8196e347d8a919750421a45f0b45d1bb74e98fa72726e" url: "https://pub.dev" source: hosted - version: "3.10.1" + version: "3.10.2" fixnum: dependency: transitive description: @@ -639,18 +639,18 @@ packages: dependency: transitive description: name: flutter_gen_core - sha256: "46ecf0e317413dd065547887c43f93f55e9653e83eb98dc13dd07d40dd225325" + sha256: "53890b653738f34363d9f0d40f82104c261716bd551d3ba65f648770b6764c21" url: "https://pub.dev" source: hosted - version: "5.8.0" + version: "5.9.0" flutter_gen_runner: dependency: transitive description: name: flutter_gen_runner - sha256: "77f0a02fc30d9fcf2549fe874eb3fde091435724904bcbb1af60aa40cbfab1f4" + sha256: de70b42eb5329f712c8b041069d081ad5fb5109f32d6d1ea9c1b39596786215d url: "https://pub.dev" source: hosted - version: "5.8.0" + version: "5.9.0" flutter_hooks: dependency: transitive description: @@ -708,10 +708,10 @@ packages: dependency: transitive description: name: flutter_markdown - sha256: e37f4c69a07b07bb92622ef6b131a53c9aae48f64b176340af9e8e5238718487 + sha256: e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5 url: "https://pub.dev" source: hosted - version: "0.7.5" + version: "0.7.6+2" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -838,10 +838,10 @@ packages: dependency: transitive description: name: geolocator_apple - sha256: "6154ea2682563f69fc0125762ed7e91e7ed85d0b9776595653be33918e064807" + sha256: c4ecead17985ede9634f21500072edfcb3dba0ef7b97f8d7bc556d2d722b3ba3 url: "https://pub.dev" source: hosted - version: "2.3.8+1" + version: "2.3.9" geolocator_platform_interface: dependency: transitive description: @@ -870,26 +870,26 @@ packages: dependency: transitive description: name: glob - sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" go_router: dependency: transitive description: name: go_router - sha256: "7c2d40b59890a929824f30d442e810116caf5088482629c894b9e4478c67472d" + sha256: "04539267a740931c6d4479a10d466717ca5901c6fdfd3fcda09391bbb8ebd651" url: "https://pub.dev" source: hosted - version: "14.6.3" + version: "14.8.0" go_router_builder: dependency: transitive description: name: go_router_builder - sha256: "293e366566c209f70a05508bb5fdd6ce536fa3f75e58ccba1f83341a7943a6be" + sha256: "8f2c92accbd2d335a25ec7273d01d74d594aa272609c8975781f50d8e0db68e1" url: "https://pub.dev" source: hosted - version: "2.7.3" + version: "2.8.0" google_fonts: dependency: transitive description: @@ -1038,10 +1038,10 @@ packages: dependency: transitive description: name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.7.2" json_annotation: dependency: transitive description: @@ -1118,10 +1118,10 @@ packages: dependency: transitive description: name: macos_ui - sha256: "1238bafdc3a60d122f20e1c3d62ad944af49bf09e8b85df2e48b75e8ddbbfd54" + sha256: "80577957bc5860ee5ff70a69f7c9eb75fde170c075e0ad4c31d6f0006d6cf36a" url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.1.9" macos_window_utils: dependency: transitive description: @@ -1167,10 +1167,10 @@ packages: dependency: transitive description: name: maps_toolkit - sha256: "277877f9505208acacd2a0794ef190e836a5ffee58ebc8efc5b9ca8de50e3e2f" + sha256: ea5915a8e66737471030cd3e44ba688cc45b932972d1a3b485eaa57c4b68ec28 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.0" markdown: dependency: transitive description: @@ -1247,10 +1247,10 @@ packages: dependency: transitive description: name: os_detect - sha256: e704fb99aa30b2b9a284d87a28eef9ba262f68c25c963d5eb932f54cad07784f + sha256: "7d87c0dd98c6faf110d5aa498e9a6df02ffce4bb78cc9cfc8ad02929be9bb71f" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" package_config: dependency: transitive description: @@ -1263,18 +1263,18 @@ packages: dependency: transitive description: name: package_info_plus - sha256: "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790" + sha256: "67eae327b1b0faf761964a1d2e5d323c797f3799db0e85aa232db8d9e922bc35" url: "https://pub.dev" source: hosted - version: "8.1.3" + version: "8.2.1" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b + sha256: "205ec83335c2ab9107bbba3f8997f9356d72ca3c715d2f038fc773d0366b4c76" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.1.0" path: dependency: transitive description: @@ -1343,10 +1343,10 @@ packages: dependency: transitive description: name: pedantic_mono - sha256: "23b8ce74610b7397363c314cd0dc0f21d175f44f4429b3b2bcc9305c3549bb19" + sha256: "1bc63290d6a97db7c4cc996870f04d05cae1025b29cee831d26281583d0a6acb" url: "https://pub.dev" source: hosted - version: "1.29.0" + version: "1.30.2" permission_handler: dependency: transitive description: @@ -1399,10 +1399,10 @@ packages: dependency: transitive description: name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646" url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "6.1.0" platform: dependency: transitive description: @@ -1519,10 +1519,10 @@ packages: dependency: transitive description: name: purchases_flutter - sha256: "212fee326137166714f541a57225effdca053b06185d38f696bcd16596a5cb5a" + sha256: "63711ef3716779d4a38ea7bfaa57673d294eecc43ac654438c1db04bf5e72f20" url: "https://pub.dev" source: hosted - version: "8.4.2" + version: "8.4.6" retrofit: dependency: transitive description: @@ -1532,14 +1532,13 @@ packages: source: hosted version: "4.4.2" retrofit_generator: - dependency: "direct overridden" + dependency: transitive description: - path: generator - ref: master - resolved-ref: "105dc73aaf1fa3590f66928588684f975a16c49c" - url: "https://github.com/YumNumm/retrofit.dart.git" - source: git - version: "9.1.6" + name: retrofit_generator + sha256: "218c04c96b45c545a5de95bc91b05efdaa2d6ebe7894fe1f96b805536168afdf" + url: "https://pub.dev" + source: hosted + version: "9.1.9" riverpod: dependency: transitive description: @@ -1624,18 +1623,18 @@ packages: dependency: transitive description: name: shared_preferences - sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a + sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.5.2" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "138b7bbbc7f59c56236e426c37afb8f78cbc57b094ac64c440e0bb90e380a4f5" + sha256: ea86be7b7114f9e94fddfbb52649e59a03d6627ccd2387ebddcd6624719e9f16 url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.5" shared_preferences_foundation: dependency: transitive description: @@ -1713,10 +1712,10 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 + sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" sky_engine: dependency: transitive description: flutter @@ -1822,42 +1821,42 @@ packages: dependency: transitive description: name: synchronized - sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" + sha256: "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6" url: "https://pub.dev" source: hosted - version: "3.3.0+3" + version: "3.3.1" talker: dependency: transitive description: name: talker - sha256: "71dcd28543c04ca517ac6171d78b7953ab8f9be95a0a4248795f45f267950593" + sha256: a67ee21b020c060efefd18dd0d8c52c9d670eb6089c227f22136c6ff09454b0a url: "https://pub.dev" source: hosted - version: "4.6.6" + version: "4.6.11" talker_dio_logger: dependency: transitive description: name: talker_dio_logger - sha256: "63ac8e1e3bbfd24010183f771e091a29d2ff5f915e7bf86d913b9c582d29a1ca" + sha256: "4056724cdae03249093a19bdac788285432ff30075e1d8aea65b0ef893d12281" url: "https://pub.dev" source: hosted - version: "4.6.6" + version: "4.6.11" talker_flutter: dependency: transitive description: name: talker_flutter - sha256: "692dde0939ae0837f05b75f06d385a4055657461228860f9c3a2a10e42d2b60d" + sha256: "3f6f0d6637de38824055feff34a7705a664e5108e441fafa93422b4229b014ff" url: "https://pub.dev" source: hosted - version: "4.6.6" + version: "4.6.11" talker_logger: dependency: transitive description: name: talker_logger - sha256: "3f8315cc46f17c8022dfb237b7e291fb7a941ce4c8865ecbe1b94f7fcb3038f4" + sha256: "73e0b40f60ff334216c054b11b75d94d18600abd50e9ff46b7e859c3705b86a6" url: "https://pub.dev" source: hosted - version: "4.6.6" + version: "4.6.11" term_glyph: dependency: transitive description: @@ -1870,10 +1869,10 @@ packages: dependency: transitive description: name: test - sha256: "8391fbe68d520daf2314121764d38e37f934c02fd7301ad18307bd93bd6b725d" + sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e" url: "https://pub.dev" source: hosted - version: "1.25.14" + version: "1.25.15" test_api: dependency: transitive description: @@ -2094,10 +2093,10 @@ packages: dependency: transitive description: name: win32 - sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29" + sha256: daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.10.1" win32_registry: dependency: transitive description: @@ -2142,10 +2141,10 @@ packages: dependency: transitive description: name: yumemi_lints - sha256: "8e60bc1855df642376b6f6caf561a15e5702c711a63e9638dd3bce56f01cafcc" + sha256: ecc631dfbbcf6c3af99fd63c2af5307a9c49ac5ac0d05ecc071cb7bc67d402a1 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.0" sdks: dart: ">=3.7.0 <4.0.0" flutter: ">=3.29.0" diff --git a/pubspec.yaml b/pubspec.yaml index 46505bb8..2ec48181 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -26,18 +26,6 @@ workspace: # dependencies: melos: ^7.0.0-dev.7 -dependency_overrides: - # `yumemi_lints` の `file` 依存関係が `file` 6.xになっているため、 - # 強制的に `file` 7.x を依存関係に追加する - # (jma_code_table_converter_internal の `file` 依存関係が 7.x になっているため) - # cf. https://github.com/yumemi-inc/flutter-yumemi-lints/issues/138s - file: ^7.0.1 - # waiting for merge https://github.com/trevorwang/retrofit.dart/pull/736 - retrofit_generator: - git: - url: https://github.com/YumNumm/retrofit.dart.git - ref: master - path: generator melos: repository: https://github.com/YumNumm/EQMonitor sdkPath: .fvm/flutter_sdk/ From 7463f24c38e29eaf055699cab96a2b2aef5db9e1 Mon Sep 17 00:00:00 2001 From: YumNumm Date: Mon, 17 Feb 2025 00:21:03 +0900 Subject: [PATCH 5/7] update dependencies --- app/pubspec.yaml | 8 ++--- pubspec.lock | 81 ++++++++++++++++++++---------------------------- 2 files changed, 38 insertions(+), 51 deletions(-) diff --git a/app/pubspec.yaml b/app/pubspec.yaml index ea6c3ee0..b5cb38ac 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: extensions: path: ../packages/extensions feedback: ^3.1.0 - file_picker: ^8.3.2 + file_picker: ^9.0.0 firebase_analytics: ^11.3.6 firebase_app_installations: ^0.3.1 firebase_core: ^3.8.1 @@ -39,7 +39,7 @@ dependencies: flutter: sdk: flutter flutter_colorpicker: ^1.1.0 - flutter_email_sender: ^6.0.3 + flutter_email_sender: ^7.0.0 flutter_hooks: ^0.20.5 flutter_html: ^3.0.0-alpha.2 flutter_local_notifications: ^18.0.1 @@ -112,10 +112,10 @@ dependencies: dev_dependencies: altive_lints: ^1.16.0 - analyzer: ^6.11.0 + analyzer: ^7.3.0 build_runner: ^2.4.13 custom_lint: ^0.7.0 - dependency_validator: ^4.1.2 + dependency_validator: ^5.0.2 eqmonitor_lints: path: ../packages/eqmonitor_lints fake_async: ^1.3.1 diff --git a/pubspec.lock b/pubspec.lock index 2b92f519..d4a1446f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" + sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57 url: "https://pub.dev" source: hosted - version: "76.0.0" + version: "80.0.0" _flutterfire_internals: dependency: transitive description: @@ -17,11 +17,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.51" - _macros: - dependency: transitive - description: dart - source: sdk - version: "0.3.3" adaptive_dialog: dependency: transitive description: @@ -42,18 +37,18 @@ packages: dependency: transitive description: name: analyzer - sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" + sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e" url: "https://pub.dev" source: hosted - version: "6.11.0" + version: "7.3.0" analyzer_plugin: dependency: transitive description: name: analyzer_plugin - sha256: "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161" + sha256: "1d460d14e3c2ae36dc2b32cef847c4479198cf87704f63c3c3c8150ee50c3916" url: "https://pub.dev" source: hosted - version: "0.11.3" + version: "0.12.0" animations: dependency: transitive description: @@ -330,42 +325,42 @@ packages: dependency: transitive description: name: custom_lint - sha256: "3486c470bb93313a9417f926c7dd694a2e349220992d7b9d14534dc49c15bba9" + sha256: "021897cce2b6c783b2521543e362e7fe1a2eaab17bf80514d8de37f99942ed9e" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.3" custom_lint_builder: dependency: transitive description: name: custom_lint_builder - sha256: "42cdc41994eeeddab0d7a722c7093ec52bd0761921eeb2cbdbf33d192a234759" + sha256: e4235b9d8cef59afe621eba086d245205c8a0a6c70cd470be7cb17494d6df32d url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.3" custom_lint_core: dependency: transitive description: name: custom_lint_core - sha256: "02450c3e45e2a6e8b26c4d16687596ab3c4644dd5792e3313aa9ceba5a49b7f5" + sha256: "6dcee8a017181941c51a110da7e267c1d104dc74bec8862eeb8c85b5c8759a9e" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.1" custom_lint_visitor: dependency: transitive description: name: custom_lint_visitor - sha256: bfe9b7a09c4775a587b58d10ebb871d4fe618237639b1e84d5ec62d7dfef25f9 + sha256: "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8" url: "https://pub.dev" source: hosted - version: "1.0.0+6.11.0" + version: "1.0.0+7.3.0" dart_style: dependency: transitive description: name: dart_style - sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820" + sha256: "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac" url: "https://pub.dev" source: hosted - version: "2.3.8" + version: "3.0.1" dartx: dependency: transitive description: @@ -394,10 +389,10 @@ packages: dependency: transitive description: name: dependency_validator - sha256: d27143159d8c2e83bf33e794e3e642c14fd888e2da8f512e6ad38bc854bbf3ec + sha256: "3a243f5b9def5f902887a66fbea7e72e612eee956af6c8c34d382fe6d5484145" url: "https://pub.dev" source: hosted - version: "4.1.2" + version: "5.0.2" device_info_plus: dependency: transitive description: @@ -490,10 +485,10 @@ packages: dependency: transitive description: name: file_picker - sha256: ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810 + sha256: "6f6bfa8797f296965bdc3e1f702574ab49a540c19b9237b401e7c2b25dfe594c" url: "https://pub.dev" source: hosted - version: "8.3.7" + version: "9.0.0" firebase_analytics: dependency: transitive description: @@ -631,10 +626,10 @@ packages: dependency: transitive description: name: flutter_email_sender - sha256: fb515d4e073d238d0daf1d765e5318487b6396d46b96e0ae9745dbc9a133f97a + sha256: d39eb5e91358fc19ec4050da69accec21f9d5b2b6bcf188aa246327b6ca2352c url: "https://pub.dev" source: hosted - version: "6.0.3" + version: "7.0.0" flutter_gen_core: dependency: transitive description: @@ -790,10 +785,10 @@ packages: dependency: transitive description: name: freezed - sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e" + sha256: "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c" url: "https://pub.dev" source: hosted - version: "2.5.7" + version: "2.5.8" freezed_annotation: dependency: transitive description: @@ -1054,10 +1049,10 @@ packages: dependency: transitive description: name: json_serializable - sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c + sha256: "81f04dee10969f89f604e1249382d46b97a1ccad53872875369622b5bfc9e58a" url: "https://pub.dev" source: hosted - version: "6.9.0" + version: "6.9.4" latlong2: dependency: transitive description: @@ -1130,14 +1125,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.6.1" - macros: - dependency: transitive - description: - name: macros - sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" - url: "https://pub.dev" - source: hosted - version: "0.1.3-main.0" maplibre_gl: dependency: transitive description: @@ -1551,10 +1538,10 @@ packages: dependency: transitive description: name: riverpod_analyzer_utils - sha256: c6b8222b2b483cb87ae77ad147d6408f400c64f060df7a225b127f4afef4f8c8 + sha256: "837a6dc33f490706c7f4632c516bcd10804ee4d9ccc8046124ca56388715fdf3" url: "https://pub.dev" source: hosted - version: "0.5.8" + version: "0.5.9" riverpod_annotation: dependency: transitive description: @@ -1567,18 +1554,18 @@ packages: dependency: transitive description: name: riverpod_generator - sha256: "63546d70952015f0981361636bf8f356d9cfd9d7f6f0815e3c07789a41233188" + sha256: "120d3310f687f43e7011bb213b90a436f1bbc300f0e4b251a72c39bccb017a4f" url: "https://pub.dev" source: hosted - version: "2.6.3" + version: "2.6.4" riverpod_lint: dependency: transitive description: name: riverpod_lint - sha256: "83e4caa337a9840469b7b9bd8c2351ce85abad80f570d84146911b32086fbd99" + sha256: b05408412b0f75dec954e032c855bc28349eeed2d2187f94519e1ddfdf8b3693 url: "https://pub.dev" source: hosted - version: "2.6.3" + version: "2.6.4" rxdart: dependency: transitive description: @@ -1733,10 +1720,10 @@ packages: dependency: transitive description: name: source_gen - sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b" url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "2.0.0" source_helper: dependency: transitive description: From 5f7fb2dee8c7d5c89d65c0dc51463303447b66af Mon Sep 17 00:00:00 2001 From: YumNumm Date: Mon, 17 Feb 2025 00:21:16 +0900 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20Android=E3=81=AEDeepLink=E3=83=8F?= =?UTF-8?q?=E3=83=B3=E3=83=89=E3=83=AA=E3=83=B3=E3=82=B0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/android/app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml index 8d3e5567..7df8c459 100644 --- a/app/android/app/src/main/AndroidManifest.xml +++ b/app/android/app/src/main/AndroidManifest.xml @@ -42,7 +42,7 @@ android:enableOnBackInvokedCallback="true" android:directBootAware="true"> - + From db6b0a9d2866198565097b6c4410632b30d733b6 Mon Sep 17 00:00:00 2001 From: YumNumm Date: Mon, 17 Feb 2025 00:21:24 +0900 Subject: [PATCH 7/7] enable SwiftPM --- app/ios/Podfile.lock | 349 +----------------- app/ios/Runner.xcodeproj/project.pbxproj | 24 +- .../xcshareddata/swiftpm/Package.resolved | 58 ++- .../xcshareddata/xcschemes/Runner.xcscheme | 1 + .../xcshareddata/swiftpm/Package.resolved | 58 ++- 5 files changed, 123 insertions(+), 367 deletions(-) diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock index a0a865b7..73043c03 100644 --- a/app/ios/Podfile.lock +++ b/app/ios/Podfile.lock @@ -1,399 +1,66 @@ PODS: - - app_settings (5.1.1): - - Flutter - background_task (0.0.1): - Flutter - - device_info_plus (0.0.1): - - Flutter - - DKImagePickerController/Core (4.3.9): - - DKImagePickerController/ImageDataManager - - DKImagePickerController/Resource - - DKImagePickerController/ImageDataManager (4.3.9) - - DKImagePickerController/PhotoGallery (4.3.9): - - DKImagePickerController/Core - - DKPhotoGallery - - DKImagePickerController/Resource (4.3.9) - - DKPhotoGallery (0.0.19): - - DKPhotoGallery/Core (= 0.0.19) - - DKPhotoGallery/Model (= 0.0.19) - - DKPhotoGallery/Preview (= 0.0.19) - - DKPhotoGallery/Resource (= 0.0.19) - - SDWebImage - - SwiftyGif - - DKPhotoGallery/Core (0.0.19): - - DKPhotoGallery/Model - - DKPhotoGallery/Preview - - SDWebImage - - SwiftyGif - - DKPhotoGallery/Model (0.0.19): - - SDWebImage - - SwiftyGif - - DKPhotoGallery/Preview (0.0.19): - - DKPhotoGallery/Model - - DKPhotoGallery/Resource - - SDWebImage - - SwiftyGif - - DKPhotoGallery/Resource (0.0.19): - - SDWebImage - - SwiftyGif - - file_picker (0.0.1): - - DKImagePickerController/PhotoGallery - - Flutter - - Firebase/Analytics (11.6.0): - - Firebase/Core - - Firebase/Core (11.6.0): - - Firebase/CoreOnly - - FirebaseAnalytics (~> 11.6.0) - - Firebase/CoreOnly (11.6.0): - - FirebaseCore (~> 11.6.0) - - Firebase/Crashlytics (11.6.0): - - Firebase/CoreOnly - - FirebaseCrashlytics (~> 11.6.0) - - Firebase/Installations (11.6.0): - - Firebase/CoreOnly - - FirebaseInstallations (~> 11.6.0) - - Firebase/Messaging (11.6.0): - - Firebase/CoreOnly - - FirebaseMessaging (~> 11.6.0) - - firebase_analytics (11.4.1): - - Firebase/Analytics (= 11.6.0) - - firebase_core - - Flutter - - firebase_app_installations (0.3.2-1): - - Firebase/Installations (= 11.6.0) - - firebase_core - - Flutter - - firebase_core (3.10.1): - - Firebase/CoreOnly (= 11.6.0) - - Flutter - - firebase_crashlytics (4.3.1): - - Firebase/Crashlytics (= 11.6.0) - - firebase_core - - Flutter - - firebase_messaging (15.2.1): - - Firebase/Messaging (= 11.6.0) - - firebase_core - - Flutter - - FirebaseAnalytics (11.6.0): - - FirebaseAnalytics/AdIdSupport (= 11.6.0) - - FirebaseCore (~> 11.6.0) - - FirebaseInstallations (~> 11.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.6.0): - - FirebaseCore (~> 11.6.0) - - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.6.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - FirebaseCore (11.6.0): - - FirebaseCoreInternal (~> 11.6.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.6.0): - - FirebaseCore (~> 11.6.0) - - FirebaseCoreInternal (11.6.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseCrashlytics (11.6.0): - - FirebaseCore (~> 11.6.0) - - FirebaseInstallations (~> 11.0) - - FirebaseRemoteConfigInterop (~> 11.0) - - FirebaseSessions (~> 11.0) - - GoogleDataTransport (~> 10.0) - - GoogleUtilities/Environment (~> 8.0) - - nanopb (~> 3.30910.0) - - PromisesObjC (~> 2.4) - - FirebaseInstallations (11.6.0): - - FirebaseCore (~> 11.6.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - PromisesObjC (~> 2.4) - - FirebaseMessaging (11.6.0): - - FirebaseCore (~> 11.6.0) - - FirebaseInstallations (~> 11.0) - - GoogleDataTransport (~> 10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Reachability (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - nanopb (~> 3.30910.0) - - FirebaseRemoteConfigInterop (11.8.0) - - FirebaseSessions (11.6.0): - - FirebaseCore (~> 11.6.0) - - FirebaseCoreExtension (~> 11.6.0) - - FirebaseInstallations (~> 11.0) - - GoogleDataTransport (~> 10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) - - nanopb (~> 3.30910.0) - - PromisesSwift (~> 2.1) - Flutter (1.0.0) - - flutter_email_sender (0.0.1): - - Flutter - flutter_local_notifications (0.0.1): - Flutter - - flutter_secure_storage_darwin (10.0.0): - - Flutter - - FlutterMacOS - geolocator_apple (1.2.0): - Flutter - - GoogleAppMeasurement (11.6.0): - - GoogleAppMeasurement/AdIdSupport (= 11.6.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.6.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.6.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.6.0): - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/MethodSwizzler (~> 8.0) - - GoogleUtilities/Network (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - nanopb (~> 3.30910.0) - - GoogleDataTransport (10.1.0): - - nanopb (~> 3.30910.0) - - PromisesObjC (~> 2.4) - - GoogleUtilities/AppDelegateSwizzler (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.0.2): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/MethodSwizzler (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.0.2): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Privacy - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.0.2)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/Reachability (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.0.2): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - in_app_review (2.0.0): - - Flutter - - MapLibre (6.10.0) - - maplibre_gl (0.0.1): - - Flutter - - MapLibre (= 6.10.0) - - nanopb (3.30910.0): - - nanopb/decode (= 3.30910.0) - - nanopb/encode (= 3.30910.0) - - nanopb/decode (3.30910.0) - - nanopb/encode (3.30910.0) - - package_info_plus (0.4.5): - - Flutter - - path_provider_foundation (0.0.1): - - Flutter - - FlutterMacOS - permission_handler_apple (9.3.0): - Flutter - - pointer_interceptor_ios (0.0.1): - - Flutter - - PromisesObjC (2.4.0) - - PromisesSwift (2.4.0): - - PromisesObjC (= 2.4.0) - - purchases_flutter (8.4.2): - - Flutter - - PurchasesHybridCommon (= 13.15.2) - - PurchasesHybridCommon (13.15.2): - - RevenueCat (= 5.14.5) - - RevenueCat (5.14.5) - - SDWebImage (5.20.0): - - SDWebImage/Core (= 5.20.0) - - SDWebImage/Core (5.20.0) - - share_plus (0.0.1): + - purchases_flutter (8.4.6): - Flutter + - PurchasesHybridCommon (= 13.17.1) + - PurchasesHybridCommon (13.17.1): + - RevenueCat (= 5.16.1) + - RevenueCat (5.16.1) - shared_preference_app_group (1.0.0): - Flutter - - shared_preferences_foundation (0.0.1): - - Flutter - - FlutterMacOS - SwiftProtobuf (1.28.2) - - SwiftyGif (5.4.5) - - url_launcher_ios (0.0.1): - - Flutter DEPENDENCIES: - - app_settings (from `.symlinks/plugins/app_settings/ios`) - background_task (from `.symlinks/plugins/background_task/ios`) - - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - - file_picker (from `.symlinks/plugins/file_picker/ios`) - - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`) - - firebase_app_installations (from `.symlinks/plugins/firebase_app_installations/ios`) - - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`) - - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - Flutter (from `Flutter`) - - flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`) - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`) - - in_app_review (from `.symlinks/plugins/in_app_review/ios`) - - maplibre_gl (from `.symlinks/plugins/maplibre_gl/ios`) - - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`) - purchases_flutter (from `.symlinks/plugins/purchases_flutter/ios`) - - share_plus (from `.symlinks/plugins/share_plus/ios`) - shared_preference_app_group (from `.symlinks/plugins/shared_preference_app_group/ios`) - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - SwiftProtobuf - - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) SPEC REPOS: trunk: - - DKImagePickerController - - DKPhotoGallery - - Firebase - - FirebaseAnalytics - - FirebaseCore - - FirebaseCoreExtension - - FirebaseCoreInternal - - FirebaseCrashlytics - - FirebaseInstallations - - FirebaseMessaging - - FirebaseRemoteConfigInterop - - FirebaseSessions - - GoogleAppMeasurement - - GoogleDataTransport - - GoogleUtilities - - MapLibre - - nanopb - - PromisesObjC - - PromisesSwift - PurchasesHybridCommon - RevenueCat - - SDWebImage - SwiftProtobuf - - SwiftyGif EXTERNAL SOURCES: - app_settings: - :path: ".symlinks/plugins/app_settings/ios" background_task: :path: ".symlinks/plugins/background_task/ios" - device_info_plus: - :path: ".symlinks/plugins/device_info_plus/ios" - file_picker: - :path: ".symlinks/plugins/file_picker/ios" - firebase_analytics: - :path: ".symlinks/plugins/firebase_analytics/ios" - firebase_app_installations: - :path: ".symlinks/plugins/firebase_app_installations/ios" - firebase_core: - :path: ".symlinks/plugins/firebase_core/ios" - firebase_crashlytics: - :path: ".symlinks/plugins/firebase_crashlytics/ios" - firebase_messaging: - :path: ".symlinks/plugins/firebase_messaging/ios" Flutter: :path: Flutter - flutter_email_sender: - :path: ".symlinks/plugins/flutter_email_sender/ios" flutter_local_notifications: :path: ".symlinks/plugins/flutter_local_notifications/ios" - flutter_secure_storage_darwin: - :path: ".symlinks/plugins/flutter_secure_storage_darwin/darwin" geolocator_apple: :path: ".symlinks/plugins/geolocator_apple/ios" - in_app_review: - :path: ".symlinks/plugins/in_app_review/ios" - maplibre_gl: - :path: ".symlinks/plugins/maplibre_gl/ios" - package_info_plus: - :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_foundation: - :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" - pointer_interceptor_ios: - :path: ".symlinks/plugins/pointer_interceptor_ios/ios" purchases_flutter: :path: ".symlinks/plugins/purchases_flutter/ios" - share_plus: - :path: ".symlinks/plugins/share_plus/ios" shared_preference_app_group: :path: ".symlinks/plugins/shared_preference_app_group/ios" - shared_preferences_foundation: - :path: ".symlinks/plugins/shared_preferences_foundation/darwin" - url_launcher_ios: - :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: - app_settings: 3507c575c2b18a462c99948f61d5de21d4420999 background_task: cb74890aa75be08c253c56017a2f0f6038d0879a - device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe - DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c - DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 - file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be - Firebase: 374a441a91ead896215703a674d58cdb3e9d772b - firebase_analytics: 8ad276088e4f9ba7dfc8dd6be4ee93a29673dde1 - firebase_app_installations: 8a78b8906822972d1d8bf3a28c02f700d598e60f - firebase_core: d3deb82d05dac4bc13190f9d1770787fd6a1cda4 - firebase_crashlytics: 4c7c77cf1825b70b031fef62e99441c3a423eaa2 - firebase_messaging: f27e82019a98ef3ea7e744b5b366fcd6b83e7f86 - FirebaseAnalytics: 7114c698cac995602e3b1b96663473e50d54d6e7 - FirebaseCore: 48b0dd707581cf9c1a1220da68223fb0a562afaa - FirebaseCoreExtension: 2d77d6430c16cf43ca2b04608302ed02b3598361 - FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2 - FirebaseCrashlytics: b21c665fb50138766480bce73ebdb1aa30f7f300 - FirebaseInstallations: efc0946fc756e4d22d8113f7c761948120322e8c - FirebaseMessaging: e1aca1fcc23e8b9eddb0e33f375ff90944623021 - FirebaseRemoteConfigInterop: 98897a64aa372eac3c5b3fe2816594ccfaac55ef - FirebaseSessions: 9529d14180868e29a8da164b3a729c036204918b Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_email_sender: 2397f5e84aaacfb61af569637a963e7c687858d8 flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4 - flutter_secure_storage_darwin: ce237a8775b39723566dc72571190a3769d70468 geolocator_apple: 1560c3c875af2a412242c7a923e15d0d401966ff - GoogleAppMeasurement: 6a9e6317b6a6d810ad03d4a66564ca6c4c5818a3 - GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - in_app_review: 5596fe56fab799e8edb3561c03d053363ab13457 - MapLibre: d668ed038aa3d139c6a305753c87cc2f62245b72 - maplibre_gl: 540da03f29263ce12bb506f31a6121e3c3fab5a8 - nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 - path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d - pointer_interceptor_ios: ec847ef8b0915778bed2b2cef636f4d177fa8eed - PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 - purchases_flutter: a3f9f057c0f437b8e9b4ed1985b2036d8aa95ec1 - PurchasesHybridCommon: 8af6bb6d85b794dc47ccef1b536ed0e677c789ea - RevenueCat: 4c0e809f7c7428cbe8d79cbb9a0dc7551e71e74e - SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8 - share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a + purchases_flutter: 9b781bb8f1fa7641bc72d0dcb13f57591e6b8d8f + PurchasesHybridCommon: 7ee74fefbad7fa42a74ff6e339af46fac3af4640 + RevenueCat: d38c56d5e1058f955ee7fce4ea7b18d126235e64 shared_preference_app_group: 7422922a188e05cf680a656e18e2786dcb5c58b3 - shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 SwiftProtobuf: 4dbaffec76a39a8dc5da23b40af1a5dc01a4c02d - SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 - url_launcher_ios: 694010445543906933d732453a59da0a173ae33d PODFILE CHECKSUM: d10447a9148f63b89692c9605e3219ee49461f0a diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj index bdd8252e..fc52ad1c 100644 --- a/app/ios/Runner.xcodeproj/project.pbxproj +++ b/app/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ @@ -239,7 +239,6 @@ 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 36D99A4FFFDCB9AC7C3D30F6 /* [CP] Embed Pods Frameworks */, 87297A6C4AB2DDF70C737CAF /* [CP] Copy Pods Resources */, - 53B5E92949D50C499299F4A3 /* [Firebase] Upload dSYM to Firebase Crashlytics */, F7A09193B49BB9278BA4B010 /* [firebase_crashlytics] Crashlytics Upload Symbols */, ); buildRules = ( @@ -357,25 +356,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; }; - 53B5E92949D50C499299F4A3 /* [Firebase] Upload dSYM to Firebase Crashlytics */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "[Firebase] Upload dSYM to Firebase Crashlytics"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "#!/bin/bash\n${PODS_PODFILE_DIR_PATH}/scripts/upload-symbols -gsp \"${PROJECT_DIR}/Runner/GoogleService-Info.plist\" -p ios \"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}\"\n"; - }; 6D62DB816AF65FF23B652099 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -473,7 +453,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"$PODS_ROOT/FirebaseCrashlytics/upload-symbols\" --flutter-project \"$PROJECT_DIR/firebase_app_id_file.json\" "; + shellScript = "\"${PROJECT_DIR}/scripts/upload-symbols\" --flutter-project \"$PROJECT_DIR/firebase_app_id_file.json\" \n"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6f416e83..0c931340 100644 --- a/app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -19,6 +19,33 @@ "version" : "11.2.0" } }, + { + "identity" : "dkcamera", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKCamera", + "state" : { + "branch" : "master", + "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96" + } + }, + { + "identity" : "dkimagepickercontroller", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKImagePickerController", + "state" : { + "branch" : "4.3.9", + "revision" : "0bdfeacefa308545adde07bef86e349186335915" + } + }, + { + "identity" : "dkphotogallery", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKPhotoGallery", + "state" : { + "branch" : "master", + "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d" + } + }, { "identity" : "firebase-ios-sdk", "kind" : "remoteSourceControl", @@ -33,8 +60,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/firebase/flutterfire", "state" : { - "revision" : "601aead3153bcd0adbd4a931edcab03f65031e64", - "version" : "3.10.1-firebase-core-swift" + "revision" : "886552b929a33e0dd0d51b6a1772c264f949652e", + "version" : "3.11.0-firebase-core-swift" } }, { @@ -136,6 +163,15 @@ "version" : "2.4.0" } }, + { + "identity" : "sdwebimage", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SDWebImage/SDWebImage", + "state" : { + "revision" : "10d06f6a33bafae8c164fbfd1f03391f6d4692b3", + "version" : "5.20.0" + } + }, { "identity" : "swift-protobuf", "kind" : "remoteSourceControl", @@ -144,6 +180,24 @@ "revision" : "ebc7251dd5b37f627c93698e4374084d98409633", "version" : "1.28.2" } + }, + { + "identity" : "swiftygif", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kirualex/SwiftyGif.git", + "state" : { + "revision" : "4430cbc148baa3907651d40562d96325426f409a", + "version" : "5.4.5" + } + }, + { + "identity" : "tocropviewcontroller", + "kind" : "remoteSourceControl", + "location" : "https://github.com/TimOliver/TOCropViewController", + "state" : { + "revision" : "a634cb7cdfd580006e79a6e74e64417fe9e9783b", + "version" : "2.7.4" + } } ], "version" : 3 diff --git a/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 8bd37ea7..d59665c5 100644 --- a/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -66,6 +66,7 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" + enableGPUValidationMode = "1" allowLocationSimulation = "YES" consoleMode = "0" structuredConsoleMode = "1"> diff --git a/app/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/app/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6f416e83..0c931340 100644 --- a/app/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/app/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -19,6 +19,33 @@ "version" : "11.2.0" } }, + { + "identity" : "dkcamera", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKCamera", + "state" : { + "branch" : "master", + "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96" + } + }, + { + "identity" : "dkimagepickercontroller", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKImagePickerController", + "state" : { + "branch" : "4.3.9", + "revision" : "0bdfeacefa308545adde07bef86e349186335915" + } + }, + { + "identity" : "dkphotogallery", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKPhotoGallery", + "state" : { + "branch" : "master", + "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d" + } + }, { "identity" : "firebase-ios-sdk", "kind" : "remoteSourceControl", @@ -33,8 +60,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/firebase/flutterfire", "state" : { - "revision" : "601aead3153bcd0adbd4a931edcab03f65031e64", - "version" : "3.10.1-firebase-core-swift" + "revision" : "886552b929a33e0dd0d51b6a1772c264f949652e", + "version" : "3.11.0-firebase-core-swift" } }, { @@ -136,6 +163,15 @@ "version" : "2.4.0" } }, + { + "identity" : "sdwebimage", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SDWebImage/SDWebImage", + "state" : { + "revision" : "10d06f6a33bafae8c164fbfd1f03391f6d4692b3", + "version" : "5.20.0" + } + }, { "identity" : "swift-protobuf", "kind" : "remoteSourceControl", @@ -144,6 +180,24 @@ "revision" : "ebc7251dd5b37f627c93698e4374084d98409633", "version" : "1.28.2" } + }, + { + "identity" : "swiftygif", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kirualex/SwiftyGif.git", + "state" : { + "revision" : "4430cbc148baa3907651d40562d96325426f409a", + "version" : "5.4.5" + } + }, + { + "identity" : "tocropviewcontroller", + "kind" : "remoteSourceControl", + "location" : "https://github.com/TimOliver/TOCropViewController", + "state" : { + "revision" : "a634cb7cdfd580006e79a6e74e64417fe9e9783b", + "version" : "2.7.4" + } } ], "version" : 3