From 68279b500691f0c7dfbd527525826549daa10b5e Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Fri, 12 Sep 2025 07:38:08 +1000 Subject: [PATCH 01/10] Update `colorist` for Riverpod 3 --- colorist/codelab_rebuild.yaml | 70 ++++---- colorist/step_01/lib/main.dart | 4 +- colorist/step_01/pubspec.yaml | 18 +- .../ios/Runner.xcodeproj/project.pbxproj | 132 +++++++-------- colorist/step_02/lib/providers/gemini.dart | 1 - colorist/step_02/lib/providers/gemini.g.dart | 160 +++++++++++++----- .../lib/services/gemini_chat_service.dart | 5 +- .../lib/services/gemini_chat_service.g.dart | 61 +++++-- .../macos/Runner.xcodeproj/project.pbxproj | 90 +++++----- colorist/step_02/pubspec.yaml | 22 +-- .../ios/Runner.xcodeproj/project.pbxproj | 132 +++++++-------- colorist/step_03/lib/providers/gemini.dart | 1 - colorist/step_03/lib/providers/gemini.g.dart | 160 +++++++++++++----- .../step_03/lib/providers/system_prompt.dart | 1 - .../lib/providers/system_prompt.g.dart | 50 ++++-- .../lib/services/gemini_chat_service.dart | 5 +- .../lib/services/gemini_chat_service.g.dart | 61 +++++-- .../macos/Runner.xcodeproj/project.pbxproj | 90 +++++----- colorist/step_03/pubspec.yaml | 22 +-- .../ios/Runner.xcodeproj/project.pbxproj | 132 +++++++-------- colorist/step_04/lib/providers/gemini.dart | 1 - colorist/step_04/lib/providers/gemini.g.dart | 160 +++++++++++++----- .../step_04/lib/providers/system_prompt.dart | 1 - .../lib/providers/system_prompt.g.dart | 50 ++++-- .../lib/services/gemini_chat_service.dart | 5 +- .../lib/services/gemini_chat_service.g.dart | 61 +++++-- .../step_04/lib/services/gemini_tools.dart | 1 - .../step_04/lib/services/gemini_tools.g.dart | 58 +++++-- .../macos/Runner.xcodeproj/project.pbxproj | 90 +++++----- colorist/step_04/pubspec.yaml | 22 +-- .../ios/Runner.xcodeproj/project.pbxproj | 132 +++++++-------- colorist/step_05/lib/providers/gemini.dart | 1 - colorist/step_05/lib/providers/gemini.g.dart | 160 +++++++++++++----- .../step_05/lib/providers/system_prompt.dart | 1 - .../lib/providers/system_prompt.g.dart | 50 ++++-- .../lib/services/gemini_chat_service.dart | 5 +- .../lib/services/gemini_chat_service.g.dart | 61 +++++-- .../step_05/lib/services/gemini_tools.dart | 9 +- .../step_05/lib/services/gemini_tools.g.dart | 58 +++++-- .../macos/Runner.xcodeproj/project.pbxproj | 90 +++++----- colorist/step_05/pubspec.yaml | 22 +-- .../ios/Runner.xcodeproj/project.pbxproj | 132 +++++++-------- colorist/step_06/lib/providers/gemini.dart | 1 - colorist/step_06/lib/providers/gemini.g.dart | 160 +++++++++++++----- .../step_06/lib/providers/system_prompt.dart | 1 - .../lib/providers/system_prompt.g.dart | 50 ++++-- .../lib/services/gemini_chat_service.dart | 10 +- .../lib/services/gemini_chat_service.g.dart | 61 +++++-- .../step_06/lib/services/gemini_tools.dart | 9 +- .../step_06/lib/services/gemini_tools.g.dart | 58 +++++-- .../macos/Runner.xcodeproj/project.pbxproj | 90 +++++----- colorist/step_06/pubspec.yaml | 22 +-- .../ios/Runner.xcodeproj/project.pbxproj | 132 +++++++-------- colorist/step_07/lib/providers/gemini.dart | 1 - colorist/step_07/lib/providers/gemini.g.dart | 160 +++++++++++++----- .../step_07/lib/providers/system_prompt.dart | 1 - .../lib/providers/system_prompt.g.dart | 50 ++++-- .../lib/services/gemini_chat_service.dart | 10 +- .../lib/services/gemini_chat_service.g.dart | 61 +++++-- .../step_07/lib/services/gemini_tools.dart | 9 +- .../step_07/lib/services/gemini_tools.g.dart | 58 +++++-- .../macos/Runner.xcodeproj/project.pbxproj | 90 +++++----- colorist/step_07/pubspec.yaml | 22 +-- 63 files changed, 2088 insertions(+), 1355 deletions(-) diff --git a/colorist/codelab_rebuild.yaml b/colorist/codelab_rebuild.yaml index c236170336..f18cdbfe78 100644 --- a/colorist/codelab_rebuild.yaml +++ b/colorist/codelab_rebuild.yaml @@ -96,8 +96,8 @@ steps: // A fake LLM that just echoes back what it receives. void sendMessage(String message, WidgetRef ref) { - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); chatStateNotifier.addUserMessage(message); logStateNotifier.logUserText(message); @@ -167,7 +167,6 @@ steps: import 'package:firebase_ai/firebase_ai.dart'; import 'package:firebase_core/firebase_core.dart'; - import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../firebase_options.dart'; @@ -207,7 +206,6 @@ steps: import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; - import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../providers/gemini.dart'; @@ -220,8 +218,8 @@ steps: Future sendMessage(String message) async { final chatSession = await ref.read(chatSessionProvider.future); - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); chatStateNotifier.addUserMessage(message); logStateNotifier.logUserText(message); @@ -298,8 +296,8 @@ steps: - - // A fake LLM that just echoes back what it receives. - void sendMessage(String message, WidgetRef ref) { - - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + - final chatStateNotifier = ref.read(chatStateProvider.notifier); + - final logStateNotifier = ref.read(logStateProvider.notifier); - - chatStateNotifier.addUserMessage(message); - logStateNotifier.logUserText(message); @@ -446,7 +444,6 @@ steps: // found in the LICENSE file. import 'package:flutter/services.dart'; - import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'system_prompt.g.dart'; @@ -457,9 +454,9 @@ steps: - name: Patch lib/providers/gemini.dart path: colorist/lib/providers/gemini.dart patch-u: | - --- a/colorist/step_03/lib/providers/gemini.dart - +++ b/colorist/step_03/lib/providers/gemini.dart - @@ -10,6 +10,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; + --- b/colorist/step_03/lib/providers/gemini.dart + +++ a/colorist/step_03/lib/providers/gemini.dart + @@ -9,6 +9,7 @@ import 'package:firebase_core/firebase_core.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../firebase_options.dart'; @@ -467,7 +464,7 @@ steps: part 'gemini.g.dart'; - @@ -20,9 +21,11 @@ Future firebaseApp(Ref ref) => + @@ -19,9 +20,11 @@ Future firebaseApp(Ref ref) => @riverpod Future geminiModel(Ref ref) async { await ref.watch(firebaseAppProvider.future); @@ -505,7 +502,6 @@ steps: // found in the LICENSE file. import 'package:firebase_ai/firebase_ai.dart'; - import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'gemini_tools.g.dart'; @@ -535,9 +531,9 @@ steps: - name: Patch lib/providers/gemini.dart path: colorist/lib/providers/gemini.dart patch-u: | - --- a/colorist/step_04/lib/providers/gemini.dart - +++ b/colorist/step_04/lib/providers/gemini.dart - @@ -10,6 +10,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; + --- b/colorist/step_04/lib/providers/gemini.dart + +++ a/colorist/step_04/lib/providers/gemini.dart + @@ -9,6 +9,7 @@ import 'package:firebase_core/firebase_core.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../firebase_options.dart'; @@ -545,7 +541,7 @@ steps: import 'system_prompt.dart'; part 'gemini.g.dart'; - @@ -22,10 +23,12 @@ Future firebaseApp(Ref ref) => + @@ -21,10 +22,12 @@ Future firebaseApp(Ref ref) => Future geminiModel(Ref ref) async { await ref.watch(firebaseAppProvider.future); final systemPrompt = await ref.watch(systemPromptProvider.future); @@ -634,7 +630,7 @@ steps: patch-u: | --- b/colorist/step_05/lib/services/gemini_chat_service.dart +++ a/colorist/step_05/lib/services/gemini_chat_service.dart - @@ -10,6 +10,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; + @@ -9,6 +9,7 @@ import 'package:firebase_ai/firebase_ai.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../providers/gemini.dart'; @@ -642,7 +638,7 @@ steps: part 'gemini_chat_service.g.dart'; - @@ -33,6 +34,27 @@ class GeminiChatService { + @@ -32,6 +33,27 @@ class GeminiChatService { logStateNotifier.logLlmText(responseText); chatStateNotifier.appendToMessage(llmMessage.id, responseText); } @@ -681,9 +677,9 @@ steps: +import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; - import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; - @@ -26,6 +27,44 @@ class GeminiTools { + + @@ -25,6 +26,44 @@ class GeminiTools { List get tools => [ Tool.functionDeclarations([setColorFuncDecl]), ]; @@ -692,7 +688,7 @@ steps: + String functionName, + Map arguments, + ) { - + final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + + final logStateNotifier = ref.read(logStateProvider.notifier); + logStateNotifier.logFunctionCall(functionName, arguments); + return switch (functionName) { + 'set_color' => handleSetColor(arguments), @@ -701,7 +697,7 @@ steps: + } + + Map handleSetColor(Map arguments) { - + final colorStateNotifier = ref.read(colorStateNotifierProvider.notifier); + + final colorStateNotifier = ref.read(colorStateProvider.notifier); + final red = (arguments['red'] as num).toDouble(); + final green = (arguments['green'] as num).toDouble(); + final blue = (arguments['blue'] as num).toDouble(); @@ -712,13 +708,13 @@ steps: + .toLLMContextMap(), + }; + - + final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + + final logStateNotifier = ref.read(logStateProvider.notifier); + logStateNotifier.logFunctionResults(functionResults); + return functionResults; + } + + Map handleUnknownFunction(String functionName) { - + final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + + final logStateNotifier = ref.read(logStateProvider.notifier); + logStateNotifier.logWarning('Unsupported function call $functionName'); + return { + 'success': false, @@ -751,7 +747,15 @@ steps: patch-u: | --- b/colorist/step_06/lib/services/gemini_chat_service.dart +++ a/colorist/step_06/lib/services/gemini_chat_service.dart - @@ -14,46 +14,41 @@ import 'gemini_tools.dart'; + @@ -6,6 +6,7 @@ import 'dart:async'; + + import 'package:colorist_ui/colorist_ui.dart'; + import 'package:firebase_ai/firebase_ai.dart'; + +import 'package:flutter_riverpod/legacy.dart'; + import 'package:riverpod_annotation/riverpod_annotation.dart'; + + import '../providers/gemini.dart'; + @@ -13,46 +14,41 @@ import 'gemini_tools.dart'; part 'gemini_chat_service.g.dart'; @@ -766,8 +770,8 @@ steps: Future sendMessage(String message) async { final chatSession = await ref.read(chatSessionProvider.future); + final conversationState = ref.read(conversationStateProvider); - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); + if (conversationState == ConversationState.busy) { + logStateNotifier.logWarning( @@ -820,7 +824,7 @@ steps: } } catch (e, st) { logStateNotifier.logError(e, st: st); - @@ -64,6 +59,45 @@ class GeminiChatService { + @@ -63,6 +59,45 @@ class GeminiChatService { ); } finally { chatStateNotifier.finalizeMessage(llmMessage.id); @@ -833,8 +837,8 @@ steps: + String llmMessageId, + ) async { + final chatSession = await ref.read(chatSessionProvider.future); - + final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - + final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + + final chatStateNotifier = ref.read(chatStateProvider.notifier); + + final logStateNotifier = ref.read(logStateProvider.notifier); + final blockText = block.text; + + if (blockText != null) { @@ -900,6 +904,7 @@ steps: - name: Flutter clean path: step_06 flutter: clean + - name: step_07 steps: - name: Remove generated code @@ -994,5 +999,6 @@ steps: - name: Flutter clean path: step_07 flutter: clean + - name: Cleanup rmdir: colorist diff --git a/colorist/step_01/lib/main.dart b/colorist/step_01/lib/main.dart index a71a0a8794..4fd3b67dd6 100644 --- a/colorist/step_01/lib/main.dart +++ b/colorist/step_01/lib/main.dart @@ -29,8 +29,8 @@ class MainApp extends ConsumerWidget { // A fake LLM that just echoes back what it receives. void sendMessage(String message, WidgetRef ref) { - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); chatStateNotifier.addUserMessage(message); logStateNotifier.logUserText(message); diff --git a/colorist/step_01/pubspec.yaml b/colorist/step_01/pubspec.yaml index 9a5858e241..f200466b8f 100644 --- a/colorist/step_01/pubspec.yaml +++ b/colorist/step_01/pubspec.yaml @@ -4,24 +4,24 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.9.0 + sdk: ^3.9.2 dependencies: flutter: sdk: flutter - colorist_ui: ^0.2.5 - flutter_riverpod: ^2.6.1 - riverpod_annotation: ^2.6.1 + colorist_ui: ^0.3.0 + flutter_riverpod: ^3.0.0 + riverpod_annotation: ^3.0.0 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^6.0.0 - build_runner: ^2.5.4 - riverpod_generator: ^2.6.5 - riverpod_lint: ^2.6.5 - json_serializable: ^6.9.5 - custom_lint: ^0.7.6 + build_runner: ^2.7.1 + riverpod_generator: ^3.0.0 + riverpod_lint: ^3.0.0 + json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_02/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_02/ios/Runner.xcodeproj/project.pbxproj index 90f5596b2b..3faa22fa2f 100644 --- a/colorist/step_02/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_02/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,18 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -61,10 +63,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -72,30 +72,30 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */, + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - DF1E44B816CCC38BF7580232 /* Frameworks */ = { + F06202242F3753DC8C8E93BC /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */, + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0DD397DDABE0052F1DE19F5A /* Pods */ = { + 312762A7BBA5485B1B58DF05 /* Pods */ = { isa = PBXGroup; children = ( - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */, - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */, - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */, - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */, - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */, - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */, + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -109,15 +109,6 @@ path = RunnerTests; sourceTree = ""; }; - 63D2F3770F1CD08D5029406D /* Frameworks */ = { - isa = PBXGroup; - children = ( - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */, - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -136,8 +127,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 0DD397DDABE0052F1DE19F5A /* Pods */, - 63D2F3770F1CD08D5029406D /* Frameworks */, + 312762A7BBA5485B1B58DF05 /* Pods */, + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, ); sourceTree = ""; }; @@ -165,6 +156,15 @@ path = Runner; sourceTree = ""; }; + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */, + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - DF1E44B816CCC38BF7580232 /* Frameworks */, + F06202242F3753DC8C8E93BC /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */, + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */, + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,6 +270,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -286,26 +308,21 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */ = { + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -323,7 +340,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */ = { + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -345,23 +362,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_02/lib/providers/gemini.dart b/colorist/step_02/lib/providers/gemini.dart index b537487d11..a9c47e49c1 100644 --- a/colorist/step_02/lib/providers/gemini.dart +++ b/colorist/step_02/lib/providers/gemini.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'package:firebase_ai/firebase_ai.dart'; import 'package:firebase_core/firebase_core.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../firebase_options.dart'; diff --git a/colorist/step_02/lib/providers/gemini.g.dart b/colorist/step_02/lib/providers/gemini.g.dart index 0dc877ac32..c22b9e683f 100644 --- a/colorist/step_02/lib/providers/gemini.g.dart +++ b/colorist/step_02/lib/providers/gemini.g.dart @@ -6,56 +6,122 @@ part of 'gemini.dart'; // RiverpodGenerator // ************************************************************************** -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [firebaseApp]. @ProviderFor(firebaseApp) -final firebaseAppProvider = AutoDisposeFutureProvider.internal( - firebaseApp, - name: r'firebaseAppProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$firebaseAppHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef FirebaseAppRef = AutoDisposeFutureProviderRef; -String _$geminiModelHash() => r'c6550e4a62e99f22324928fae16928b7db5dce4a'; +const firebaseAppProvider = FirebaseAppProvider._(); + +final class FirebaseAppProvider + extends + $FunctionalProvider< + AsyncValue, + FirebaseApp, + FutureOr + > + with $FutureModifier, $FutureProvider { + const FirebaseAppProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'firebaseAppProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$firebaseAppHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return firebaseApp(ref); + } +} + +String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; -/// See also [geminiModel]. @ProviderFor(geminiModel) -final geminiModelProvider = AutoDisposeFutureProvider.internal( - geminiModel, - name: r'geminiModelProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiModelHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiModelRef = AutoDisposeFutureProviderRef; -String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; +const geminiModelProvider = GeminiModelProvider._(); + +final class GeminiModelProvider + extends + $FunctionalProvider< + AsyncValue, + GenerativeModel, + FutureOr + > + with $FutureModifier, $FutureProvider { + const GeminiModelProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiModelProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiModelHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return geminiModel(ref); + } +} + +String _$geminiModelHash() => r'c6550e4a62e99f22324928fae16928b7db5dce4a'; -/// See also [chatSession]. @ProviderFor(chatSession) -final chatSessionProvider = FutureProvider.internal( - chatSession, - name: r'chatSessionProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$chatSessionHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef ChatSessionRef = FutureProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const chatSessionProvider = ChatSessionProvider._(); + +final class ChatSessionProvider + extends + $FunctionalProvider< + AsyncValue, + ChatSession, + FutureOr + > + with $FutureModifier, $FutureProvider { + const ChatSessionProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'chatSessionProvider', + isAutoDispose: false, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$chatSessionHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return chatSession(ref); + } +} + +String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; diff --git a/colorist/step_02/lib/services/gemini_chat_service.dart b/colorist/step_02/lib/services/gemini_chat_service.dart index 5722173fe6..3e160ced0a 100644 --- a/colorist/step_02/lib/services/gemini_chat_service.dart +++ b/colorist/step_02/lib/services/gemini_chat_service.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../providers/gemini.dart'; @@ -19,8 +18,8 @@ class GeminiChatService { Future sendMessage(String message) async { final chatSession = await ref.read(chatSessionProvider.future); - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); chatStateNotifier.addUserMessage(message); logStateNotifier.logUserText(message); diff --git a/colorist/step_02/lib/services/gemini_chat_service.g.dart b/colorist/step_02/lib/services/gemini_chat_service.g.dart index d39c419058..c1c8b190ae 100644 --- a/colorist/step_02/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_02/lib/services/gemini_chat_service.g.dart @@ -6,23 +6,52 @@ part of 'gemini_chat_service.dart'; // RiverpodGenerator // ************************************************************************** -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [geminiChatService]. @ProviderFor(geminiChatService) -final geminiChatServiceProvider = - AutoDisposeProvider.internal( - geminiChatService, - name: r'geminiChatServiceProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiChatServiceHash, - dependencies: null, - allTransitiveDependencies: null, +const geminiChatServiceProvider = GeminiChatServiceProvider._(); + +final class GeminiChatServiceProvider + extends + $FunctionalProvider< + GeminiChatService, + GeminiChatService, + GeminiChatService + > + with $Provider { + const GeminiChatServiceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiChatServiceProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiChatServiceHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + GeminiChatService create(Ref ref) { + return geminiChatService(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(GeminiChatService value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), ); + } +} -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiChatServiceRef = AutoDisposeProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; diff --git a/colorist/step_02/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_02/macos/Runner.xcodeproj/project.pbxproj index 40b4a8400c..5705663d27 100644 --- a/colorist/step_02/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_02/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB8005ACB477793346F9B928 /* Pods_Runner.framework */; }; - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */; }; + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,8 +62,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -80,14 +79,15 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - CB8005ACB477793346F9B928 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */, + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +103,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */, + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +137,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - BEDDB94EC779878F47F51D3D /* Pods */, + 96479A713AF984E332242AC3 /* Pods */, ); sourceTree = ""; }; @@ -185,15 +185,15 @@ path = Runner; sourceTree = ""; }; - BEDDB94EC779878F47F51D3D /* Pods */ = { + 96479A713AF984E332242AC3 /* Pods */ = { isa = PBXGroup; children = ( - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */, - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */, - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */, - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */, - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */, - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */, + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -202,8 +202,8 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - CB8005ACB477793346F9B928 /* Pods_Runner.framework */, - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */, + D60B4970810E6450720BA91A /* Pods_Runner.framework */, + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */, + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */, + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */, + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,21 +323,26 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */ = { + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -378,7 +383,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */ = { + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -393,33 +398,28 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */ = { + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_02/pubspec.yaml b/colorist/step_02/pubspec.yaml index e33a51711b..ab86f55913 100644 --- a/colorist/step_02/pubspec.yaml +++ b/colorist/step_02/pubspec.yaml @@ -4,26 +4,26 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.9.0 + sdk: ^3.9.2 dependencies: flutter: sdk: flutter - colorist_ui: ^0.2.5 - flutter_riverpod: ^2.6.1 - riverpod_annotation: ^2.6.1 - firebase_core: ^4.0.0 - firebase_ai: ^3.1.0 + colorist_ui: ^0.3.0 + flutter_riverpod: ^3.0.0 + riverpod_annotation: ^3.0.0 + firebase_core: ^4.1.0 + firebase_ai: ^3.2.0 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^6.0.0 - build_runner: ^2.5.4 - riverpod_generator: ^2.6.5 - riverpod_lint: ^2.6.5 - json_serializable: ^6.9.5 - custom_lint: ^0.7.6 + build_runner: ^2.7.1 + riverpod_generator: ^3.0.0 + riverpod_lint: ^3.0.0 + json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_03/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_03/ios/Runner.xcodeproj/project.pbxproj index 90f5596b2b..3faa22fa2f 100644 --- a/colorist/step_03/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_03/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,18 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -61,10 +63,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -72,30 +72,30 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */, + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - DF1E44B816CCC38BF7580232 /* Frameworks */ = { + F06202242F3753DC8C8E93BC /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */, + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0DD397DDABE0052F1DE19F5A /* Pods */ = { + 312762A7BBA5485B1B58DF05 /* Pods */ = { isa = PBXGroup; children = ( - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */, - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */, - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */, - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */, - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */, - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */, + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -109,15 +109,6 @@ path = RunnerTests; sourceTree = ""; }; - 63D2F3770F1CD08D5029406D /* Frameworks */ = { - isa = PBXGroup; - children = ( - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */, - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -136,8 +127,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 0DD397DDABE0052F1DE19F5A /* Pods */, - 63D2F3770F1CD08D5029406D /* Frameworks */, + 312762A7BBA5485B1B58DF05 /* Pods */, + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, ); sourceTree = ""; }; @@ -165,6 +156,15 @@ path = Runner; sourceTree = ""; }; + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */, + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - DF1E44B816CCC38BF7580232 /* Frameworks */, + F06202242F3753DC8C8E93BC /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */, + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */, + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,6 +270,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -286,26 +308,21 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */ = { + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -323,7 +340,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */ = { + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -345,23 +362,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_03/lib/providers/gemini.dart b/colorist/step_03/lib/providers/gemini.dart index 5b3af74e0a..66b6755664 100644 --- a/colorist/step_03/lib/providers/gemini.dart +++ b/colorist/step_03/lib/providers/gemini.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'package:firebase_ai/firebase_ai.dart'; import 'package:firebase_core/firebase_core.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../firebase_options.dart'; diff --git a/colorist/step_03/lib/providers/gemini.g.dart b/colorist/step_03/lib/providers/gemini.g.dart index 6edea255d6..af9c2b4367 100644 --- a/colorist/step_03/lib/providers/gemini.g.dart +++ b/colorist/step_03/lib/providers/gemini.g.dart @@ -6,56 +6,122 @@ part of 'gemini.dart'; // RiverpodGenerator // ************************************************************************** -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [firebaseApp]. @ProviderFor(firebaseApp) -final firebaseAppProvider = AutoDisposeFutureProvider.internal( - firebaseApp, - name: r'firebaseAppProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$firebaseAppHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef FirebaseAppRef = AutoDisposeFutureProviderRef; -String _$geminiModelHash() => r'e395f7db73dd2524fbbc4d731d44e98ddc33a5f8'; +const firebaseAppProvider = FirebaseAppProvider._(); + +final class FirebaseAppProvider + extends + $FunctionalProvider< + AsyncValue, + FirebaseApp, + FutureOr + > + with $FutureModifier, $FutureProvider { + const FirebaseAppProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'firebaseAppProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$firebaseAppHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return firebaseApp(ref); + } +} + +String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; -/// See also [geminiModel]. @ProviderFor(geminiModel) -final geminiModelProvider = AutoDisposeFutureProvider.internal( - geminiModel, - name: r'geminiModelProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiModelHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiModelRef = AutoDisposeFutureProviderRef; -String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; +const geminiModelProvider = GeminiModelProvider._(); + +final class GeminiModelProvider + extends + $FunctionalProvider< + AsyncValue, + GenerativeModel, + FutureOr + > + with $FutureModifier, $FutureProvider { + const GeminiModelProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiModelProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiModelHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return geminiModel(ref); + } +} + +String _$geminiModelHash() => r'e395f7db73dd2524fbbc4d731d44e98ddc33a5f8'; -/// See also [chatSession]. @ProviderFor(chatSession) -final chatSessionProvider = FutureProvider.internal( - chatSession, - name: r'chatSessionProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$chatSessionHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef ChatSessionRef = FutureProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const chatSessionProvider = ChatSessionProvider._(); + +final class ChatSessionProvider + extends + $FunctionalProvider< + AsyncValue, + ChatSession, + FutureOr + > + with $FutureModifier, $FutureProvider { + const ChatSessionProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'chatSessionProvider', + isAutoDispose: false, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$chatSessionHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return chatSession(ref); + } +} + +String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; diff --git a/colorist/step_03/lib/providers/system_prompt.dart b/colorist/step_03/lib/providers/system_prompt.dart index 8e6b2f1000..683a3ae70a 100644 --- a/colorist/step_03/lib/providers/system_prompt.dart +++ b/colorist/step_03/lib/providers/system_prompt.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter/services.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'system_prompt.g.dart'; diff --git a/colorist/step_03/lib/providers/system_prompt.g.dart b/colorist/step_03/lib/providers/system_prompt.g.dart index 57e452cadf..053524e338 100644 --- a/colorist/step_03/lib/providers/system_prompt.g.dart +++ b/colorist/step_03/lib/providers/system_prompt.g.dart @@ -6,22 +6,38 @@ part of 'system_prompt.dart'; // RiverpodGenerator // ************************************************************************** -String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [systemPrompt]. @ProviderFor(systemPrompt) -final systemPromptProvider = AutoDisposeFutureProvider.internal( - systemPrompt, - name: r'systemPromptProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$systemPromptHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef SystemPromptRef = AutoDisposeFutureProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const systemPromptProvider = SystemPromptProvider._(); + +final class SystemPromptProvider + extends $FunctionalProvider, String, FutureOr> + with $FutureModifier, $FutureProvider { + const SystemPromptProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'systemPromptProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$systemPromptHash(); + + @$internal + @override + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return systemPrompt(ref); + } +} + +String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; diff --git a/colorist/step_03/lib/services/gemini_chat_service.dart b/colorist/step_03/lib/services/gemini_chat_service.dart index 5722173fe6..3e160ced0a 100644 --- a/colorist/step_03/lib/services/gemini_chat_service.dart +++ b/colorist/step_03/lib/services/gemini_chat_service.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../providers/gemini.dart'; @@ -19,8 +18,8 @@ class GeminiChatService { Future sendMessage(String message) async { final chatSession = await ref.read(chatSessionProvider.future); - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); chatStateNotifier.addUserMessage(message); logStateNotifier.logUserText(message); diff --git a/colorist/step_03/lib/services/gemini_chat_service.g.dart b/colorist/step_03/lib/services/gemini_chat_service.g.dart index d39c419058..c1c8b190ae 100644 --- a/colorist/step_03/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_03/lib/services/gemini_chat_service.g.dart @@ -6,23 +6,52 @@ part of 'gemini_chat_service.dart'; // RiverpodGenerator // ************************************************************************** -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [geminiChatService]. @ProviderFor(geminiChatService) -final geminiChatServiceProvider = - AutoDisposeProvider.internal( - geminiChatService, - name: r'geminiChatServiceProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiChatServiceHash, - dependencies: null, - allTransitiveDependencies: null, +const geminiChatServiceProvider = GeminiChatServiceProvider._(); + +final class GeminiChatServiceProvider + extends + $FunctionalProvider< + GeminiChatService, + GeminiChatService, + GeminiChatService + > + with $Provider { + const GeminiChatServiceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiChatServiceProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiChatServiceHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + GeminiChatService create(Ref ref) { + return geminiChatService(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(GeminiChatService value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), ); + } +} -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiChatServiceRef = AutoDisposeProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; diff --git a/colorist/step_03/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_03/macos/Runner.xcodeproj/project.pbxproj index 40b4a8400c..5705663d27 100644 --- a/colorist/step_03/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_03/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB8005ACB477793346F9B928 /* Pods_Runner.framework */; }; - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */; }; + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,8 +62,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -80,14 +79,15 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - CB8005ACB477793346F9B928 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */, + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +103,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */, + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +137,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - BEDDB94EC779878F47F51D3D /* Pods */, + 96479A713AF984E332242AC3 /* Pods */, ); sourceTree = ""; }; @@ -185,15 +185,15 @@ path = Runner; sourceTree = ""; }; - BEDDB94EC779878F47F51D3D /* Pods */ = { + 96479A713AF984E332242AC3 /* Pods */ = { isa = PBXGroup; children = ( - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */, - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */, - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */, - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */, - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */, - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */, + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -202,8 +202,8 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - CB8005ACB477793346F9B928 /* Pods_Runner.framework */, - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */, + D60B4970810E6450720BA91A /* Pods_Runner.framework */, + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */, + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */, + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */, + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,21 +323,26 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */ = { + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -378,7 +383,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */ = { + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -393,33 +398,28 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */ = { + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_03/pubspec.yaml b/colorist/step_03/pubspec.yaml index 75d44f906b..72e86ffbb8 100644 --- a/colorist/step_03/pubspec.yaml +++ b/colorist/step_03/pubspec.yaml @@ -4,26 +4,26 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.9.0 + sdk: ^3.9.2 dependencies: flutter: sdk: flutter - colorist_ui: ^0.2.5 - flutter_riverpod: ^2.6.1 - riverpod_annotation: ^2.6.1 - firebase_core: ^4.0.0 - firebase_ai: ^3.1.0 + colorist_ui: ^0.3.0 + flutter_riverpod: ^3.0.0 + riverpod_annotation: ^3.0.0 + firebase_core: ^4.1.0 + firebase_ai: ^3.2.0 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^6.0.0 - build_runner: ^2.5.4 - riverpod_generator: ^2.6.5 - riverpod_lint: ^2.6.5 - json_serializable: ^6.9.5 - custom_lint: ^0.7.6 + build_runner: ^2.7.1 + riverpod_generator: ^3.0.0 + riverpod_lint: ^3.0.0 + json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_04/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_04/ios/Runner.xcodeproj/project.pbxproj index 90f5596b2b..3faa22fa2f 100644 --- a/colorist/step_04/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_04/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,18 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -61,10 +63,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -72,30 +72,30 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */, + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - DF1E44B816CCC38BF7580232 /* Frameworks */ = { + F06202242F3753DC8C8E93BC /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */, + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0DD397DDABE0052F1DE19F5A /* Pods */ = { + 312762A7BBA5485B1B58DF05 /* Pods */ = { isa = PBXGroup; children = ( - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */, - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */, - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */, - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */, - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */, - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */, + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -109,15 +109,6 @@ path = RunnerTests; sourceTree = ""; }; - 63D2F3770F1CD08D5029406D /* Frameworks */ = { - isa = PBXGroup; - children = ( - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */, - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -136,8 +127,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 0DD397DDABE0052F1DE19F5A /* Pods */, - 63D2F3770F1CD08D5029406D /* Frameworks */, + 312762A7BBA5485B1B58DF05 /* Pods */, + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, ); sourceTree = ""; }; @@ -165,6 +156,15 @@ path = Runner; sourceTree = ""; }; + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */, + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - DF1E44B816CCC38BF7580232 /* Frameworks */, + F06202242F3753DC8C8E93BC /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */, + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */, + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,6 +270,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -286,26 +308,21 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */ = { + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -323,7 +340,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */ = { + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -345,23 +362,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_04/lib/providers/gemini.dart b/colorist/step_04/lib/providers/gemini.dart index e49f4657bd..415f098553 100644 --- a/colorist/step_04/lib/providers/gemini.dart +++ b/colorist/step_04/lib/providers/gemini.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'package:firebase_ai/firebase_ai.dart'; import 'package:firebase_core/firebase_core.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../firebase_options.dart'; diff --git a/colorist/step_04/lib/providers/gemini.g.dart b/colorist/step_04/lib/providers/gemini.g.dart index abeb560cfc..176c7339c4 100644 --- a/colorist/step_04/lib/providers/gemini.g.dart +++ b/colorist/step_04/lib/providers/gemini.g.dart @@ -6,56 +6,122 @@ part of 'gemini.dart'; // RiverpodGenerator // ************************************************************************** -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [firebaseApp]. @ProviderFor(firebaseApp) -final firebaseAppProvider = AutoDisposeFutureProvider.internal( - firebaseApp, - name: r'firebaseAppProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$firebaseAppHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef FirebaseAppRef = AutoDisposeFutureProviderRef; -String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; +const firebaseAppProvider = FirebaseAppProvider._(); + +final class FirebaseAppProvider + extends + $FunctionalProvider< + AsyncValue, + FirebaseApp, + FutureOr + > + with $FutureModifier, $FutureProvider { + const FirebaseAppProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'firebaseAppProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$firebaseAppHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return firebaseApp(ref); + } +} + +String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; -/// See also [geminiModel]. @ProviderFor(geminiModel) -final geminiModelProvider = AutoDisposeFutureProvider.internal( - geminiModel, - name: r'geminiModelProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiModelHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiModelRef = AutoDisposeFutureProviderRef; -String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; +const geminiModelProvider = GeminiModelProvider._(); + +final class GeminiModelProvider + extends + $FunctionalProvider< + AsyncValue, + GenerativeModel, + FutureOr + > + with $FutureModifier, $FutureProvider { + const GeminiModelProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiModelProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiModelHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return geminiModel(ref); + } +} + +String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; -/// See also [chatSession]. @ProviderFor(chatSession) -final chatSessionProvider = FutureProvider.internal( - chatSession, - name: r'chatSessionProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$chatSessionHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef ChatSessionRef = FutureProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const chatSessionProvider = ChatSessionProvider._(); + +final class ChatSessionProvider + extends + $FunctionalProvider< + AsyncValue, + ChatSession, + FutureOr + > + with $FutureModifier, $FutureProvider { + const ChatSessionProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'chatSessionProvider', + isAutoDispose: false, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$chatSessionHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return chatSession(ref); + } +} + +String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; diff --git a/colorist/step_04/lib/providers/system_prompt.dart b/colorist/step_04/lib/providers/system_prompt.dart index 8e6b2f1000..683a3ae70a 100644 --- a/colorist/step_04/lib/providers/system_prompt.dart +++ b/colorist/step_04/lib/providers/system_prompt.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter/services.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'system_prompt.g.dart'; diff --git a/colorist/step_04/lib/providers/system_prompt.g.dart b/colorist/step_04/lib/providers/system_prompt.g.dart index 57e452cadf..053524e338 100644 --- a/colorist/step_04/lib/providers/system_prompt.g.dart +++ b/colorist/step_04/lib/providers/system_prompt.g.dart @@ -6,22 +6,38 @@ part of 'system_prompt.dart'; // RiverpodGenerator // ************************************************************************** -String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [systemPrompt]. @ProviderFor(systemPrompt) -final systemPromptProvider = AutoDisposeFutureProvider.internal( - systemPrompt, - name: r'systemPromptProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$systemPromptHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef SystemPromptRef = AutoDisposeFutureProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const systemPromptProvider = SystemPromptProvider._(); + +final class SystemPromptProvider + extends $FunctionalProvider, String, FutureOr> + with $FutureModifier, $FutureProvider { + const SystemPromptProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'systemPromptProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$systemPromptHash(); + + @$internal + @override + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return systemPrompt(ref); + } +} + +String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; diff --git a/colorist/step_04/lib/services/gemini_chat_service.dart b/colorist/step_04/lib/services/gemini_chat_service.dart index 5722173fe6..3e160ced0a 100644 --- a/colorist/step_04/lib/services/gemini_chat_service.dart +++ b/colorist/step_04/lib/services/gemini_chat_service.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../providers/gemini.dart'; @@ -19,8 +18,8 @@ class GeminiChatService { Future sendMessage(String message) async { final chatSession = await ref.read(chatSessionProvider.future); - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); chatStateNotifier.addUserMessage(message); logStateNotifier.logUserText(message); diff --git a/colorist/step_04/lib/services/gemini_chat_service.g.dart b/colorist/step_04/lib/services/gemini_chat_service.g.dart index d39c419058..c1c8b190ae 100644 --- a/colorist/step_04/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_04/lib/services/gemini_chat_service.g.dart @@ -6,23 +6,52 @@ part of 'gemini_chat_service.dart'; // RiverpodGenerator // ************************************************************************** -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [geminiChatService]. @ProviderFor(geminiChatService) -final geminiChatServiceProvider = - AutoDisposeProvider.internal( - geminiChatService, - name: r'geminiChatServiceProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiChatServiceHash, - dependencies: null, - allTransitiveDependencies: null, +const geminiChatServiceProvider = GeminiChatServiceProvider._(); + +final class GeminiChatServiceProvider + extends + $FunctionalProvider< + GeminiChatService, + GeminiChatService, + GeminiChatService + > + with $Provider { + const GeminiChatServiceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiChatServiceProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiChatServiceHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + GeminiChatService create(Ref ref) { + return geminiChatService(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(GeminiChatService value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), ); + } +} -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiChatServiceRef = AutoDisposeProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; diff --git a/colorist/step_04/lib/services/gemini_tools.dart b/colorist/step_04/lib/services/gemini_tools.dart index fad0a4fe39..c634c4e632 100644 --- a/colorist/step_04/lib/services/gemini_tools.dart +++ b/colorist/step_04/lib/services/gemini_tools.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'gemini_tools.g.dart'; diff --git a/colorist/step_04/lib/services/gemini_tools.g.dart b/colorist/step_04/lib/services/gemini_tools.g.dart index 630b2286ce..0f8347266c 100644 --- a/colorist/step_04/lib/services/gemini_tools.g.dart +++ b/colorist/step_04/lib/services/gemini_tools.g.dart @@ -6,22 +6,46 @@ part of 'gemini_tools.dart'; // RiverpodGenerator // ************************************************************************** -String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [geminiTools]. @ProviderFor(geminiTools) -final geminiToolsProvider = AutoDisposeProvider.internal( - geminiTools, - name: r'geminiToolsProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiToolsHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiToolsRef = AutoDisposeProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const geminiToolsProvider = GeminiToolsProvider._(); + +final class GeminiToolsProvider + extends $FunctionalProvider + with $Provider { + const GeminiToolsProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiToolsProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiToolsHash(); + + @$internal + @override + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(pointer); + + @override + GeminiTools create(Ref ref) { + return geminiTools(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(GeminiTools value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; diff --git a/colorist/step_04/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_04/macos/Runner.xcodeproj/project.pbxproj index 40b4a8400c..5705663d27 100644 --- a/colorist/step_04/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_04/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB8005ACB477793346F9B928 /* Pods_Runner.framework */; }; - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */; }; + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,8 +62,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -80,14 +79,15 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - CB8005ACB477793346F9B928 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */, + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +103,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */, + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +137,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - BEDDB94EC779878F47F51D3D /* Pods */, + 96479A713AF984E332242AC3 /* Pods */, ); sourceTree = ""; }; @@ -185,15 +185,15 @@ path = Runner; sourceTree = ""; }; - BEDDB94EC779878F47F51D3D /* Pods */ = { + 96479A713AF984E332242AC3 /* Pods */ = { isa = PBXGroup; children = ( - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */, - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */, - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */, - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */, - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */, - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */, + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -202,8 +202,8 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - CB8005ACB477793346F9B928 /* Pods_Runner.framework */, - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */, + D60B4970810E6450720BA91A /* Pods_Runner.framework */, + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */, + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */, + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */, + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,21 +323,26 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */ = { + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -378,7 +383,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */ = { + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -393,33 +398,28 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */ = { + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_04/pubspec.yaml b/colorist/step_04/pubspec.yaml index 75d44f906b..72e86ffbb8 100644 --- a/colorist/step_04/pubspec.yaml +++ b/colorist/step_04/pubspec.yaml @@ -4,26 +4,26 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.9.0 + sdk: ^3.9.2 dependencies: flutter: sdk: flutter - colorist_ui: ^0.2.5 - flutter_riverpod: ^2.6.1 - riverpod_annotation: ^2.6.1 - firebase_core: ^4.0.0 - firebase_ai: ^3.1.0 + colorist_ui: ^0.3.0 + flutter_riverpod: ^3.0.0 + riverpod_annotation: ^3.0.0 + firebase_core: ^4.1.0 + firebase_ai: ^3.2.0 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^6.0.0 - build_runner: ^2.5.4 - riverpod_generator: ^2.6.5 - riverpod_lint: ^2.6.5 - json_serializable: ^6.9.5 - custom_lint: ^0.7.6 + build_runner: ^2.7.1 + riverpod_generator: ^3.0.0 + riverpod_lint: ^3.0.0 + json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_05/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_05/ios/Runner.xcodeproj/project.pbxproj index 90f5596b2b..3faa22fa2f 100644 --- a/colorist/step_05/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_05/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,18 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -61,10 +63,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -72,30 +72,30 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */, + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - DF1E44B816CCC38BF7580232 /* Frameworks */ = { + F06202242F3753DC8C8E93BC /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */, + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0DD397DDABE0052F1DE19F5A /* Pods */ = { + 312762A7BBA5485B1B58DF05 /* Pods */ = { isa = PBXGroup; children = ( - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */, - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */, - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */, - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */, - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */, - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */, + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -109,15 +109,6 @@ path = RunnerTests; sourceTree = ""; }; - 63D2F3770F1CD08D5029406D /* Frameworks */ = { - isa = PBXGroup; - children = ( - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */, - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -136,8 +127,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 0DD397DDABE0052F1DE19F5A /* Pods */, - 63D2F3770F1CD08D5029406D /* Frameworks */, + 312762A7BBA5485B1B58DF05 /* Pods */, + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, ); sourceTree = ""; }; @@ -165,6 +156,15 @@ path = Runner; sourceTree = ""; }; + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */, + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - DF1E44B816CCC38BF7580232 /* Frameworks */, + F06202242F3753DC8C8E93BC /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */, + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */, + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,6 +270,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -286,26 +308,21 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */ = { + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -323,7 +340,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */ = { + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -345,23 +362,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_05/lib/providers/gemini.dart b/colorist/step_05/lib/providers/gemini.dart index e49f4657bd..415f098553 100644 --- a/colorist/step_05/lib/providers/gemini.dart +++ b/colorist/step_05/lib/providers/gemini.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'package:firebase_ai/firebase_ai.dart'; import 'package:firebase_core/firebase_core.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../firebase_options.dart'; diff --git a/colorist/step_05/lib/providers/gemini.g.dart b/colorist/step_05/lib/providers/gemini.g.dart index abeb560cfc..176c7339c4 100644 --- a/colorist/step_05/lib/providers/gemini.g.dart +++ b/colorist/step_05/lib/providers/gemini.g.dart @@ -6,56 +6,122 @@ part of 'gemini.dart'; // RiverpodGenerator // ************************************************************************** -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [firebaseApp]. @ProviderFor(firebaseApp) -final firebaseAppProvider = AutoDisposeFutureProvider.internal( - firebaseApp, - name: r'firebaseAppProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$firebaseAppHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef FirebaseAppRef = AutoDisposeFutureProviderRef; -String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; +const firebaseAppProvider = FirebaseAppProvider._(); + +final class FirebaseAppProvider + extends + $FunctionalProvider< + AsyncValue, + FirebaseApp, + FutureOr + > + with $FutureModifier, $FutureProvider { + const FirebaseAppProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'firebaseAppProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$firebaseAppHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return firebaseApp(ref); + } +} + +String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; -/// See also [geminiModel]. @ProviderFor(geminiModel) -final geminiModelProvider = AutoDisposeFutureProvider.internal( - geminiModel, - name: r'geminiModelProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiModelHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiModelRef = AutoDisposeFutureProviderRef; -String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; +const geminiModelProvider = GeminiModelProvider._(); + +final class GeminiModelProvider + extends + $FunctionalProvider< + AsyncValue, + GenerativeModel, + FutureOr + > + with $FutureModifier, $FutureProvider { + const GeminiModelProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiModelProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiModelHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return geminiModel(ref); + } +} + +String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; -/// See also [chatSession]. @ProviderFor(chatSession) -final chatSessionProvider = FutureProvider.internal( - chatSession, - name: r'chatSessionProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$chatSessionHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef ChatSessionRef = FutureProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const chatSessionProvider = ChatSessionProvider._(); + +final class ChatSessionProvider + extends + $FunctionalProvider< + AsyncValue, + ChatSession, + FutureOr + > + with $FutureModifier, $FutureProvider { + const ChatSessionProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'chatSessionProvider', + isAutoDispose: false, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$chatSessionHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return chatSession(ref); + } +} + +String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; diff --git a/colorist/step_05/lib/providers/system_prompt.dart b/colorist/step_05/lib/providers/system_prompt.dart index 8e6b2f1000..683a3ae70a 100644 --- a/colorist/step_05/lib/providers/system_prompt.dart +++ b/colorist/step_05/lib/providers/system_prompt.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter/services.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'system_prompt.g.dart'; diff --git a/colorist/step_05/lib/providers/system_prompt.g.dart b/colorist/step_05/lib/providers/system_prompt.g.dart index 57e452cadf..053524e338 100644 --- a/colorist/step_05/lib/providers/system_prompt.g.dart +++ b/colorist/step_05/lib/providers/system_prompt.g.dart @@ -6,22 +6,38 @@ part of 'system_prompt.dart'; // RiverpodGenerator // ************************************************************************** -String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [systemPrompt]. @ProviderFor(systemPrompt) -final systemPromptProvider = AutoDisposeFutureProvider.internal( - systemPrompt, - name: r'systemPromptProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$systemPromptHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef SystemPromptRef = AutoDisposeFutureProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const systemPromptProvider = SystemPromptProvider._(); + +final class SystemPromptProvider + extends $FunctionalProvider, String, FutureOr> + with $FutureModifier, $FutureProvider { + const SystemPromptProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'systemPromptProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$systemPromptHash(); + + @$internal + @override + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return systemPrompt(ref); + } +} + +String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; diff --git a/colorist/step_05/lib/services/gemini_chat_service.dart b/colorist/step_05/lib/services/gemini_chat_service.dart index b660fae7e1..a63f9f7e2e 100644 --- a/colorist/step_05/lib/services/gemini_chat_service.dart +++ b/colorist/step_05/lib/services/gemini_chat_service.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../providers/gemini.dart'; @@ -20,8 +19,8 @@ class GeminiChatService { Future sendMessage(String message) async { final chatSession = await ref.read(chatSessionProvider.future); - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); chatStateNotifier.addUserMessage(message); logStateNotifier.logUserText(message); diff --git a/colorist/step_05/lib/services/gemini_chat_service.g.dart b/colorist/step_05/lib/services/gemini_chat_service.g.dart index d39c419058..c1c8b190ae 100644 --- a/colorist/step_05/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_05/lib/services/gemini_chat_service.g.dart @@ -6,23 +6,52 @@ part of 'gemini_chat_service.dart'; // RiverpodGenerator // ************************************************************************** -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [geminiChatService]. @ProviderFor(geminiChatService) -final geminiChatServiceProvider = - AutoDisposeProvider.internal( - geminiChatService, - name: r'geminiChatServiceProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiChatServiceHash, - dependencies: null, - allTransitiveDependencies: null, +const geminiChatServiceProvider = GeminiChatServiceProvider._(); + +final class GeminiChatServiceProvider + extends + $FunctionalProvider< + GeminiChatService, + GeminiChatService, + GeminiChatService + > + with $Provider { + const GeminiChatServiceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiChatServiceProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiChatServiceHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + GeminiChatService create(Ref ref) { + return geminiChatService(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(GeminiChatService value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), ); + } +} -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiChatServiceRef = AutoDisposeProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; diff --git a/colorist/step_05/lib/services/gemini_tools.dart b/colorist/step_05/lib/services/gemini_tools.dart index 508d3b2f98..d1f24786b2 100644 --- a/colorist/step_05/lib/services/gemini_tools.dart +++ b/colorist/step_05/lib/services/gemini_tools.dart @@ -4,7 +4,6 @@ import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'gemini_tools.g.dart'; @@ -32,7 +31,7 @@ class GeminiTools { String functionName, Map arguments, ) { - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); logStateNotifier.logFunctionCall(functionName, arguments); return switch (functionName) { 'set_color' => handleSetColor(arguments), @@ -41,7 +40,7 @@ class GeminiTools { } Map handleSetColor(Map arguments) { - final colorStateNotifier = ref.read(colorStateNotifierProvider.notifier); + final colorStateNotifier = ref.read(colorStateProvider.notifier); final red = (arguments['red'] as num).toDouble(); final green = (arguments['green'] as num).toDouble(); final blue = (arguments['blue'] as num).toDouble(); @@ -52,13 +51,13 @@ class GeminiTools { .toLLMContextMap(), }; - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); logStateNotifier.logFunctionResults(functionResults); return functionResults; } Map handleUnknownFunction(String functionName) { - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); logStateNotifier.logWarning('Unsupported function call $functionName'); return { 'success': false, diff --git a/colorist/step_05/lib/services/gemini_tools.g.dart b/colorist/step_05/lib/services/gemini_tools.g.dart index 630b2286ce..0f8347266c 100644 --- a/colorist/step_05/lib/services/gemini_tools.g.dart +++ b/colorist/step_05/lib/services/gemini_tools.g.dart @@ -6,22 +6,46 @@ part of 'gemini_tools.dart'; // RiverpodGenerator // ************************************************************************** -String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [geminiTools]. @ProviderFor(geminiTools) -final geminiToolsProvider = AutoDisposeProvider.internal( - geminiTools, - name: r'geminiToolsProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiToolsHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiToolsRef = AutoDisposeProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const geminiToolsProvider = GeminiToolsProvider._(); + +final class GeminiToolsProvider + extends $FunctionalProvider + with $Provider { + const GeminiToolsProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiToolsProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiToolsHash(); + + @$internal + @override + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(pointer); + + @override + GeminiTools create(Ref ref) { + return geminiTools(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(GeminiTools value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; diff --git a/colorist/step_05/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_05/macos/Runner.xcodeproj/project.pbxproj index 40b4a8400c..5705663d27 100644 --- a/colorist/step_05/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_05/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB8005ACB477793346F9B928 /* Pods_Runner.framework */; }; - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */; }; + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,8 +62,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -80,14 +79,15 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - CB8005ACB477793346F9B928 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */, + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +103,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */, + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +137,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - BEDDB94EC779878F47F51D3D /* Pods */, + 96479A713AF984E332242AC3 /* Pods */, ); sourceTree = ""; }; @@ -185,15 +185,15 @@ path = Runner; sourceTree = ""; }; - BEDDB94EC779878F47F51D3D /* Pods */ = { + 96479A713AF984E332242AC3 /* Pods */ = { isa = PBXGroup; children = ( - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */, - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */, - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */, - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */, - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */, - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */, + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -202,8 +202,8 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - CB8005ACB477793346F9B928 /* Pods_Runner.framework */, - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */, + D60B4970810E6450720BA91A /* Pods_Runner.framework */, + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */, + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */, + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */, + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,21 +323,26 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */ = { + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -378,7 +383,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */ = { + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -393,33 +398,28 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */ = { + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_05/pubspec.yaml b/colorist/step_05/pubspec.yaml index 75d44f906b..72e86ffbb8 100644 --- a/colorist/step_05/pubspec.yaml +++ b/colorist/step_05/pubspec.yaml @@ -4,26 +4,26 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.9.0 + sdk: ^3.9.2 dependencies: flutter: sdk: flutter - colorist_ui: ^0.2.5 - flutter_riverpod: ^2.6.1 - riverpod_annotation: ^2.6.1 - firebase_core: ^4.0.0 - firebase_ai: ^3.1.0 + colorist_ui: ^0.3.0 + flutter_riverpod: ^3.0.0 + riverpod_annotation: ^3.0.0 + firebase_core: ^4.1.0 + firebase_ai: ^3.2.0 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^6.0.0 - build_runner: ^2.5.4 - riverpod_generator: ^2.6.5 - riverpod_lint: ^2.6.5 - json_serializable: ^6.9.5 - custom_lint: ^0.7.6 + build_runner: ^2.7.1 + riverpod_generator: ^3.0.0 + riverpod_lint: ^3.0.0 + json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_06/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_06/ios/Runner.xcodeproj/project.pbxproj index 90f5596b2b..3faa22fa2f 100644 --- a/colorist/step_06/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_06/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,18 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -61,10 +63,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -72,30 +72,30 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */, + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - DF1E44B816CCC38BF7580232 /* Frameworks */ = { + F06202242F3753DC8C8E93BC /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */, + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0DD397DDABE0052F1DE19F5A /* Pods */ = { + 312762A7BBA5485B1B58DF05 /* Pods */ = { isa = PBXGroup; children = ( - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */, - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */, - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */, - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */, - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */, - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */, + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -109,15 +109,6 @@ path = RunnerTests; sourceTree = ""; }; - 63D2F3770F1CD08D5029406D /* Frameworks */ = { - isa = PBXGroup; - children = ( - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */, - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -136,8 +127,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 0DD397DDABE0052F1DE19F5A /* Pods */, - 63D2F3770F1CD08D5029406D /* Frameworks */, + 312762A7BBA5485B1B58DF05 /* Pods */, + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, ); sourceTree = ""; }; @@ -165,6 +156,15 @@ path = Runner; sourceTree = ""; }; + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */, + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - DF1E44B816CCC38BF7580232 /* Frameworks */, + F06202242F3753DC8C8E93BC /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */, + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */, + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,6 +270,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -286,26 +308,21 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */ = { + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -323,7 +340,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */ = { + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -345,23 +362,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_06/lib/providers/gemini.dart b/colorist/step_06/lib/providers/gemini.dart index e49f4657bd..415f098553 100644 --- a/colorist/step_06/lib/providers/gemini.dart +++ b/colorist/step_06/lib/providers/gemini.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'package:firebase_ai/firebase_ai.dart'; import 'package:firebase_core/firebase_core.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../firebase_options.dart'; diff --git a/colorist/step_06/lib/providers/gemini.g.dart b/colorist/step_06/lib/providers/gemini.g.dart index abeb560cfc..176c7339c4 100644 --- a/colorist/step_06/lib/providers/gemini.g.dart +++ b/colorist/step_06/lib/providers/gemini.g.dart @@ -6,56 +6,122 @@ part of 'gemini.dart'; // RiverpodGenerator // ************************************************************************** -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [firebaseApp]. @ProviderFor(firebaseApp) -final firebaseAppProvider = AutoDisposeFutureProvider.internal( - firebaseApp, - name: r'firebaseAppProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$firebaseAppHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef FirebaseAppRef = AutoDisposeFutureProviderRef; -String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; +const firebaseAppProvider = FirebaseAppProvider._(); + +final class FirebaseAppProvider + extends + $FunctionalProvider< + AsyncValue, + FirebaseApp, + FutureOr + > + with $FutureModifier, $FutureProvider { + const FirebaseAppProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'firebaseAppProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$firebaseAppHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return firebaseApp(ref); + } +} + +String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; -/// See also [geminiModel]. @ProviderFor(geminiModel) -final geminiModelProvider = AutoDisposeFutureProvider.internal( - geminiModel, - name: r'geminiModelProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiModelHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiModelRef = AutoDisposeFutureProviderRef; -String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; +const geminiModelProvider = GeminiModelProvider._(); + +final class GeminiModelProvider + extends + $FunctionalProvider< + AsyncValue, + GenerativeModel, + FutureOr + > + with $FutureModifier, $FutureProvider { + const GeminiModelProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiModelProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiModelHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return geminiModel(ref); + } +} + +String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; -/// See also [chatSession]. @ProviderFor(chatSession) -final chatSessionProvider = FutureProvider.internal( - chatSession, - name: r'chatSessionProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$chatSessionHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef ChatSessionRef = FutureProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const chatSessionProvider = ChatSessionProvider._(); + +final class ChatSessionProvider + extends + $FunctionalProvider< + AsyncValue, + ChatSession, + FutureOr + > + with $FutureModifier, $FutureProvider { + const ChatSessionProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'chatSessionProvider', + isAutoDispose: false, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$chatSessionHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return chatSession(ref); + } +} + +String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; diff --git a/colorist/step_06/lib/providers/system_prompt.dart b/colorist/step_06/lib/providers/system_prompt.dart index 8e6b2f1000..683a3ae70a 100644 --- a/colorist/step_06/lib/providers/system_prompt.dart +++ b/colorist/step_06/lib/providers/system_prompt.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter/services.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'system_prompt.g.dart'; diff --git a/colorist/step_06/lib/providers/system_prompt.g.dart b/colorist/step_06/lib/providers/system_prompt.g.dart index 57e452cadf..053524e338 100644 --- a/colorist/step_06/lib/providers/system_prompt.g.dart +++ b/colorist/step_06/lib/providers/system_prompt.g.dart @@ -6,22 +6,38 @@ part of 'system_prompt.dart'; // RiverpodGenerator // ************************************************************************** -String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [systemPrompt]. @ProviderFor(systemPrompt) -final systemPromptProvider = AutoDisposeFutureProvider.internal( - systemPrompt, - name: r'systemPromptProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$systemPromptHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef SystemPromptRef = AutoDisposeFutureProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const systemPromptProvider = SystemPromptProvider._(); + +final class SystemPromptProvider + extends $FunctionalProvider, String, FutureOr> + with $FutureModifier, $FutureProvider { + const SystemPromptProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'systemPromptProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$systemPromptHash(); + + @$internal + @override + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return systemPrompt(ref); + } +} + +String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; diff --git a/colorist/step_06/lib/services/gemini_chat_service.dart b/colorist/step_06/lib/services/gemini_chat_service.dart index 3bc821e5f3..ca47e06414 100644 --- a/colorist/step_06/lib/services/gemini_chat_service.dart +++ b/colorist/step_06/lib/services/gemini_chat_service.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_riverpod/legacy.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../providers/gemini.dart'; @@ -25,8 +25,8 @@ class GeminiChatService { Future sendMessage(String message) async { final chatSession = await ref.read(chatSessionProvider.future); final conversationState = ref.read(conversationStateProvider); - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); if (conversationState == ConversationState.busy) { logStateNotifier.logWarning( @@ -68,8 +68,8 @@ class GeminiChatService { String llmMessageId, ) async { final chatSession = await ref.read(chatSessionProvider.future); - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); final blockText = block.text; if (blockText != null) { diff --git a/colorist/step_06/lib/services/gemini_chat_service.g.dart b/colorist/step_06/lib/services/gemini_chat_service.g.dart index d39c419058..c1c8b190ae 100644 --- a/colorist/step_06/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_06/lib/services/gemini_chat_service.g.dart @@ -6,23 +6,52 @@ part of 'gemini_chat_service.dart'; // RiverpodGenerator // ************************************************************************** -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [geminiChatService]. @ProviderFor(geminiChatService) -final geminiChatServiceProvider = - AutoDisposeProvider.internal( - geminiChatService, - name: r'geminiChatServiceProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiChatServiceHash, - dependencies: null, - allTransitiveDependencies: null, +const geminiChatServiceProvider = GeminiChatServiceProvider._(); + +final class GeminiChatServiceProvider + extends + $FunctionalProvider< + GeminiChatService, + GeminiChatService, + GeminiChatService + > + with $Provider { + const GeminiChatServiceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiChatServiceProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiChatServiceHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + GeminiChatService create(Ref ref) { + return geminiChatService(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(GeminiChatService value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), ); + } +} -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiChatServiceRef = AutoDisposeProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; diff --git a/colorist/step_06/lib/services/gemini_tools.dart b/colorist/step_06/lib/services/gemini_tools.dart index 508d3b2f98..d1f24786b2 100644 --- a/colorist/step_06/lib/services/gemini_tools.dart +++ b/colorist/step_06/lib/services/gemini_tools.dart @@ -4,7 +4,6 @@ import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'gemini_tools.g.dart'; @@ -32,7 +31,7 @@ class GeminiTools { String functionName, Map arguments, ) { - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); logStateNotifier.logFunctionCall(functionName, arguments); return switch (functionName) { 'set_color' => handleSetColor(arguments), @@ -41,7 +40,7 @@ class GeminiTools { } Map handleSetColor(Map arguments) { - final colorStateNotifier = ref.read(colorStateNotifierProvider.notifier); + final colorStateNotifier = ref.read(colorStateProvider.notifier); final red = (arguments['red'] as num).toDouble(); final green = (arguments['green'] as num).toDouble(); final blue = (arguments['blue'] as num).toDouble(); @@ -52,13 +51,13 @@ class GeminiTools { .toLLMContextMap(), }; - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); logStateNotifier.logFunctionResults(functionResults); return functionResults; } Map handleUnknownFunction(String functionName) { - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); logStateNotifier.logWarning('Unsupported function call $functionName'); return { 'success': false, diff --git a/colorist/step_06/lib/services/gemini_tools.g.dart b/colorist/step_06/lib/services/gemini_tools.g.dart index 630b2286ce..0f8347266c 100644 --- a/colorist/step_06/lib/services/gemini_tools.g.dart +++ b/colorist/step_06/lib/services/gemini_tools.g.dart @@ -6,22 +6,46 @@ part of 'gemini_tools.dart'; // RiverpodGenerator // ************************************************************************** -String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [geminiTools]. @ProviderFor(geminiTools) -final geminiToolsProvider = AutoDisposeProvider.internal( - geminiTools, - name: r'geminiToolsProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiToolsHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiToolsRef = AutoDisposeProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const geminiToolsProvider = GeminiToolsProvider._(); + +final class GeminiToolsProvider + extends $FunctionalProvider + with $Provider { + const GeminiToolsProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiToolsProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiToolsHash(); + + @$internal + @override + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(pointer); + + @override + GeminiTools create(Ref ref) { + return geminiTools(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(GeminiTools value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; diff --git a/colorist/step_06/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_06/macos/Runner.xcodeproj/project.pbxproj index 40b4a8400c..5705663d27 100644 --- a/colorist/step_06/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_06/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB8005ACB477793346F9B928 /* Pods_Runner.framework */; }; - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */; }; + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,8 +62,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -80,14 +79,15 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - CB8005ACB477793346F9B928 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */, + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +103,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */, + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +137,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - BEDDB94EC779878F47F51D3D /* Pods */, + 96479A713AF984E332242AC3 /* Pods */, ); sourceTree = ""; }; @@ -185,15 +185,15 @@ path = Runner; sourceTree = ""; }; - BEDDB94EC779878F47F51D3D /* Pods */ = { + 96479A713AF984E332242AC3 /* Pods */ = { isa = PBXGroup; children = ( - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */, - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */, - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */, - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */, - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */, - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */, + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -202,8 +202,8 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - CB8005ACB477793346F9B928 /* Pods_Runner.framework */, - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */, + D60B4970810E6450720BA91A /* Pods_Runner.framework */, + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */, + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */, + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */, + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,21 +323,26 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */ = { + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -378,7 +383,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */ = { + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -393,33 +398,28 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */ = { + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_06/pubspec.yaml b/colorist/step_06/pubspec.yaml index 75d44f906b..72e86ffbb8 100644 --- a/colorist/step_06/pubspec.yaml +++ b/colorist/step_06/pubspec.yaml @@ -4,26 +4,26 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.9.0 + sdk: ^3.9.2 dependencies: flutter: sdk: flutter - colorist_ui: ^0.2.5 - flutter_riverpod: ^2.6.1 - riverpod_annotation: ^2.6.1 - firebase_core: ^4.0.0 - firebase_ai: ^3.1.0 + colorist_ui: ^0.3.0 + flutter_riverpod: ^3.0.0 + riverpod_annotation: ^3.0.0 + firebase_core: ^4.1.0 + firebase_ai: ^3.2.0 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^6.0.0 - build_runner: ^2.5.4 - riverpod_generator: ^2.6.5 - riverpod_lint: ^2.6.5 - json_serializable: ^6.9.5 - custom_lint: ^0.7.6 + build_runner: ^2.7.1 + riverpod_generator: ^3.0.0 + riverpod_lint: ^3.0.0 + json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_07/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_07/ios/Runner.xcodeproj/project.pbxproj index 90f5596b2b..3faa22fa2f 100644 --- a/colorist/step_07/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_07/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,18 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -61,10 +63,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -72,30 +72,30 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 88C01DB8BD076FDD77CAA78C /* Pods_Runner.framework in Frameworks */, + 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - DF1E44B816CCC38BF7580232 /* Frameworks */ = { + F06202242F3753DC8C8E93BC /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 264F2ECFF34EF46F319F45E0 /* Pods_RunnerTests.framework in Frameworks */, + 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0DD397DDABE0052F1DE19F5A /* Pods */ = { + 312762A7BBA5485B1B58DF05 /* Pods */ = { isa = PBXGroup; children = ( - E195793174425599BF9FD8A5 /* Pods-Runner.debug.xcconfig */, - CEE59FDC4692CF13B3A531A9 /* Pods-Runner.release.xcconfig */, - B01FCE518161C09C15CA2A76 /* Pods-Runner.profile.xcconfig */, - F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */, - 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */, - 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */, + 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, + 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, + 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, + BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, + F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, + 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -109,15 +109,6 @@ path = RunnerTests; sourceTree = ""; }; - 63D2F3770F1CD08D5029406D /* Frameworks */ = { - isa = PBXGroup; - children = ( - 551A8BDC5926A4625011CD46 /* Pods_Runner.framework */, - 7565379A5F9A7A666B6B2425 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -136,8 +127,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 0DD397DDABE0052F1DE19F5A /* Pods */, - 63D2F3770F1CD08D5029406D /* Frameworks */, + 312762A7BBA5485B1B58DF05 /* Pods */, + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, ); sourceTree = ""; }; @@ -165,6 +156,15 @@ path = Runner; sourceTree = ""; }; + D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, + 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */, + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - DF1E44B816CCC38BF7580232 /* Frameworks */, + F06202242F3753DC8C8E93BC /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */, + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */, + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,6 +270,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -286,26 +308,21 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 8988EB036E02293A325AD4F3 /* [CP] Check Pods Manifest.lock */ = { + 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -323,7 +340,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 9D9634CD004451CE09A4C7EC /* [CP] Check Pods Manifest.lock */ = { + C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -345,23 +362,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - E44691D46E128A424E4EA835 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F7F8EA4F92EE4A949ACFD794 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3DC1C736C9330C4641F0E9E7 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 51382D7D6048D4C925DFF480 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_07/lib/providers/gemini.dart b/colorist/step_07/lib/providers/gemini.dart index e49f4657bd..415f098553 100644 --- a/colorist/step_07/lib/providers/gemini.dart +++ b/colorist/step_07/lib/providers/gemini.dart @@ -6,7 +6,6 @@ import 'dart:async'; import 'package:firebase_ai/firebase_ai.dart'; import 'package:firebase_core/firebase_core.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../firebase_options.dart'; diff --git a/colorist/step_07/lib/providers/gemini.g.dart b/colorist/step_07/lib/providers/gemini.g.dart index abeb560cfc..176c7339c4 100644 --- a/colorist/step_07/lib/providers/gemini.g.dart +++ b/colorist/step_07/lib/providers/gemini.g.dart @@ -6,56 +6,122 @@ part of 'gemini.dart'; // RiverpodGenerator // ************************************************************************** -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [firebaseApp]. @ProviderFor(firebaseApp) -final firebaseAppProvider = AutoDisposeFutureProvider.internal( - firebaseApp, - name: r'firebaseAppProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$firebaseAppHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef FirebaseAppRef = AutoDisposeFutureProviderRef; -String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; +const firebaseAppProvider = FirebaseAppProvider._(); + +final class FirebaseAppProvider + extends + $FunctionalProvider< + AsyncValue, + FirebaseApp, + FutureOr + > + with $FutureModifier, $FutureProvider { + const FirebaseAppProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'firebaseAppProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$firebaseAppHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return firebaseApp(ref); + } +} + +String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; -/// See also [geminiModel]. @ProviderFor(geminiModel) -final geminiModelProvider = AutoDisposeFutureProvider.internal( - geminiModel, - name: r'geminiModelProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiModelHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiModelRef = AutoDisposeFutureProviderRef; -String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; +const geminiModelProvider = GeminiModelProvider._(); + +final class GeminiModelProvider + extends + $FunctionalProvider< + AsyncValue, + GenerativeModel, + FutureOr + > + with $FutureModifier, $FutureProvider { + const GeminiModelProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiModelProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiModelHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return geminiModel(ref); + } +} + +String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; -/// See also [chatSession]. @ProviderFor(chatSession) -final chatSessionProvider = FutureProvider.internal( - chatSession, - name: r'chatSessionProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$chatSessionHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef ChatSessionRef = FutureProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const chatSessionProvider = ChatSessionProvider._(); + +final class ChatSessionProvider + extends + $FunctionalProvider< + AsyncValue, + ChatSession, + FutureOr + > + with $FutureModifier, $FutureProvider { + const ChatSessionProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'chatSessionProvider', + isAutoDispose: false, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$chatSessionHash(); + + @$internal + @override + $FutureProviderElement $createElement( + $ProviderPointer pointer, + ) => $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return chatSession(ref); + } +} + +String _$chatSessionHash() => r'fdd5e4ed9d06db9712c9300eeb8a1b54a115b10a'; diff --git a/colorist/step_07/lib/providers/system_prompt.dart b/colorist/step_07/lib/providers/system_prompt.dart index 8e6b2f1000..683a3ae70a 100644 --- a/colorist/step_07/lib/providers/system_prompt.dart +++ b/colorist/step_07/lib/providers/system_prompt.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter/services.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'system_prompt.g.dart'; diff --git a/colorist/step_07/lib/providers/system_prompt.g.dart b/colorist/step_07/lib/providers/system_prompt.g.dart index 57e452cadf..053524e338 100644 --- a/colorist/step_07/lib/providers/system_prompt.g.dart +++ b/colorist/step_07/lib/providers/system_prompt.g.dart @@ -6,22 +6,38 @@ part of 'system_prompt.dart'; // RiverpodGenerator // ************************************************************************** -String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [systemPrompt]. @ProviderFor(systemPrompt) -final systemPromptProvider = AutoDisposeFutureProvider.internal( - systemPrompt, - name: r'systemPromptProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$systemPromptHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef SystemPromptRef = AutoDisposeFutureProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const systemPromptProvider = SystemPromptProvider._(); + +final class SystemPromptProvider + extends $FunctionalProvider, String, FutureOr> + with $FutureModifier, $FutureProvider { + const SystemPromptProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'systemPromptProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$systemPromptHash(); + + @$internal + @override + $FutureProviderElement $createElement($ProviderPointer pointer) => + $FutureProviderElement(pointer); + + @override + FutureOr create(Ref ref) { + return systemPrompt(ref); + } +} + +String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; diff --git a/colorist/step_07/lib/services/gemini_chat_service.dart b/colorist/step_07/lib/services/gemini_chat_service.dart index 43cf9c7bf2..f403018793 100644 --- a/colorist/step_07/lib/services/gemini_chat_service.dart +++ b/colorist/step_07/lib/services/gemini_chat_service.dart @@ -7,7 +7,7 @@ import 'dart:convert'; import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_riverpod/legacy.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../providers/gemini.dart'; @@ -30,8 +30,8 @@ class GeminiChatService { Future sendMessage(String message) async { final chatSession = await ref.read(chatSessionProvider.future); final conversationState = ref.read(conversationStateProvider); - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); if (conversationState == ConversationState.busy) { logStateNotifier.logWarning( @@ -73,8 +73,8 @@ class GeminiChatService { String llmMessageId, ) async { final chatSession = await ref.read(chatSessionProvider.future); - final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier); - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); final blockText = block.text; if (blockText != null) { diff --git a/colorist/step_07/lib/services/gemini_chat_service.g.dart b/colorist/step_07/lib/services/gemini_chat_service.g.dart index d39c419058..c1c8b190ae 100644 --- a/colorist/step_07/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_07/lib/services/gemini_chat_service.g.dart @@ -6,23 +6,52 @@ part of 'gemini_chat_service.dart'; // RiverpodGenerator // ************************************************************************** -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [geminiChatService]. @ProviderFor(geminiChatService) -final geminiChatServiceProvider = - AutoDisposeProvider.internal( - geminiChatService, - name: r'geminiChatServiceProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiChatServiceHash, - dependencies: null, - allTransitiveDependencies: null, +const geminiChatServiceProvider = GeminiChatServiceProvider._(); + +final class GeminiChatServiceProvider + extends + $FunctionalProvider< + GeminiChatService, + GeminiChatService, + GeminiChatService + > + with $Provider { + const GeminiChatServiceProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiChatServiceProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiChatServiceHash(); + + @$internal + @override + $ProviderElement $createElement( + $ProviderPointer pointer, + ) => $ProviderElement(pointer); + + @override + GeminiChatService create(Ref ref) { + return geminiChatService(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(GeminiChatService value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), ); + } +} -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiChatServiceRef = AutoDisposeProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; diff --git a/colorist/step_07/lib/services/gemini_tools.dart b/colorist/step_07/lib/services/gemini_tools.dart index 508d3b2f98..d1f24786b2 100644 --- a/colorist/step_07/lib/services/gemini_tools.dart +++ b/colorist/step_07/lib/services/gemini_tools.dart @@ -4,7 +4,6 @@ import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'gemini_tools.g.dart'; @@ -32,7 +31,7 @@ class GeminiTools { String functionName, Map arguments, ) { - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); logStateNotifier.logFunctionCall(functionName, arguments); return switch (functionName) { 'set_color' => handleSetColor(arguments), @@ -41,7 +40,7 @@ class GeminiTools { } Map handleSetColor(Map arguments) { - final colorStateNotifier = ref.read(colorStateNotifierProvider.notifier); + final colorStateNotifier = ref.read(colorStateProvider.notifier); final red = (arguments['red'] as num).toDouble(); final green = (arguments['green'] as num).toDouble(); final blue = (arguments['blue'] as num).toDouble(); @@ -52,13 +51,13 @@ class GeminiTools { .toLLMContextMap(), }; - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); logStateNotifier.logFunctionResults(functionResults); return functionResults; } Map handleUnknownFunction(String functionName) { - final logStateNotifier = ref.read(logStateNotifierProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); logStateNotifier.logWarning('Unsupported function call $functionName'); return { 'success': false, diff --git a/colorist/step_07/lib/services/gemini_tools.g.dart b/colorist/step_07/lib/services/gemini_tools.g.dart index 630b2286ce..0f8347266c 100644 --- a/colorist/step_07/lib/services/gemini_tools.g.dart +++ b/colorist/step_07/lib/services/gemini_tools.g.dart @@ -6,22 +6,46 @@ part of 'gemini_tools.dart'; // RiverpodGenerator // ************************************************************************** -String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint, type=warning -/// See also [geminiTools]. @ProviderFor(geminiTools) -final geminiToolsProvider = AutoDisposeProvider.internal( - geminiTools, - name: r'geminiToolsProvider', - debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') - ? null - : _$geminiToolsHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef GeminiToolsRef = AutoDisposeProviderRef; -// ignore_for_file: type=lint -// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package +const geminiToolsProvider = GeminiToolsProvider._(); + +final class GeminiToolsProvider + extends $FunctionalProvider + with $Provider { + const GeminiToolsProvider._() + : super( + from: null, + argument: null, + retry: null, + name: r'geminiToolsProvider', + isAutoDispose: true, + dependencies: null, + $allTransitiveDependencies: null, + ); + + @override + String debugGetCreateSourceHash() => _$geminiToolsHash(); + + @$internal + @override + $ProviderElement $createElement($ProviderPointer pointer) => + $ProviderElement(pointer); + + @override + GeminiTools create(Ref ref) { + return geminiTools(ref); + } + + /// {@macro riverpod.override_with_value} + Override overrideWithValue(GeminiTools value) { + return $ProviderOverride( + origin: this, + providerOverride: $SyncValueProvider(value), + ); + } +} + +String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; diff --git a/colorist/step_07/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_07/macos/Runner.xcodeproj/project.pbxproj index 40b4a8400c..5705663d27 100644 --- a/colorist/step_07/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_07/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB8005ACB477793346F9B928 /* Pods_Runner.framework */; }; - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */; }; + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,8 +62,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -80,14 +79,15 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; - CB8005ACB477793346F9B928 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 206CB92BCBA751923E72E4E2 /* Pods_RunnerTests.framework in Frameworks */, + DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +103,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 00CE8B0408FDDF1C1509E877 /* Pods_Runner.framework in Frameworks */, + 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +137,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - BEDDB94EC779878F47F51D3D /* Pods */, + 96479A713AF984E332242AC3 /* Pods */, ); sourceTree = ""; }; @@ -185,15 +185,15 @@ path = Runner; sourceTree = ""; }; - BEDDB94EC779878F47F51D3D /* Pods */ = { + 96479A713AF984E332242AC3 /* Pods */ = { isa = PBXGroup; children = ( - 623D1CBC02F271F3ECA61214 /* Pods-Runner.debug.xcconfig */, - 88B6597E4A24477C17D406F3 /* Pods-Runner.release.xcconfig */, - C0E97F7BBD8C66E786E665F2 /* Pods-Runner.profile.xcconfig */, - 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */, - 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */, - C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */, + 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, + ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, + 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, + 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, + 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, + F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -202,8 +202,8 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - CB8005ACB477793346F9B928 /* Pods_Runner.framework */, - 518B3975E6E93BEED3EB4A62 /* Pods_RunnerTests.framework */, + D60B4970810E6450720BA91A /* Pods_Runner.framework */, + 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */, + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */, + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */, + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,21 +323,26 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1C052952F6B3FC1E67DE8F54 /* [CP] Embed Pods Frameworks */ = { + 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -378,7 +383,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - ACFDE673FCF0C42F93DBDA2F /* [CP] Check Pods Manifest.lock */ = { + 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -393,33 +398,28 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - D4017C7223476CF33AE69CF3 /* [CP] Check Pods Manifest.lock */ = { + 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2569F749A6ABF530740B35A2 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 32ECBAC8BD69D0512022A5D9 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C70CFFE525EE4A833AE81C0B /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_07/pubspec.yaml b/colorist/step_07/pubspec.yaml index 75d44f906b..72e86ffbb8 100644 --- a/colorist/step_07/pubspec.yaml +++ b/colorist/step_07/pubspec.yaml @@ -4,26 +4,26 @@ publish_to: 'none' version: 0.1.0 environment: - sdk: ^3.9.0 + sdk: ^3.9.2 dependencies: flutter: sdk: flutter - colorist_ui: ^0.2.5 - flutter_riverpod: ^2.6.1 - riverpod_annotation: ^2.6.1 - firebase_core: ^4.0.0 - firebase_ai: ^3.1.0 + colorist_ui: ^0.3.0 + flutter_riverpod: ^3.0.0 + riverpod_annotation: ^3.0.0 + firebase_core: ^4.1.0 + firebase_ai: ^3.2.0 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^6.0.0 - build_runner: ^2.5.4 - riverpod_generator: ^2.6.5 - riverpod_lint: ^2.6.5 - json_serializable: ^6.9.5 - custom_lint: ^0.7.6 + build_runner: ^2.7.1 + riverpod_generator: ^3.0.0 + riverpod_lint: ^3.0.0 + json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true From 05174bb1c8a5fc8e43a13a9b8cfedf904bc2a1b2 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Fri, 12 Sep 2025 09:27:31 +1000 Subject: [PATCH 02/10] Drop `custom_lint` --- colorist/codelab_rebuild.yaml | 8 +- colorist/step_01/analysis_options.yaml | 4 - colorist/step_01/pubspec.yaml | 1 - colorist/step_02/analysis_options.yaml | 4 - .../ios/Runner.xcodeproj/project.pbxproj | 142 +++++++++--------- .../macos/Runner.xcodeproj/project.pbxproj | 102 ++++++------- colorist/step_02/pubspec.yaml | 1 - colorist/step_03/analysis_options.yaml | 4 - .../ios/Runner.xcodeproj/project.pbxproj | 142 +++++++++--------- .../macos/Runner.xcodeproj/project.pbxproj | 102 ++++++------- colorist/step_03/pubspec.yaml | 1 - colorist/step_04/analysis_options.yaml | 4 - .../ios/Runner.xcodeproj/project.pbxproj | 142 +++++++++--------- .../macos/Runner.xcodeproj/project.pbxproj | 102 ++++++------- colorist/step_04/pubspec.yaml | 1 - colorist/step_05/analysis_options.yaml | 4 - .../ios/Runner.xcodeproj/project.pbxproj | 142 +++++++++--------- .../macos/Runner.xcodeproj/project.pbxproj | 102 ++++++------- colorist/step_05/pubspec.yaml | 1 - colorist/step_06/analysis_options.yaml | 4 - .../ios/Runner.xcodeproj/project.pbxproj | 142 +++++++++--------- .../macos/Runner.xcodeproj/project.pbxproj | 102 ++++++------- colorist/step_06/pubspec.yaml | 1 - colorist/step_07/analysis_options.yaml | 4 - .../ios/Runner.xcodeproj/project.pbxproj | 142 +++++++++--------- .../macos/Runner.xcodeproj/project.pbxproj | 102 ++++++------- colorist/step_07/pubspec.yaml | 1 - 27 files changed, 734 insertions(+), 773 deletions(-) diff --git a/colorist/codelab_rebuild.yaml b/colorist/codelab_rebuild.yaml index f18cdbfe78..8ab568db1a 100644 --- a/colorist/codelab_rebuild.yaml +++ b/colorist/codelab_rebuild.yaml @@ -8,7 +8,7 @@ steps: flutter: create -e colorist --platforms=android,ios,macos,web,windows - name: Add dependencies path: colorist - flutter: pub add colorist_ui flutter_riverpod riverpod_annotation dev:build_runner dev:riverpod_generator dev:riverpod_lint dev:json_serializable dev:custom_lint + flutter: pub add colorist_ui flutter_riverpod riverpod_annotation dev:build_runner dev:riverpod_generator dev:riverpod_lint dev:json_serializable - name: Strip DEVELOPMENT_TEAM strip-lines-containing: DEVELOPMENT_TEAM = path: colorist/ios/Runner.xcodeproj/project.pbxproj @@ -17,10 +17,6 @@ steps: replace-contents: | include: ../../analysis_options.yaml - # analyzer: - # plugins: - # - custom_lint - linter: rules: prefer_single_quotes: false @@ -429,7 +425,7 @@ steps: patch-u: | --- b/colorist/step_03/pubspec.yaml +++ a/colorist/step_03/pubspec.yaml - @@ -27,3 +27,6 @@ dev_dependencies: + @@ -26,3 +26,6 @@ dev_dependencies: flutter: uses-material-design: true diff --git a/colorist/step_01/analysis_options.yaml b/colorist/step_01/analysis_options.yaml index b4219fd4d9..8ac00898db 100644 --- a/colorist/step_01/analysis_options.yaml +++ b/colorist/step_01/analysis_options.yaml @@ -1,9 +1,5 @@ include: ../../analysis_options.yaml -# analyzer: -# plugins: -# - custom_lint - linter: rules: prefer_single_quotes: false diff --git a/colorist/step_01/pubspec.yaml b/colorist/step_01/pubspec.yaml index f200466b8f..541b0e980f 100644 --- a/colorist/step_01/pubspec.yaml +++ b/colorist/step_01/pubspec.yaml @@ -21,7 +21,6 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 - custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_02/analysis_options.yaml b/colorist/step_02/analysis_options.yaml index b4219fd4d9..8ac00898db 100644 --- a/colorist/step_02/analysis_options.yaml +++ b/colorist/step_02/analysis_options.yaml @@ -1,9 +1,5 @@ include: ../../analysis_options.yaml -# analyzer: -# plugins: -# - custom_lint - linter: rules: prefer_single_quotes: false diff --git a/colorist/step_02/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_02/ios/Runner.xcodeproj/project.pbxproj index 3faa22fa2f..2c6115381e 100644 --- a/colorist/step_02/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_02/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */; }; + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,20 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -63,50 +63,59 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { + 11D617E0E68182E0AF6F641E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - F06202242F3753DC8C8E93BC /* Frameworks */ = { + 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 312762A7BBA5485B1B58DF05 /* Pods */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 4C1E8DD8D6FD8E07FEB3345F /* Pods */ = { isa = PBXGroup; children = ( - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */, + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */, + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */, + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */, + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */, + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; sourceTree = ""; }; - 331C8082294A63A400263BE5 /* RunnerTests */ = { + 8880DED7E78197F9A4E11F9C /* Frameworks */ = { isa = PBXGroup; children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */, + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */, ); - path = RunnerTests; + name = Frameworks; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -127,8 +136,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 312762A7BBA5485B1B58DF05 /* Pods */, - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, + 4C1E8DD8D6FD8E07FEB3345F /* Pods */, + 8880DED7E78197F9A4E11F9C /* Frameworks */, ); sourceTree = ""; }; @@ -156,15 +165,6 @@ path = Runner; sourceTree = ""; }; - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - F06202242F3753DC8C8E93BC /* Frameworks */, + 11D617E0E68182E0AF6F641E /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,28 +270,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -308,21 +286,26 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -340,7 +323,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -355,13 +338,30 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_02/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_02/macos/Runner.xcodeproj/project.pbxproj index 5705663d27..80c1363139 100644 --- a/colorist/step_02/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_02/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,11 +62,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* colorist.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = colorist.app; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; @@ -79,15 +82,12 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,13 +103,27 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3063AADF128E25C02C3FA6F6 /* Pods */ = { + isa = PBXGroup; + children = ( + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */, + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */, + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */, + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */, + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */, + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 331C80D6294CF71000263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( @@ -137,7 +151,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 96479A713AF984E332242AC3 /* Pods */, + 3063AADF128E25C02C3FA6F6 /* Pods */, ); sourceTree = ""; }; @@ -185,25 +199,11 @@ path = Runner; sourceTree = ""; }; - 96479A713AF984E332242AC3 /* Pods */ = { - isa = PBXGroup; - children = ( - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - D60B4970810E6450720BA91A /* Pods_Runner.framework */, - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */, + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,26 +323,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -383,7 +378,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -405,21 +400,26 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_02/pubspec.yaml b/colorist/step_02/pubspec.yaml index ab86f55913..9a007f2af3 100644 --- a/colorist/step_02/pubspec.yaml +++ b/colorist/step_02/pubspec.yaml @@ -23,7 +23,6 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 - custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_03/analysis_options.yaml b/colorist/step_03/analysis_options.yaml index b4219fd4d9..8ac00898db 100644 --- a/colorist/step_03/analysis_options.yaml +++ b/colorist/step_03/analysis_options.yaml @@ -1,9 +1,5 @@ include: ../../analysis_options.yaml -# analyzer: -# plugins: -# - custom_lint - linter: rules: prefer_single_quotes: false diff --git a/colorist/step_03/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_03/ios/Runner.xcodeproj/project.pbxproj index 3faa22fa2f..2c6115381e 100644 --- a/colorist/step_03/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_03/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */; }; + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,20 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -63,50 +63,59 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { + 11D617E0E68182E0AF6F641E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - F06202242F3753DC8C8E93BC /* Frameworks */ = { + 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 312762A7BBA5485B1B58DF05 /* Pods */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 4C1E8DD8D6FD8E07FEB3345F /* Pods */ = { isa = PBXGroup; children = ( - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */, + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */, + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */, + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */, + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */, + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; sourceTree = ""; }; - 331C8082294A63A400263BE5 /* RunnerTests */ = { + 8880DED7E78197F9A4E11F9C /* Frameworks */ = { isa = PBXGroup; children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */, + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */, ); - path = RunnerTests; + name = Frameworks; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -127,8 +136,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 312762A7BBA5485B1B58DF05 /* Pods */, - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, + 4C1E8DD8D6FD8E07FEB3345F /* Pods */, + 8880DED7E78197F9A4E11F9C /* Frameworks */, ); sourceTree = ""; }; @@ -156,15 +165,6 @@ path = Runner; sourceTree = ""; }; - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - F06202242F3753DC8C8E93BC /* Frameworks */, + 11D617E0E68182E0AF6F641E /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,28 +270,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -308,21 +286,26 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -340,7 +323,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -355,13 +338,30 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_03/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_03/macos/Runner.xcodeproj/project.pbxproj index 5705663d27..80c1363139 100644 --- a/colorist/step_03/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_03/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,11 +62,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* colorist.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = colorist.app; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; @@ -79,15 +82,12 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,13 +103,27 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3063AADF128E25C02C3FA6F6 /* Pods */ = { + isa = PBXGroup; + children = ( + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */, + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */, + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */, + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */, + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */, + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 331C80D6294CF71000263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( @@ -137,7 +151,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 96479A713AF984E332242AC3 /* Pods */, + 3063AADF128E25C02C3FA6F6 /* Pods */, ); sourceTree = ""; }; @@ -185,25 +199,11 @@ path = Runner; sourceTree = ""; }; - 96479A713AF984E332242AC3 /* Pods */ = { - isa = PBXGroup; - children = ( - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - D60B4970810E6450720BA91A /* Pods_Runner.framework */, - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */, + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,26 +323,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -383,7 +378,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -405,21 +400,26 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_03/pubspec.yaml b/colorist/step_03/pubspec.yaml index 72e86ffbb8..7ced119b84 100644 --- a/colorist/step_03/pubspec.yaml +++ b/colorist/step_03/pubspec.yaml @@ -23,7 +23,6 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 - custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_04/analysis_options.yaml b/colorist/step_04/analysis_options.yaml index b4219fd4d9..8ac00898db 100644 --- a/colorist/step_04/analysis_options.yaml +++ b/colorist/step_04/analysis_options.yaml @@ -1,9 +1,5 @@ include: ../../analysis_options.yaml -# analyzer: -# plugins: -# - custom_lint - linter: rules: prefer_single_quotes: false diff --git a/colorist/step_04/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_04/ios/Runner.xcodeproj/project.pbxproj index 3faa22fa2f..2c6115381e 100644 --- a/colorist/step_04/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_04/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */; }; + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,20 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -63,50 +63,59 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { + 11D617E0E68182E0AF6F641E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - F06202242F3753DC8C8E93BC /* Frameworks */ = { + 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 312762A7BBA5485B1B58DF05 /* Pods */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 4C1E8DD8D6FD8E07FEB3345F /* Pods */ = { isa = PBXGroup; children = ( - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */, + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */, + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */, + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */, + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */, + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; sourceTree = ""; }; - 331C8082294A63A400263BE5 /* RunnerTests */ = { + 8880DED7E78197F9A4E11F9C /* Frameworks */ = { isa = PBXGroup; children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */, + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */, ); - path = RunnerTests; + name = Frameworks; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -127,8 +136,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 312762A7BBA5485B1B58DF05 /* Pods */, - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, + 4C1E8DD8D6FD8E07FEB3345F /* Pods */, + 8880DED7E78197F9A4E11F9C /* Frameworks */, ); sourceTree = ""; }; @@ -156,15 +165,6 @@ path = Runner; sourceTree = ""; }; - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - F06202242F3753DC8C8E93BC /* Frameworks */, + 11D617E0E68182E0AF6F641E /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,28 +270,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -308,21 +286,26 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -340,7 +323,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -355,13 +338,30 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_04/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_04/macos/Runner.xcodeproj/project.pbxproj index 5705663d27..80c1363139 100644 --- a/colorist/step_04/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_04/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,11 +62,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* colorist.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = colorist.app; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; @@ -79,15 +82,12 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,13 +103,27 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3063AADF128E25C02C3FA6F6 /* Pods */ = { + isa = PBXGroup; + children = ( + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */, + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */, + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */, + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */, + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */, + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 331C80D6294CF71000263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( @@ -137,7 +151,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 96479A713AF984E332242AC3 /* Pods */, + 3063AADF128E25C02C3FA6F6 /* Pods */, ); sourceTree = ""; }; @@ -185,25 +199,11 @@ path = Runner; sourceTree = ""; }; - 96479A713AF984E332242AC3 /* Pods */ = { - isa = PBXGroup; - children = ( - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - D60B4970810E6450720BA91A /* Pods_Runner.framework */, - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */, + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,26 +323,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -383,7 +378,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -405,21 +400,26 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_04/pubspec.yaml b/colorist/step_04/pubspec.yaml index 72e86ffbb8..7ced119b84 100644 --- a/colorist/step_04/pubspec.yaml +++ b/colorist/step_04/pubspec.yaml @@ -23,7 +23,6 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 - custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_05/analysis_options.yaml b/colorist/step_05/analysis_options.yaml index b4219fd4d9..8ac00898db 100644 --- a/colorist/step_05/analysis_options.yaml +++ b/colorist/step_05/analysis_options.yaml @@ -1,9 +1,5 @@ include: ../../analysis_options.yaml -# analyzer: -# plugins: -# - custom_lint - linter: rules: prefer_single_quotes: false diff --git a/colorist/step_05/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_05/ios/Runner.xcodeproj/project.pbxproj index 3faa22fa2f..2c6115381e 100644 --- a/colorist/step_05/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_05/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */; }; + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,20 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -63,50 +63,59 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { + 11D617E0E68182E0AF6F641E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - F06202242F3753DC8C8E93BC /* Frameworks */ = { + 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 312762A7BBA5485B1B58DF05 /* Pods */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 4C1E8DD8D6FD8E07FEB3345F /* Pods */ = { isa = PBXGroup; children = ( - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */, + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */, + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */, + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */, + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */, + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; sourceTree = ""; }; - 331C8082294A63A400263BE5 /* RunnerTests */ = { + 8880DED7E78197F9A4E11F9C /* Frameworks */ = { isa = PBXGroup; children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */, + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */, ); - path = RunnerTests; + name = Frameworks; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -127,8 +136,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 312762A7BBA5485B1B58DF05 /* Pods */, - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, + 4C1E8DD8D6FD8E07FEB3345F /* Pods */, + 8880DED7E78197F9A4E11F9C /* Frameworks */, ); sourceTree = ""; }; @@ -156,15 +165,6 @@ path = Runner; sourceTree = ""; }; - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - F06202242F3753DC8C8E93BC /* Frameworks */, + 11D617E0E68182E0AF6F641E /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,28 +270,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -308,21 +286,26 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -340,7 +323,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -355,13 +338,30 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_05/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_05/macos/Runner.xcodeproj/project.pbxproj index 5705663d27..80c1363139 100644 --- a/colorist/step_05/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_05/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,11 +62,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* colorist.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = colorist.app; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; @@ -79,15 +82,12 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,13 +103,27 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3063AADF128E25C02C3FA6F6 /* Pods */ = { + isa = PBXGroup; + children = ( + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */, + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */, + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */, + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */, + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */, + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 331C80D6294CF71000263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( @@ -137,7 +151,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 96479A713AF984E332242AC3 /* Pods */, + 3063AADF128E25C02C3FA6F6 /* Pods */, ); sourceTree = ""; }; @@ -185,25 +199,11 @@ path = Runner; sourceTree = ""; }; - 96479A713AF984E332242AC3 /* Pods */ = { - isa = PBXGroup; - children = ( - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - D60B4970810E6450720BA91A /* Pods_Runner.framework */, - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */, + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,26 +323,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -383,7 +378,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -405,21 +400,26 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_05/pubspec.yaml b/colorist/step_05/pubspec.yaml index 72e86ffbb8..7ced119b84 100644 --- a/colorist/step_05/pubspec.yaml +++ b/colorist/step_05/pubspec.yaml @@ -23,7 +23,6 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 - custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_06/analysis_options.yaml b/colorist/step_06/analysis_options.yaml index b4219fd4d9..8ac00898db 100644 --- a/colorist/step_06/analysis_options.yaml +++ b/colorist/step_06/analysis_options.yaml @@ -1,9 +1,5 @@ include: ../../analysis_options.yaml -# analyzer: -# plugins: -# - custom_lint - linter: rules: prefer_single_quotes: false diff --git a/colorist/step_06/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_06/ios/Runner.xcodeproj/project.pbxproj index 3faa22fa2f..2c6115381e 100644 --- a/colorist/step_06/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_06/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */; }; + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,20 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -63,50 +63,59 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { + 11D617E0E68182E0AF6F641E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - F06202242F3753DC8C8E93BC /* Frameworks */ = { + 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 312762A7BBA5485B1B58DF05 /* Pods */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 4C1E8DD8D6FD8E07FEB3345F /* Pods */ = { isa = PBXGroup; children = ( - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */, + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */, + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */, + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */, + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */, + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; sourceTree = ""; }; - 331C8082294A63A400263BE5 /* RunnerTests */ = { + 8880DED7E78197F9A4E11F9C /* Frameworks */ = { isa = PBXGroup; children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */, + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */, ); - path = RunnerTests; + name = Frameworks; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -127,8 +136,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 312762A7BBA5485B1B58DF05 /* Pods */, - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, + 4C1E8DD8D6FD8E07FEB3345F /* Pods */, + 8880DED7E78197F9A4E11F9C /* Frameworks */, ); sourceTree = ""; }; @@ -156,15 +165,6 @@ path = Runner; sourceTree = ""; }; - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - F06202242F3753DC8C8E93BC /* Frameworks */, + 11D617E0E68182E0AF6F641E /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,28 +270,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -308,21 +286,26 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -340,7 +323,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -355,13 +338,30 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_06/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_06/macos/Runner.xcodeproj/project.pbxproj index 5705663d27..80c1363139 100644 --- a/colorist/step_06/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_06/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,11 +62,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* colorist.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = colorist.app; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; @@ -79,15 +82,12 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,13 +103,27 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3063AADF128E25C02C3FA6F6 /* Pods */ = { + isa = PBXGroup; + children = ( + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */, + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */, + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */, + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */, + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */, + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 331C80D6294CF71000263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( @@ -137,7 +151,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 96479A713AF984E332242AC3 /* Pods */, + 3063AADF128E25C02C3FA6F6 /* Pods */, ); sourceTree = ""; }; @@ -185,25 +199,11 @@ path = Runner; sourceTree = ""; }; - 96479A713AF984E332242AC3 /* Pods */ = { - isa = PBXGroup; - children = ( - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - D60B4970810E6450720BA91A /* Pods_Runner.framework */, - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */, + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,26 +323,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -383,7 +378,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -405,21 +400,26 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_06/pubspec.yaml b/colorist/step_06/pubspec.yaml index 72e86ffbb8..7ced119b84 100644 --- a/colorist/step_06/pubspec.yaml +++ b/colorist/step_06/pubspec.yaml @@ -23,7 +23,6 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 - custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_07/analysis_options.yaml b/colorist/step_07/analysis_options.yaml index b4219fd4d9..8ac00898db 100644 --- a/colorist/step_07/analysis_options.yaml +++ b/colorist/step_07/analysis_options.yaml @@ -1,9 +1,5 @@ include: ../../analysis_options.yaml -# analyzer: -# plugins: -# - custom_lint - linter: rules: prefer_single_quotes: false diff --git a/colorist/step_07/ios/Runner.xcodeproj/project.pbxproj b/colorist/step_07/ios/Runner.xcodeproj/project.pbxproj index 3faa22fa2f..2c6115381e 100644 --- a/colorist/step_07/ios/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_07/ios/Runner.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */; }; + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,20 +42,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -63,50 +63,59 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { + 11D617E0E68182E0AF6F641E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 148F65E9DF0D142BFBD492AD /* Pods_Runner.framework in Frameworks */, + 5253AF30A3F4D5A3C418ED70 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - F06202242F3753DC8C8E93BC /* Frameworks */ = { + 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9AD61D48E30392E3579B069E /* Pods_RunnerTests.framework in Frameworks */, + 5E9ACF1A1A66CBF45C702570 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 312762A7BBA5485B1B58DF05 /* Pods */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 4C1E8DD8D6FD8E07FEB3345F /* Pods */ = { isa = PBXGroup; children = ( - 06176AADDBF4FAA9BD0607A9 /* Pods-Runner.debug.xcconfig */, - 246FDA2FA2E3F3B064B06A34 /* Pods-Runner.release.xcconfig */, - 8AB1280F6A3029DE48D01FD5 /* Pods-Runner.profile.xcconfig */, - BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */, - F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */, - 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */, + 549CC73AF223C01B3D4FA0DD /* Pods-Runner.debug.xcconfig */, + 7AAD25B243EC8AA90378D961 /* Pods-Runner.release.xcconfig */, + C2F86F4EBCBC3BFC8EDEC8FB /* Pods-Runner.profile.xcconfig */, + 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */, + 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */, + 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; sourceTree = ""; }; - 331C8082294A63A400263BE5 /* RunnerTests */ = { + 8880DED7E78197F9A4E11F9C /* Frameworks */ = { isa = PBXGroup; children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, + A4697F037D8619CB6B86B7D6 /* Pods_Runner.framework */, + 4FF1BE869ED0C6758691371B /* Pods_RunnerTests.framework */, ); - path = RunnerTests; + name = Frameworks; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -127,8 +136,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 312762A7BBA5485B1B58DF05 /* Pods */, - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */, + 4C1E8DD8D6FD8E07FEB3345F /* Pods */, + 8880DED7E78197F9A4E11F9C /* Frameworks */, ); sourceTree = ""; }; @@ -156,15 +165,6 @@ path = Runner; sourceTree = ""; }; - D95C62BF6074EF1AA5ACC1D8 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 3F9F2CFB7942DBCC77C7AA8D /* Pods_Runner.framework */, - 2D7F449726A6E31ACFE308B1 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */, + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - F06202242F3753DC8C8E93BC /* Frameworks */, + 11D617E0E68182E0AF6F641E /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */, + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */, + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -270,28 +270,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1ED32397146C110DD2399EA2 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -308,21 +286,26 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 4E8BC4DC3068C192456C1AB0 /* [CP] Embed Pods Frameworks */ = { + 7C9536D8ADCE200A49A7AF91 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -340,7 +323,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - C2DDEFBA2876B4A2CA8F9FBB /* [CP] Check Pods Manifest.lock */ = { + C377186CB0B140FA82D96855 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -355,13 +338,30 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + F30BDB237F1252195B654A0A /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BDD7AA0D132EAB3512F5921C /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 0573B8BECC8D41C2EBE4382E /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -507,7 +507,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F278F7FA44AECA1AE4E32FC2 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 323D36261E5EABF2731DC877 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -524,7 +524,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 45AAFBA1349A92055C684955 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 0FAF21C5E81D669D7F4C709D /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/colorist/step_07/macos/Runner.xcodeproj/project.pbxproj b/colorist/step_07/macos/Runner.xcodeproj/project.pbxproj index 5705663d27..80c1363139 100644 --- a/colorist/step_07/macos/Runner.xcodeproj/project.pbxproj +++ b/colorist/step_07/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60B4970810E6450720BA91A /* Pods_Runner.framework */; }; + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */; }; + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,11 +62,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 33CC10ED2044A3C60003C045 /* colorist.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = colorist.app; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; @@ -79,15 +82,12 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - D60B4970810E6450720BA91A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DE76448ED12BA69FA5922F05 /* Pods_RunnerTests.framework in Frameworks */, + 105E52C1D5E24397F7FA5335 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,13 +103,27 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 33143B6E33A482F45B37BFC4 /* Pods_Runner.framework in Frameworks */, + 909059D38A248120073D8715 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3063AADF128E25C02C3FA6F6 /* Pods */ = { + isa = PBXGroup; + children = ( + 08E9FCFF9AEE06239C229D8D /* Pods-Runner.debug.xcconfig */, + 3396048B1B61C35824023D66 /* Pods-Runner.release.xcconfig */, + 078CE071E6F8DB7621FED1A9 /* Pods-Runner.profile.xcconfig */, + 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */, + A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */, + 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 331C80D6294CF71000263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( @@ -137,7 +151,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - 96479A713AF984E332242AC3 /* Pods */, + 3063AADF128E25C02C3FA6F6 /* Pods */, ); sourceTree = ""; }; @@ -185,25 +199,11 @@ path = Runner; sourceTree = ""; }; - 96479A713AF984E332242AC3 /* Pods */ = { - isa = PBXGroup; - children = ( - 45526C8905D0F27D3DB9C91D /* Pods-Runner.debug.xcconfig */, - ADB40D7E96DD3519F830B3E0 /* Pods-Runner.release.xcconfig */, - 6029FA9BCA1FAA58DB52676C /* Pods-Runner.profile.xcconfig */, - 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */, - 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */, - F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - D60B4970810E6450720BA91A /* Pods_Runner.framework */, - 1AD509E9F86A8A1A0787C1E2 /* Pods_RunnerTests.framework */, + 0D7E2258CB2BE0835F145D87 /* Pods_Runner.framework */, + ABA139CCCEB8D9C0590367DF /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */, + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */, + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */, + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,26 +323,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 014CBE7F0D773442D7791035 /* [CP] Check Pods Manifest.lock */ = { + 2927BE4F445DF1D0D4767D4C /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 3399D490228B24CF009A79C7 /* ShellScript */ = { @@ -383,7 +378,7 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 567C7D46112368D1FAE0C7A2 /* [CP] Check Pods Manifest.lock */ = { + 5491AC9B6DE57B287292B7B9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -405,21 +400,26 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 6D29F75C0085F51D1A0255AB /* [CP] Embed Pods Frameworks */ = { + AD6271E3F08684F450FD0B30 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 44D0C7BFA5D075B9A62A0F19 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 9704361F95F5921CE601EBAD /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 62421AC4BCDB409A1F2F22CE /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = A3375A0433FE5278983500EE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F47B1693950A891853E4F4CC /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 614121EEAD88B4564993C50C /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/colorist/step_07/pubspec.yaml b/colorist/step_07/pubspec.yaml index 72e86ffbb8..7ced119b84 100644 --- a/colorist/step_07/pubspec.yaml +++ b/colorist/step_07/pubspec.yaml @@ -23,7 +23,6 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 - custom_lint: ^0.8.0 flutter: uses-material-design: true From 44988d853a74b840336e41beb6609c6261ec2d6e Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Sat, 13 Sep 2025 06:49:22 +1000 Subject: [PATCH 03/10] Add back `custom_lint` --- colorist/codelab_rebuild.yaml | 8 ++++++-- colorist/step_01/analysis_options.yaml | 4 ++++ colorist/step_01/pubspec.yaml | 1 + colorist/step_02/analysis_options.yaml | 4 ++++ colorist/step_02/pubspec.yaml | 1 + colorist/step_03/analysis_options.yaml | 4 ++++ colorist/step_03/pubspec.yaml | 1 + colorist/step_04/analysis_options.yaml | 4 ++++ colorist/step_04/pubspec.yaml | 1 + colorist/step_05/analysis_options.yaml | 4 ++++ colorist/step_05/pubspec.yaml | 1 + colorist/step_06/analysis_options.yaml | 4 ++++ colorist/step_06/pubspec.yaml | 1 + colorist/step_07/analysis_options.yaml | 4 ++++ colorist/step_07/pubspec.yaml | 1 + 15 files changed, 41 insertions(+), 2 deletions(-) diff --git a/colorist/codelab_rebuild.yaml b/colorist/codelab_rebuild.yaml index 8ab568db1a..7095d26eb1 100644 --- a/colorist/codelab_rebuild.yaml +++ b/colorist/codelab_rebuild.yaml @@ -8,7 +8,7 @@ steps: flutter: create -e colorist --platforms=android,ios,macos,web,windows - name: Add dependencies path: colorist - flutter: pub add colorist_ui flutter_riverpod riverpod_annotation dev:build_runner dev:riverpod_generator dev:riverpod_lint dev:json_serializable + flutter: pub add colorist_ui flutter_riverpod riverpod_annotation dev:build_runner dev:riverpod_generator dev:riverpod_lint dev:json_serializable dev:custom_lint - name: Strip DEVELOPMENT_TEAM strip-lines-containing: DEVELOPMENT_TEAM = path: colorist/ios/Runner.xcodeproj/project.pbxproj @@ -17,6 +17,10 @@ steps: replace-contents: | include: ../../analysis_options.yaml + analyzer: + plugins: + - custom_lint + linter: rules: prefer_single_quotes: false @@ -425,7 +429,7 @@ steps: patch-u: | --- b/colorist/step_03/pubspec.yaml +++ a/colorist/step_03/pubspec.yaml - @@ -26,3 +26,6 @@ dev_dependencies: + @@ -27,3 +27,6 @@ dev_dependencies: flutter: uses-material-design: true diff --git a/colorist/step_01/analysis_options.yaml b/colorist/step_01/analysis_options.yaml index 8ac00898db..4b6918f5b3 100644 --- a/colorist/step_01/analysis_options.yaml +++ b/colorist/step_01/analysis_options.yaml @@ -1,5 +1,9 @@ include: ../../analysis_options.yaml +analyzer: + plugins: + - custom_lint + linter: rules: prefer_single_quotes: false diff --git a/colorist/step_01/pubspec.yaml b/colorist/step_01/pubspec.yaml index 541b0e980f..f200466b8f 100644 --- a/colorist/step_01/pubspec.yaml +++ b/colorist/step_01/pubspec.yaml @@ -21,6 +21,7 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_02/analysis_options.yaml b/colorist/step_02/analysis_options.yaml index 8ac00898db..4b6918f5b3 100644 --- a/colorist/step_02/analysis_options.yaml +++ b/colorist/step_02/analysis_options.yaml @@ -1,5 +1,9 @@ include: ../../analysis_options.yaml +analyzer: + plugins: + - custom_lint + linter: rules: prefer_single_quotes: false diff --git a/colorist/step_02/pubspec.yaml b/colorist/step_02/pubspec.yaml index 9a007f2af3..ab86f55913 100644 --- a/colorist/step_02/pubspec.yaml +++ b/colorist/step_02/pubspec.yaml @@ -23,6 +23,7 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_03/analysis_options.yaml b/colorist/step_03/analysis_options.yaml index 8ac00898db..4b6918f5b3 100644 --- a/colorist/step_03/analysis_options.yaml +++ b/colorist/step_03/analysis_options.yaml @@ -1,5 +1,9 @@ include: ../../analysis_options.yaml +analyzer: + plugins: + - custom_lint + linter: rules: prefer_single_quotes: false diff --git a/colorist/step_03/pubspec.yaml b/colorist/step_03/pubspec.yaml index 7ced119b84..72e86ffbb8 100644 --- a/colorist/step_03/pubspec.yaml +++ b/colorist/step_03/pubspec.yaml @@ -23,6 +23,7 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_04/analysis_options.yaml b/colorist/step_04/analysis_options.yaml index 8ac00898db..4b6918f5b3 100644 --- a/colorist/step_04/analysis_options.yaml +++ b/colorist/step_04/analysis_options.yaml @@ -1,5 +1,9 @@ include: ../../analysis_options.yaml +analyzer: + plugins: + - custom_lint + linter: rules: prefer_single_quotes: false diff --git a/colorist/step_04/pubspec.yaml b/colorist/step_04/pubspec.yaml index 7ced119b84..72e86ffbb8 100644 --- a/colorist/step_04/pubspec.yaml +++ b/colorist/step_04/pubspec.yaml @@ -23,6 +23,7 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_05/analysis_options.yaml b/colorist/step_05/analysis_options.yaml index 8ac00898db..4b6918f5b3 100644 --- a/colorist/step_05/analysis_options.yaml +++ b/colorist/step_05/analysis_options.yaml @@ -1,5 +1,9 @@ include: ../../analysis_options.yaml +analyzer: + plugins: + - custom_lint + linter: rules: prefer_single_quotes: false diff --git a/colorist/step_05/pubspec.yaml b/colorist/step_05/pubspec.yaml index 7ced119b84..72e86ffbb8 100644 --- a/colorist/step_05/pubspec.yaml +++ b/colorist/step_05/pubspec.yaml @@ -23,6 +23,7 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_06/analysis_options.yaml b/colorist/step_06/analysis_options.yaml index 8ac00898db..4b6918f5b3 100644 --- a/colorist/step_06/analysis_options.yaml +++ b/colorist/step_06/analysis_options.yaml @@ -1,5 +1,9 @@ include: ../../analysis_options.yaml +analyzer: + plugins: + - custom_lint + linter: rules: prefer_single_quotes: false diff --git a/colorist/step_06/pubspec.yaml b/colorist/step_06/pubspec.yaml index 7ced119b84..72e86ffbb8 100644 --- a/colorist/step_06/pubspec.yaml +++ b/colorist/step_06/pubspec.yaml @@ -23,6 +23,7 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true diff --git a/colorist/step_07/analysis_options.yaml b/colorist/step_07/analysis_options.yaml index 8ac00898db..4b6918f5b3 100644 --- a/colorist/step_07/analysis_options.yaml +++ b/colorist/step_07/analysis_options.yaml @@ -1,5 +1,9 @@ include: ../../analysis_options.yaml +analyzer: + plugins: + - custom_lint + linter: rules: prefer_single_quotes: false diff --git a/colorist/step_07/pubspec.yaml b/colorist/step_07/pubspec.yaml index 7ced119b84..72e86ffbb8 100644 --- a/colorist/step_07/pubspec.yaml +++ b/colorist/step_07/pubspec.yaml @@ -23,6 +23,7 @@ dev_dependencies: riverpod_generator: ^3.0.0 riverpod_lint: ^3.0.0 json_serializable: ^6.11.1 + custom_lint: ^0.8.0 flutter: uses-material-design: true From 434f5e20f5293f3ea5271846c716e1413dba5a1a Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Sat, 13 Sep 2025 06:54:54 +1000 Subject: [PATCH 04/10] Drop the legacy code --- colorist/step_07/lib/providers/gemini.dart | 4 +-- colorist/step_07/lib/providers/gemini.g.dart | 8 ++--- .../step_07/lib/providers/system_prompt.dart | 2 +- .../lib/providers/system_prompt.g.dart | 4 +-- .../lib/services/gemini_chat_service.dart | 29 ++++++++++++++----- .../lib/services/gemini_chat_service.g.dart | 4 +-- .../step_07/lib/services/gemini_tools.dart | 2 +- .../step_07/lib/services/gemini_tools.g.dart | 4 +-- 8 files changed, 35 insertions(+), 22 deletions(-) diff --git a/colorist/step_07/lib/providers/gemini.dart b/colorist/step_07/lib/providers/gemini.dart index 415f098553..96a0c770f3 100644 --- a/colorist/step_07/lib/providers/gemini.dart +++ b/colorist/step_07/lib/providers/gemini.dart @@ -14,11 +14,11 @@ import 'system_prompt.dart'; part 'gemini.g.dart'; -@riverpod +@Riverpod(keepAlive: true) Future firebaseApp(Ref ref) => Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); -@riverpod +@Riverpod(keepAlive: true) Future geminiModel(Ref ref) async { await ref.watch(firebaseAppProvider.future); final systemPrompt = await ref.watch(systemPromptProvider.future); diff --git a/colorist/step_07/lib/providers/gemini.g.dart b/colorist/step_07/lib/providers/gemini.g.dart index 176c7339c4..793ca0f4fa 100644 --- a/colorist/step_07/lib/providers/gemini.g.dart +++ b/colorist/step_07/lib/providers/gemini.g.dart @@ -26,7 +26,7 @@ final class FirebaseAppProvider argument: null, retry: null, name: r'firebaseAppProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -46,7 +46,7 @@ final class FirebaseAppProvider } } -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +String _$firebaseAppHash() => r'7663fd816ebac4287db82a095568ee3dc843da9a'; @ProviderFor(geminiModel) const geminiModelProvider = GeminiModelProvider._(); @@ -65,7 +65,7 @@ final class GeminiModelProvider argument: null, retry: null, name: r'geminiModelProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -85,7 +85,7 @@ final class GeminiModelProvider } } -String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; +String _$geminiModelHash() => r'f172c92d9706bbc512831e94d1348372caed4fd9'; @ProviderFor(chatSession) const chatSessionProvider = ChatSessionProvider._(); diff --git a/colorist/step_07/lib/providers/system_prompt.dart b/colorist/step_07/lib/providers/system_prompt.dart index 683a3ae70a..8d309c956b 100644 --- a/colorist/step_07/lib/providers/system_prompt.dart +++ b/colorist/step_07/lib/providers/system_prompt.dart @@ -7,6 +7,6 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'system_prompt.g.dart'; -@riverpod +@Riverpod(keepAlive: true) Future systemPrompt(Ref ref) => rootBundle.loadString('assets/system_prompt.md'); diff --git a/colorist/step_07/lib/providers/system_prompt.g.dart b/colorist/step_07/lib/providers/system_prompt.g.dart index 053524e338..6b4fa3fb43 100644 --- a/colorist/step_07/lib/providers/system_prompt.g.dart +++ b/colorist/step_07/lib/providers/system_prompt.g.dart @@ -21,7 +21,7 @@ final class SystemPromptProvider argument: null, retry: null, name: r'systemPromptProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -40,4 +40,4 @@ final class SystemPromptProvider } } -String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; +String _$systemPromptHash() => r'6fcb24d96c2dfec9be8d4d51e87562b191641b98'; diff --git a/colorist/step_07/lib/services/gemini_chat_service.dart b/colorist/step_07/lib/services/gemini_chat_service.dart index f403018793..daa5eecbdc 100644 --- a/colorist/step_07/lib/services/gemini_chat_service.dart +++ b/colorist/step_07/lib/services/gemini_chat_service.dart @@ -7,7 +7,7 @@ import 'dart:convert'; import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/legacy.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../providers/gemini.dart'; @@ -15,9 +15,23 @@ import 'gemini_tools.dart'; part 'gemini_chat_service.g.dart'; -final conversationStateProvider = StateProvider( - (ref) => ConversationState.idle, -); +class ConversationStateNotifier extends Notifier { + @override + ConversationState build() => ConversationState.idle; + + void busy() { + state = ConversationState.busy; + } + + void idle() { + state = ConversationState.idle; + } +} + +final conversationStateProvider = + NotifierProvider( + ConversationStateNotifier.new, + ); class GeminiChatService { GeminiChatService(this.ref); @@ -44,7 +58,7 @@ class GeminiChatService { final conversationStateNotifier = ref.read( conversationStateProvider.notifier, ); - conversationStateNotifier.state = ConversationState.busy; + conversationStateNotifier.busy(); chatStateNotifier.addUserMessage(message); logStateNotifier.logUserText(message); final llmMessage = chatStateNotifier.createLlmMessage(); @@ -64,7 +78,7 @@ class GeminiChatService { ); } finally { chatStateNotifier.finalizeMessage(llmMessage.id); - conversationStateNotifier.state = ConversationState.idle; + conversationStateNotifier.idle(); } } @@ -76,7 +90,6 @@ class GeminiChatService { final chatStateNotifier = ref.read(chatStateProvider.notifier); final logStateNotifier = ref.read(logStateProvider.notifier); final blockText = block.text; - if (blockText != null) { logStateNotifier.logLlmText(blockText); chatStateNotifier.appendToMessage(llmMessageId, blockText); @@ -107,5 +120,5 @@ class GeminiChatService { } } -@riverpod +@Riverpod(keepAlive: true) GeminiChatService geminiChatService(Ref ref) => GeminiChatService(ref); diff --git a/colorist/step_07/lib/services/gemini_chat_service.g.dart b/colorist/step_07/lib/services/gemini_chat_service.g.dart index c1c8b190ae..e69331a642 100644 --- a/colorist/step_07/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_07/lib/services/gemini_chat_service.g.dart @@ -26,7 +26,7 @@ final class GeminiChatServiceProvider argument: null, retry: null, name: r'geminiChatServiceProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -54,4 +54,4 @@ final class GeminiChatServiceProvider } } -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +String _$geminiChatServiceHash() => r'4e26bc50fdc3eef30780d404d45fa39aeb0a49d6'; diff --git a/colorist/step_07/lib/services/gemini_tools.dart b/colorist/step_07/lib/services/gemini_tools.dart index d1f24786b2..28ff5a68c7 100644 --- a/colorist/step_07/lib/services/gemini_tools.dart +++ b/colorist/step_07/lib/services/gemini_tools.dart @@ -66,5 +66,5 @@ class GeminiTools { } } -@riverpod +@Riverpod(keepAlive: true) GeminiTools geminiTools(Ref ref) => GeminiTools(ref); diff --git a/colorist/step_07/lib/services/gemini_tools.g.dart b/colorist/step_07/lib/services/gemini_tools.g.dart index 0f8347266c..3704f0d389 100644 --- a/colorist/step_07/lib/services/gemini_tools.g.dart +++ b/colorist/step_07/lib/services/gemini_tools.g.dart @@ -21,7 +21,7 @@ final class GeminiToolsProvider argument: null, retry: null, name: r'geminiToolsProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -48,4 +48,4 @@ final class GeminiToolsProvider } } -String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; +String _$geminiToolsHash() => r'f61ae618aa3a6be31184f91b78b504b695ef0851'; From d310b276e0ef1824485eb44f3c1dcb1345cede02 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Sat, 13 Sep 2025 06:59:19 +1000 Subject: [PATCH 05/10] Drop legacy from step 6 --- colorist/step_06/lib/providers/gemini.dart | 4 +-- colorist/step_06/lib/providers/gemini.g.dart | 8 ++--- .../step_06/lib/providers/system_prompt.dart | 2 +- .../lib/providers/system_prompt.g.dart | 4 +-- .../lib/services/gemini_chat_service.dart | 29 ++++++++++++++----- .../lib/services/gemini_chat_service.g.dart | 4 +-- .../step_06/lib/services/gemini_tools.dart | 2 +- .../step_06/lib/services/gemini_tools.g.dart | 4 +-- 8 files changed, 35 insertions(+), 22 deletions(-) diff --git a/colorist/step_06/lib/providers/gemini.dart b/colorist/step_06/lib/providers/gemini.dart index 415f098553..96a0c770f3 100644 --- a/colorist/step_06/lib/providers/gemini.dart +++ b/colorist/step_06/lib/providers/gemini.dart @@ -14,11 +14,11 @@ import 'system_prompt.dart'; part 'gemini.g.dart'; -@riverpod +@Riverpod(keepAlive: true) Future firebaseApp(Ref ref) => Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); -@riverpod +@Riverpod(keepAlive: true) Future geminiModel(Ref ref) async { await ref.watch(firebaseAppProvider.future); final systemPrompt = await ref.watch(systemPromptProvider.future); diff --git a/colorist/step_06/lib/providers/gemini.g.dart b/colorist/step_06/lib/providers/gemini.g.dart index 176c7339c4..793ca0f4fa 100644 --- a/colorist/step_06/lib/providers/gemini.g.dart +++ b/colorist/step_06/lib/providers/gemini.g.dart @@ -26,7 +26,7 @@ final class FirebaseAppProvider argument: null, retry: null, name: r'firebaseAppProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -46,7 +46,7 @@ final class FirebaseAppProvider } } -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +String _$firebaseAppHash() => r'7663fd816ebac4287db82a095568ee3dc843da9a'; @ProviderFor(geminiModel) const geminiModelProvider = GeminiModelProvider._(); @@ -65,7 +65,7 @@ final class GeminiModelProvider argument: null, retry: null, name: r'geminiModelProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -85,7 +85,7 @@ final class GeminiModelProvider } } -String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; +String _$geminiModelHash() => r'f172c92d9706bbc512831e94d1348372caed4fd9'; @ProviderFor(chatSession) const chatSessionProvider = ChatSessionProvider._(); diff --git a/colorist/step_06/lib/providers/system_prompt.dart b/colorist/step_06/lib/providers/system_prompt.dart index 683a3ae70a..8d309c956b 100644 --- a/colorist/step_06/lib/providers/system_prompt.dart +++ b/colorist/step_06/lib/providers/system_prompt.dart @@ -7,6 +7,6 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'system_prompt.g.dart'; -@riverpod +@Riverpod(keepAlive: true) Future systemPrompt(Ref ref) => rootBundle.loadString('assets/system_prompt.md'); diff --git a/colorist/step_06/lib/providers/system_prompt.g.dart b/colorist/step_06/lib/providers/system_prompt.g.dart index 053524e338..6b4fa3fb43 100644 --- a/colorist/step_06/lib/providers/system_prompt.g.dart +++ b/colorist/step_06/lib/providers/system_prompt.g.dart @@ -21,7 +21,7 @@ final class SystemPromptProvider argument: null, retry: null, name: r'systemPromptProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -40,4 +40,4 @@ final class SystemPromptProvider } } -String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; +String _$systemPromptHash() => r'6fcb24d96c2dfec9be8d4d51e87562b191641b98'; diff --git a/colorist/step_06/lib/services/gemini_chat_service.dart b/colorist/step_06/lib/services/gemini_chat_service.dart index ca47e06414..4819da871b 100644 --- a/colorist/step_06/lib/services/gemini_chat_service.dart +++ b/colorist/step_06/lib/services/gemini_chat_service.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; -import 'package:flutter_riverpod/legacy.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../providers/gemini.dart'; @@ -14,9 +14,23 @@ import 'gemini_tools.dart'; part 'gemini_chat_service.g.dart'; -final conversationStateProvider = StateProvider( - (ref) => ConversationState.idle, -); +class ConversationStateNotifier extends Notifier { + @override + ConversationState build() => ConversationState.idle; + + void busy() { + state = ConversationState.busy; + } + + void idle() { + state = ConversationState.idle; + } +} + +final conversationStateProvider = + NotifierProvider( + ConversationStateNotifier.new, + ); class GeminiChatService { GeminiChatService(this.ref); @@ -39,7 +53,7 @@ class GeminiChatService { final conversationStateNotifier = ref.read( conversationStateProvider.notifier, ); - conversationStateNotifier.state = ConversationState.busy; + conversationStateNotifier.busy(); chatStateNotifier.addUserMessage(message); logStateNotifier.logUserText(message); final llmMessage = chatStateNotifier.createLlmMessage(); @@ -59,7 +73,7 @@ class GeminiChatService { ); } finally { chatStateNotifier.finalizeMessage(llmMessage.id); - conversationStateNotifier.state = ConversationState.idle; + conversationStateNotifier.idle(); } } @@ -71,7 +85,6 @@ class GeminiChatService { final chatStateNotifier = ref.read(chatStateProvider.notifier); final logStateNotifier = ref.read(logStateProvider.notifier); final blockText = block.text; - if (blockText != null) { logStateNotifier.logLlmText(blockText); chatStateNotifier.appendToMessage(llmMessageId, blockText); @@ -102,5 +115,5 @@ class GeminiChatService { } } -@riverpod +@Riverpod(keepAlive: true) GeminiChatService geminiChatService(Ref ref) => GeminiChatService(ref); diff --git a/colorist/step_06/lib/services/gemini_chat_service.g.dart b/colorist/step_06/lib/services/gemini_chat_service.g.dart index c1c8b190ae..e69331a642 100644 --- a/colorist/step_06/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_06/lib/services/gemini_chat_service.g.dart @@ -26,7 +26,7 @@ final class GeminiChatServiceProvider argument: null, retry: null, name: r'geminiChatServiceProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -54,4 +54,4 @@ final class GeminiChatServiceProvider } } -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +String _$geminiChatServiceHash() => r'4e26bc50fdc3eef30780d404d45fa39aeb0a49d6'; diff --git a/colorist/step_06/lib/services/gemini_tools.dart b/colorist/step_06/lib/services/gemini_tools.dart index d1f24786b2..28ff5a68c7 100644 --- a/colorist/step_06/lib/services/gemini_tools.dart +++ b/colorist/step_06/lib/services/gemini_tools.dart @@ -66,5 +66,5 @@ class GeminiTools { } } -@riverpod +@Riverpod(keepAlive: true) GeminiTools geminiTools(Ref ref) => GeminiTools(ref); diff --git a/colorist/step_06/lib/services/gemini_tools.g.dart b/colorist/step_06/lib/services/gemini_tools.g.dart index 0f8347266c..3704f0d389 100644 --- a/colorist/step_06/lib/services/gemini_tools.g.dart +++ b/colorist/step_06/lib/services/gemini_tools.g.dart @@ -21,7 +21,7 @@ final class GeminiToolsProvider argument: null, retry: null, name: r'geminiToolsProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -48,4 +48,4 @@ final class GeminiToolsProvider } } -String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; +String _$geminiToolsHash() => r'f61ae618aa3a6be31184f91b78b504b695ef0851'; From 70e6f1d8136fc5d12145f7af100d0866c32c72e6 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Sat, 13 Sep 2025 07:09:09 +1000 Subject: [PATCH 06/10] Keeping step 5 alive --- colorist/step_05/lib/providers/gemini.dart | 4 ++-- colorist/step_05/lib/providers/gemini.g.dart | 8 ++++---- colorist/step_05/lib/providers/system_prompt.dart | 2 +- colorist/step_05/lib/providers/system_prompt.g.dart | 4 ++-- colorist/step_05/lib/services/gemini_chat_service.dart | 2 +- colorist/step_05/lib/services/gemini_chat_service.g.dart | 4 ++-- colorist/step_05/lib/services/gemini_tools.dart | 2 +- colorist/step_05/lib/services/gemini_tools.g.dart | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/colorist/step_05/lib/providers/gemini.dart b/colorist/step_05/lib/providers/gemini.dart index 415f098553..96a0c770f3 100644 --- a/colorist/step_05/lib/providers/gemini.dart +++ b/colorist/step_05/lib/providers/gemini.dart @@ -14,11 +14,11 @@ import 'system_prompt.dart'; part 'gemini.g.dart'; -@riverpod +@Riverpod(keepAlive: true) Future firebaseApp(Ref ref) => Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); -@riverpod +@Riverpod(keepAlive: true) Future geminiModel(Ref ref) async { await ref.watch(firebaseAppProvider.future); final systemPrompt = await ref.watch(systemPromptProvider.future); diff --git a/colorist/step_05/lib/providers/gemini.g.dart b/colorist/step_05/lib/providers/gemini.g.dart index 176c7339c4..793ca0f4fa 100644 --- a/colorist/step_05/lib/providers/gemini.g.dart +++ b/colorist/step_05/lib/providers/gemini.g.dart @@ -26,7 +26,7 @@ final class FirebaseAppProvider argument: null, retry: null, name: r'firebaseAppProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -46,7 +46,7 @@ final class FirebaseAppProvider } } -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +String _$firebaseAppHash() => r'7663fd816ebac4287db82a095568ee3dc843da9a'; @ProviderFor(geminiModel) const geminiModelProvider = GeminiModelProvider._(); @@ -65,7 +65,7 @@ final class GeminiModelProvider argument: null, retry: null, name: r'geminiModelProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -85,7 +85,7 @@ final class GeminiModelProvider } } -String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; +String _$geminiModelHash() => r'f172c92d9706bbc512831e94d1348372caed4fd9'; @ProviderFor(chatSession) const chatSessionProvider = ChatSessionProvider._(); diff --git a/colorist/step_05/lib/providers/system_prompt.dart b/colorist/step_05/lib/providers/system_prompt.dart index 683a3ae70a..8d309c956b 100644 --- a/colorist/step_05/lib/providers/system_prompt.dart +++ b/colorist/step_05/lib/providers/system_prompt.dart @@ -7,6 +7,6 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'system_prompt.g.dart'; -@riverpod +@Riverpod(keepAlive: true) Future systemPrompt(Ref ref) => rootBundle.loadString('assets/system_prompt.md'); diff --git a/colorist/step_05/lib/providers/system_prompt.g.dart b/colorist/step_05/lib/providers/system_prompt.g.dart index 053524e338..6b4fa3fb43 100644 --- a/colorist/step_05/lib/providers/system_prompt.g.dart +++ b/colorist/step_05/lib/providers/system_prompt.g.dart @@ -21,7 +21,7 @@ final class SystemPromptProvider argument: null, retry: null, name: r'systemPromptProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -40,4 +40,4 @@ final class SystemPromptProvider } } -String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; +String _$systemPromptHash() => r'6fcb24d96c2dfec9be8d4d51e87562b191641b98'; diff --git a/colorist/step_05/lib/services/gemini_chat_service.dart b/colorist/step_05/lib/services/gemini_chat_service.dart index a63f9f7e2e..b9d3bced3a 100644 --- a/colorist/step_05/lib/services/gemini_chat_service.dart +++ b/colorist/step_05/lib/services/gemini_chat_service.dart @@ -67,5 +67,5 @@ class GeminiChatService { } } -@riverpod +@Riverpod(keepAlive: true) GeminiChatService geminiChatService(Ref ref) => GeminiChatService(ref); diff --git a/colorist/step_05/lib/services/gemini_chat_service.g.dart b/colorist/step_05/lib/services/gemini_chat_service.g.dart index c1c8b190ae..e69331a642 100644 --- a/colorist/step_05/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_05/lib/services/gemini_chat_service.g.dart @@ -26,7 +26,7 @@ final class GeminiChatServiceProvider argument: null, retry: null, name: r'geminiChatServiceProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -54,4 +54,4 @@ final class GeminiChatServiceProvider } } -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +String _$geminiChatServiceHash() => r'4e26bc50fdc3eef30780d404d45fa39aeb0a49d6'; diff --git a/colorist/step_05/lib/services/gemini_tools.dart b/colorist/step_05/lib/services/gemini_tools.dart index d1f24786b2..28ff5a68c7 100644 --- a/colorist/step_05/lib/services/gemini_tools.dart +++ b/colorist/step_05/lib/services/gemini_tools.dart @@ -66,5 +66,5 @@ class GeminiTools { } } -@riverpod +@Riverpod(keepAlive: true) GeminiTools geminiTools(Ref ref) => GeminiTools(ref); diff --git a/colorist/step_05/lib/services/gemini_tools.g.dart b/colorist/step_05/lib/services/gemini_tools.g.dart index 0f8347266c..3704f0d389 100644 --- a/colorist/step_05/lib/services/gemini_tools.g.dart +++ b/colorist/step_05/lib/services/gemini_tools.g.dart @@ -21,7 +21,7 @@ final class GeminiToolsProvider argument: null, retry: null, name: r'geminiToolsProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -48,4 +48,4 @@ final class GeminiToolsProvider } } -String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; +String _$geminiToolsHash() => r'f61ae618aa3a6be31184f91b78b504b695ef0851'; From 080494791c3c699279329c6d10e46dda813e96d3 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Sat, 13 Sep 2025 07:11:26 +1000 Subject: [PATCH 07/10] Keeping step 4 alive --- colorist/step_04/lib/providers/gemini.dart | 4 ++-- colorist/step_04/lib/providers/gemini.g.dart | 8 ++++---- colorist/step_04/lib/providers/system_prompt.dart | 2 +- colorist/step_04/lib/providers/system_prompt.g.dart | 4 ++-- colorist/step_04/lib/services/gemini_chat_service.dart | 2 +- colorist/step_04/lib/services/gemini_chat_service.g.dart | 4 ++-- colorist/step_04/lib/services/gemini_tools.dart | 2 +- colorist/step_04/lib/services/gemini_tools.g.dart | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/colorist/step_04/lib/providers/gemini.dart b/colorist/step_04/lib/providers/gemini.dart index 415f098553..96a0c770f3 100644 --- a/colorist/step_04/lib/providers/gemini.dart +++ b/colorist/step_04/lib/providers/gemini.dart @@ -14,11 +14,11 @@ import 'system_prompt.dart'; part 'gemini.g.dart'; -@riverpod +@Riverpod(keepAlive: true) Future firebaseApp(Ref ref) => Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); -@riverpod +@Riverpod(keepAlive: true) Future geminiModel(Ref ref) async { await ref.watch(firebaseAppProvider.future); final systemPrompt = await ref.watch(systemPromptProvider.future); diff --git a/colorist/step_04/lib/providers/gemini.g.dart b/colorist/step_04/lib/providers/gemini.g.dart index 176c7339c4..793ca0f4fa 100644 --- a/colorist/step_04/lib/providers/gemini.g.dart +++ b/colorist/step_04/lib/providers/gemini.g.dart @@ -26,7 +26,7 @@ final class FirebaseAppProvider argument: null, retry: null, name: r'firebaseAppProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -46,7 +46,7 @@ final class FirebaseAppProvider } } -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +String _$firebaseAppHash() => r'7663fd816ebac4287db82a095568ee3dc843da9a'; @ProviderFor(geminiModel) const geminiModelProvider = GeminiModelProvider._(); @@ -65,7 +65,7 @@ final class GeminiModelProvider argument: null, retry: null, name: r'geminiModelProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -85,7 +85,7 @@ final class GeminiModelProvider } } -String _$geminiModelHash() => r'06a1c69e8231cc7058d37c8ffb3cdf33cf2c2c87'; +String _$geminiModelHash() => r'f172c92d9706bbc512831e94d1348372caed4fd9'; @ProviderFor(chatSession) const chatSessionProvider = ChatSessionProvider._(); diff --git a/colorist/step_04/lib/providers/system_prompt.dart b/colorist/step_04/lib/providers/system_prompt.dart index 683a3ae70a..8d309c956b 100644 --- a/colorist/step_04/lib/providers/system_prompt.dart +++ b/colorist/step_04/lib/providers/system_prompt.dart @@ -7,6 +7,6 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'system_prompt.g.dart'; -@riverpod +@Riverpod(keepAlive: true) Future systemPrompt(Ref ref) => rootBundle.loadString('assets/system_prompt.md'); diff --git a/colorist/step_04/lib/providers/system_prompt.g.dart b/colorist/step_04/lib/providers/system_prompt.g.dart index 053524e338..6b4fa3fb43 100644 --- a/colorist/step_04/lib/providers/system_prompt.g.dart +++ b/colorist/step_04/lib/providers/system_prompt.g.dart @@ -21,7 +21,7 @@ final class SystemPromptProvider argument: null, retry: null, name: r'systemPromptProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -40,4 +40,4 @@ final class SystemPromptProvider } } -String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; +String _$systemPromptHash() => r'6fcb24d96c2dfec9be8d4d51e87562b191641b98'; diff --git a/colorist/step_04/lib/services/gemini_chat_service.dart b/colorist/step_04/lib/services/gemini_chat_service.dart index 3e160ced0a..b35efcda95 100644 --- a/colorist/step_04/lib/services/gemini_chat_service.dart +++ b/colorist/step_04/lib/services/gemini_chat_service.dart @@ -45,5 +45,5 @@ class GeminiChatService { } } -@riverpod +@Riverpod(keepAlive: true) GeminiChatService geminiChatService(Ref ref) => GeminiChatService(ref); diff --git a/colorist/step_04/lib/services/gemini_chat_service.g.dart b/colorist/step_04/lib/services/gemini_chat_service.g.dart index c1c8b190ae..e69331a642 100644 --- a/colorist/step_04/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_04/lib/services/gemini_chat_service.g.dart @@ -26,7 +26,7 @@ final class GeminiChatServiceProvider argument: null, retry: null, name: r'geminiChatServiceProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -54,4 +54,4 @@ final class GeminiChatServiceProvider } } -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +String _$geminiChatServiceHash() => r'4e26bc50fdc3eef30780d404d45fa39aeb0a49d6'; diff --git a/colorist/step_04/lib/services/gemini_tools.dart b/colorist/step_04/lib/services/gemini_tools.dart index c634c4e632..63e9fc8d6c 100644 --- a/colorist/step_04/lib/services/gemini_tools.dart +++ b/colorist/step_04/lib/services/gemini_tools.dart @@ -27,5 +27,5 @@ class GeminiTools { ]; } -@riverpod +@Riverpod(keepAlive: true) GeminiTools geminiTools(Ref ref) => GeminiTools(ref); diff --git a/colorist/step_04/lib/services/gemini_tools.g.dart b/colorist/step_04/lib/services/gemini_tools.g.dart index 0f8347266c..3704f0d389 100644 --- a/colorist/step_04/lib/services/gemini_tools.g.dart +++ b/colorist/step_04/lib/services/gemini_tools.g.dart @@ -21,7 +21,7 @@ final class GeminiToolsProvider argument: null, retry: null, name: r'geminiToolsProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -48,4 +48,4 @@ final class GeminiToolsProvider } } -String _$geminiToolsHash() => r'9d591f86d85cca9c1d3f6f94f773af9a3b2ee652'; +String _$geminiToolsHash() => r'f61ae618aa3a6be31184f91b78b504b695ef0851'; From d4f93efc0891b5a0b7c48f0d6b7adc67861e6117 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Sat, 13 Sep 2025 07:14:09 +1000 Subject: [PATCH 08/10] Keeping step 3 alive --- colorist/step_03/lib/providers/gemini.dart | 4 ++-- colorist/step_03/lib/providers/gemini.g.dart | 8 ++++---- colorist/step_03/lib/providers/system_prompt.dart | 2 +- colorist/step_03/lib/providers/system_prompt.g.dart | 4 ++-- colorist/step_03/lib/services/gemini_chat_service.dart | 2 +- colorist/step_03/lib/services/gemini_chat_service.g.dart | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/colorist/step_03/lib/providers/gemini.dart b/colorist/step_03/lib/providers/gemini.dart index 66b6755664..53eeae47bc 100644 --- a/colorist/step_03/lib/providers/gemini.dart +++ b/colorist/step_03/lib/providers/gemini.dart @@ -13,11 +13,11 @@ import 'system_prompt.dart'; part 'gemini.g.dart'; -@riverpod +@Riverpod(keepAlive: true) Future firebaseApp(Ref ref) => Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); -@riverpod +@Riverpod(keepAlive: true) Future geminiModel(Ref ref) async { await ref.watch(firebaseAppProvider.future); final systemPrompt = await ref.watch(systemPromptProvider.future); diff --git a/colorist/step_03/lib/providers/gemini.g.dart b/colorist/step_03/lib/providers/gemini.g.dart index af9c2b4367..ec38d47bd5 100644 --- a/colorist/step_03/lib/providers/gemini.g.dart +++ b/colorist/step_03/lib/providers/gemini.g.dart @@ -26,7 +26,7 @@ final class FirebaseAppProvider argument: null, retry: null, name: r'firebaseAppProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -46,7 +46,7 @@ final class FirebaseAppProvider } } -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +String _$firebaseAppHash() => r'7663fd816ebac4287db82a095568ee3dc843da9a'; @ProviderFor(geminiModel) const geminiModelProvider = GeminiModelProvider._(); @@ -65,7 +65,7 @@ final class GeminiModelProvider argument: null, retry: null, name: r'geminiModelProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -85,7 +85,7 @@ final class GeminiModelProvider } } -String _$geminiModelHash() => r'e395f7db73dd2524fbbc4d731d44e98ddc33a5f8'; +String _$geminiModelHash() => r'9ddea86b37f27f14192b470bec402d4488c4af7e'; @ProviderFor(chatSession) const chatSessionProvider = ChatSessionProvider._(); diff --git a/colorist/step_03/lib/providers/system_prompt.dart b/colorist/step_03/lib/providers/system_prompt.dart index 683a3ae70a..8d309c956b 100644 --- a/colorist/step_03/lib/providers/system_prompt.dart +++ b/colorist/step_03/lib/providers/system_prompt.dart @@ -7,6 +7,6 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'system_prompt.g.dart'; -@riverpod +@Riverpod(keepAlive: true) Future systemPrompt(Ref ref) => rootBundle.loadString('assets/system_prompt.md'); diff --git a/colorist/step_03/lib/providers/system_prompt.g.dart b/colorist/step_03/lib/providers/system_prompt.g.dart index 053524e338..6b4fa3fb43 100644 --- a/colorist/step_03/lib/providers/system_prompt.g.dart +++ b/colorist/step_03/lib/providers/system_prompt.g.dart @@ -21,7 +21,7 @@ final class SystemPromptProvider argument: null, retry: null, name: r'systemPromptProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -40,4 +40,4 @@ final class SystemPromptProvider } } -String _$systemPromptHash() => r'4068d8b52f2a51db7400670fb6e17f83fe55c253'; +String _$systemPromptHash() => r'6fcb24d96c2dfec9be8d4d51e87562b191641b98'; diff --git a/colorist/step_03/lib/services/gemini_chat_service.dart b/colorist/step_03/lib/services/gemini_chat_service.dart index 3e160ced0a..b35efcda95 100644 --- a/colorist/step_03/lib/services/gemini_chat_service.dart +++ b/colorist/step_03/lib/services/gemini_chat_service.dart @@ -45,5 +45,5 @@ class GeminiChatService { } } -@riverpod +@Riverpod(keepAlive: true) GeminiChatService geminiChatService(Ref ref) => GeminiChatService(ref); diff --git a/colorist/step_03/lib/services/gemini_chat_service.g.dart b/colorist/step_03/lib/services/gemini_chat_service.g.dart index c1c8b190ae..e69331a642 100644 --- a/colorist/step_03/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_03/lib/services/gemini_chat_service.g.dart @@ -26,7 +26,7 @@ final class GeminiChatServiceProvider argument: null, retry: null, name: r'geminiChatServiceProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -54,4 +54,4 @@ final class GeminiChatServiceProvider } } -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +String _$geminiChatServiceHash() => r'4e26bc50fdc3eef30780d404d45fa39aeb0a49d6'; From 19c5571c386154b07fca59250fff18a83330cc88 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Sat, 13 Sep 2025 07:16:28 +1000 Subject: [PATCH 09/10] Keeping step 2 alive --- colorist/step_02/lib/providers/gemini.dart | 4 ++-- colorist/step_02/lib/providers/gemini.g.dart | 8 ++++---- colorist/step_02/lib/services/gemini_chat_service.dart | 2 +- colorist/step_02/lib/services/gemini_chat_service.g.dart | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/colorist/step_02/lib/providers/gemini.dart b/colorist/step_02/lib/providers/gemini.dart index a9c47e49c1..b2a7dcd582 100644 --- a/colorist/step_02/lib/providers/gemini.dart +++ b/colorist/step_02/lib/providers/gemini.dart @@ -12,11 +12,11 @@ import '../firebase_options.dart'; part 'gemini.g.dart'; -@riverpod +@Riverpod(keepAlive: true) Future firebaseApp(Ref ref) => Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); -@riverpod +@Riverpod(keepAlive: true) Future geminiModel(Ref ref) async { await ref.watch(firebaseAppProvider.future); diff --git a/colorist/step_02/lib/providers/gemini.g.dart b/colorist/step_02/lib/providers/gemini.g.dart index c22b9e683f..58d93387f1 100644 --- a/colorist/step_02/lib/providers/gemini.g.dart +++ b/colorist/step_02/lib/providers/gemini.g.dart @@ -26,7 +26,7 @@ final class FirebaseAppProvider argument: null, retry: null, name: r'firebaseAppProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -46,7 +46,7 @@ final class FirebaseAppProvider } } -String _$firebaseAppHash() => r'eaf72348ad852e52538678ec3a1b50b5c9af17ef'; +String _$firebaseAppHash() => r'7663fd816ebac4287db82a095568ee3dc843da9a'; @ProviderFor(geminiModel) const geminiModelProvider = GeminiModelProvider._(); @@ -65,7 +65,7 @@ final class GeminiModelProvider argument: null, retry: null, name: r'geminiModelProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -85,7 +85,7 @@ final class GeminiModelProvider } } -String _$geminiModelHash() => r'c6550e4a62e99f22324928fae16928b7db5dce4a'; +String _$geminiModelHash() => r'd4aaf971dab76dd9ab7cce803a435f06b4780aaf'; @ProviderFor(chatSession) const chatSessionProvider = ChatSessionProvider._(); diff --git a/colorist/step_02/lib/services/gemini_chat_service.dart b/colorist/step_02/lib/services/gemini_chat_service.dart index 3e160ced0a..b35efcda95 100644 --- a/colorist/step_02/lib/services/gemini_chat_service.dart +++ b/colorist/step_02/lib/services/gemini_chat_service.dart @@ -45,5 +45,5 @@ class GeminiChatService { } } -@riverpod +@Riverpod(keepAlive: true) GeminiChatService geminiChatService(Ref ref) => GeminiChatService(ref); diff --git a/colorist/step_02/lib/services/gemini_chat_service.g.dart b/colorist/step_02/lib/services/gemini_chat_service.g.dart index c1c8b190ae..e69331a642 100644 --- a/colorist/step_02/lib/services/gemini_chat_service.g.dart +++ b/colorist/step_02/lib/services/gemini_chat_service.g.dart @@ -26,7 +26,7 @@ final class GeminiChatServiceProvider argument: null, retry: null, name: r'geminiChatServiceProvider', - isAutoDispose: true, + isAutoDispose: false, dependencies: null, $allTransitiveDependencies: null, ); @@ -54,4 +54,4 @@ final class GeminiChatServiceProvider } } -String _$geminiChatServiceHash() => r'62a58e95c6112ec2cc1b4777a88270e75fe2949f'; +String _$geminiChatServiceHash() => r'4e26bc50fdc3eef30780d404d45fa39aeb0a49d6'; From 67f0aa2d303050d7cf95322f2b1c32f8fd452b62 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Sat, 13 Sep 2025 14:26:16 +1000 Subject: [PATCH 10/10] Update rebuild script --- colorist/codelab_rebuild.yaml | 49 ++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/colorist/codelab_rebuild.yaml b/colorist/codelab_rebuild.yaml index 7095d26eb1..f282dfccda 100644 --- a/colorist/codelab_rebuild.yaml +++ b/colorist/codelab_rebuild.yaml @@ -173,11 +173,11 @@ steps: part 'gemini.g.dart'; - @riverpod + @Riverpod(keepAlive: true) Future firebaseApp(Ref ref) => Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); - @riverpod + @Riverpod(keepAlive: true) Future geminiModel(Ref ref) async { await ref.watch(firebaseAppProvider.future); @@ -245,7 +245,7 @@ steps: } } - @riverpod + @Riverpod(keepAlive: true) GeminiChatService geminiChatService(Ref ref) => GeminiChatService(ref); - name: Run build_runner path: colorist @@ -448,7 +448,7 @@ steps: part 'system_prompt.g.dart'; - @riverpod + @Riverpod(keepAlive: true) Future systemPrompt(Ref ref) => rootBundle.loadString('assets/system_prompt.md'); - name: Patch lib/providers/gemini.dart @@ -465,7 +465,7 @@ steps: part 'gemini.g.dart'; @@ -19,9 +20,11 @@ Future firebaseApp(Ref ref) => - @riverpod + @Riverpod(keepAlive: true) Future geminiModel(Ref ref) async { await ref.watch(firebaseAppProvider.future); + final systemPrompt = await ref.watch(systemPromptProvider.future); @@ -526,7 +526,7 @@ steps: ]; } - @riverpod + @Riverpod(keepAlive: true) GeminiTools geminiTools(Ref ref) => GeminiTools(ref); - name: Patch lib/providers/gemini.dart path: colorist/lib/providers/gemini.dart @@ -723,7 +723,7 @@ steps: + } } - @riverpod + @Riverpod(keepAlive: true) - name: Run build_runner path: colorist dart: run build_runner build --delete-conflicting-outputs @@ -751,17 +751,31 @@ steps: import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; - +import 'package:flutter_riverpod/legacy.dart'; + +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../providers/gemini.dart'; - @@ -13,46 +14,41 @@ import 'gemini_tools.dart'; + @@ -13,46 +14,55 @@ import 'gemini_tools.dart'; part 'gemini_chat_service.g.dart'; - - +final conversationStateProvider = StateProvider( - + (ref) => ConversationState.idle, - +); + + +class ConversationStateNotifier extends Notifier { + + @override + + ConversationState build() => ConversationState.idle; + + + + void busy() { + + state = ConversationState.busy; + + } + + + + void idle() { + + state = ConversationState.idle; + + } + +} + + + +final conversationStateProvider = + + NotifierProvider( + + ConversationStateNotifier.new, + + ); + class GeminiChatService { GeminiChatService(this.ref); @@ -784,7 +798,7 @@ steps: + final conversationStateNotifier = ref.read( + conversationStateProvider.notifier, + ); - + conversationStateNotifier.state = ConversationState.busy; + + conversationStateNotifier.busy(); chatStateNotifier.addUserMessage(message); logStateNotifier.logUserText(message); final llmMessage = chatStateNotifier.createLlmMessage(); @@ -824,11 +838,11 @@ steps: } } catch (e, st) { logStateNotifier.logError(e, st: st); - @@ -63,6 +59,45 @@ class GeminiChatService { + @@ -63,6 +73,44 @@ class GeminiChatService { ); } finally { chatStateNotifier.finalizeMessage(llmMessage.id); - + conversationStateNotifier.state = ConversationState.idle; + + conversationStateNotifier.idle(); + } + } + @@ -840,7 +854,6 @@ steps: + final chatStateNotifier = ref.read(chatStateProvider.notifier); + final logStateNotifier = ref.read(logStateProvider.notifier); + final blockText = block.text; - + + if (blockText != null) { + logStateNotifier.logLlmText(blockText); + chatStateNotifier.appendToMessage(llmMessageId, blockText); @@ -922,7 +935,7 @@ steps: import 'package:colorist_ui/colorist_ui.dart'; import 'package:firebase_ai/firebase_ai.dart'; - @@ -22,6 +23,10 @@ class GeminiChatService { + @@ -36,6 +37,10 @@ class GeminiChatService { GeminiChatService(this.ref); final Ref ref;