Skip to content

Commit 1c17df0

Browse files
domesticmousedomesticmouse
committed
Merge branch 'main' of https://github.com/flutter/codelabs into flutter-3.30
2 parents 2d5a826 + 799a70d commit 1c17df0

File tree

54 files changed

+739
-713
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+739
-713
lines changed

‎colorist/step_01/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip

‎colorist/step_01/android/settings.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21-
id("com.android.application") version "8.7.0" apply false
22-
id("org.jetbrains.kotlin.android") version "1.8.22" apply false
21+
id("com.android.application") version "8.7.3" apply false
22+
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
2323
}
2424

2525
include(":app")

‎colorist/step_01/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -54,6 +55,7 @@
5455
buildConfiguration = "Debug"
5556
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5657
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
5759
launchStyle = "0"
5860
useCustomWorkingDirectory = "NO"
5961
ignoresPersistentStateOnLaunch = "NO"

‎colorist/step_01/pubspec.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
name: colorist
22
description: "A new Flutter project."
3-
publish_to: 'none'
3+
publish_to: "none"
44
version: 0.1.0
55

66
environment:
7-
sdk: ^3.7.2
7+
sdk: ^3.8.0-0
88

99
dependencies:
1010
flutter:
1111
sdk: flutter
12-
colorist_ui: ^0.1.0
12+
colorist_ui: ^0.2.2
1313
flutter_riverpod: ^2.6.1
1414
riverpod_annotation: ^2.6.1
1515

@@ -20,7 +20,7 @@ dev_dependencies:
2020
build_runner: ^2.4.15
2121
riverpod_generator: ^2.6.5
2222
riverpod_lint: ^2.6.5
23-
json_serializable: ^6.9.4
23+
json_serializable: ^6.9.5
2424
custom_lint: ^0.7.5
2525

2626
flutter:

‎colorist/step_02/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip

‎colorist/step_02/android/settings.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21-
id("com.android.application") version "8.7.0" apply false
22-
id("org.jetbrains.kotlin.android") version "1.8.22" apply false
21+
id("com.android.application") version "8.7.3" apply false
22+
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
2323
}
2424

2525
include(":app")

‎colorist/step_02/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

‎colorist/step_02/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -54,6 +55,7 @@
5455
buildConfiguration = "Debug"
5556
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5657
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
5759
launchStyle = "0"
5860
useCustomWorkingDirectory = "NO"
5961
ignoresPersistentStateOnLaunch = "NO"

‎colorist/step_02/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2828
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
2929
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
30-
5414EE9B48A771E3DF30C4DF /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 176CD18F0DE2101112C68001 /* Pods_Runner.framework */; };
31-
71EE4E8066A1DC04DE02B650 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DABFA3C4423FDD4816ED48EF /* Pods_RunnerTests.framework */; };
30+
535F90784A6EF79407A895F8 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07BE15BE53BE770BFBEC76F0 /* Pods_Runner.framework */; };
31+
7F22B9413F959B320F7BA62C /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 508A8A8CD5B29DF8598EB150 /* Pods_RunnerTests.framework */; };
3232
/* End PBXBuildFile section */
3333

3434
/* Begin PBXContainerItemProxy section */
@@ -62,8 +62,8 @@
6262
/* End PBXCopyFilesBuildPhase section */
6363

6464
/* Begin PBXFileReference section */
65-
03A1CFFDFEBF30E0C4DA7589 /* 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 = "<group>"; };
66-
176CD18F0DE2101112C68001 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
65+
07BE15BE53BE770BFBEC76F0 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
66+
0B7B26B06D95BCEB16292A17 /* 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 = "<group>"; };
6767
331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6868
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
6969
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
@@ -80,30 +80,30 @@
8080
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
8181
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
8282
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
83-
7736841AB095499DF12F256B /* 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 = "<group>"; };
83+
37F8DCFCA52DD48725EE2A89 /* 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 = "<group>"; };
84+
508A8A8CD5B29DF8598EB150 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
85+
637AB907233BFA69411589D4 /* 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 = "<group>"; };
8486
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
8587
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
86-
9FA206784C325509F7FA4B5E /* 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 = "<group>"; };
87-
A0C02750B9D54FAAA6C9511B /* 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 = "<group>"; };
88-
ADA2A65F6AFD7040F637C260 /* 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 = "<group>"; };
89-
DABFA3C4423FDD4816ED48EF /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
90-
FB2EE52FCA31C15CB28C930B /* 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 = "<group>"; };
88+
C2734382DA7BFE51809BE750 /* 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 = "<group>"; };
89+
DC6F8241DD6815538E41698A /* 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 = "<group>"; };
90+
E8DB251F2E4B3DA71D498538 /* 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 = "<group>"; };
9191
/* End PBXFileReference section */
9292

9393
/* Begin PBXFrameworksBuildPhase section */
9494
331C80D2294CF70F00263BE5 /* Frameworks */ = {
9595
isa = PBXFrameworksBuildPhase;
9696
buildActionMask = 2147483647;
9797
files = (
98-
71EE4E8066A1DC04DE02B650 /* Pods_RunnerTests.framework in Frameworks */,
98+
7F22B9413F959B320F7BA62C /* Pods_RunnerTests.framework in Frameworks */,
9999
);
100100
runOnlyForDeploymentPostprocessing = 0;
101101
};
102102
33CC10EA2044A3C60003C045 /* Frameworks */ = {
103103
isa = PBXFrameworksBuildPhase;
104104
buildActionMask = 2147483647;
105105
files = (
106-
5414EE9B48A771E3DF30C4DF /* Pods_Runner.framework in Frameworks */,
106+
535F90784A6EF79407A895F8 /* Pods_Runner.framework in Frameworks */,
107107
);
108108
runOnlyForDeploymentPostprocessing = 0;
109109
};
@@ -137,7 +137,7 @@
137137
331C80D6294CF71000263BE5 /* RunnerTests */,
138138
33CC10EE2044A3C60003C045 /* Products */,
139139
D73912EC22F37F3D000D13A0 /* Frameworks */,
140-
9282FDBA367FBEC519D1605A /* Pods */,
140+
8D7678D0812BF6CA5C4D4224 /* Pods */,
141141
);
142142
sourceTree = "<group>";
143143
};
@@ -185,15 +185,15 @@
185185
path = Runner;
186186
sourceTree = "<group>";
187187
};
188-
9282FDBA367FBEC519D1605A /* Pods */ = {
188+
8D7678D0812BF6CA5C4D4224 /* Pods */ = {
189189
isa = PBXGroup;
190190
children = (
191-
03A1CFFDFEBF30E0C4DA7589 /* Pods-Runner.debug.xcconfig */,
192-
FB2EE52FCA31C15CB28C930B /* Pods-Runner.release.xcconfig */,
193-
7736841AB095499DF12F256B /* Pods-Runner.profile.xcconfig */,
194-
9FA206784C325509F7FA4B5E /* Pods-RunnerTests.debug.xcconfig */,
195-
A0C02750B9D54FAAA6C9511B /* Pods-RunnerTests.release.xcconfig */,
196-
ADA2A65F6AFD7040F637C260 /* Pods-RunnerTests.profile.xcconfig */,
191+
E8DB251F2E4B3DA71D498538 /* Pods-Runner.debug.xcconfig */,
192+
637AB907233BFA69411589D4 /* Pods-Runner.release.xcconfig */,
193+
C2734382DA7BFE51809BE750 /* Pods-Runner.profile.xcconfig */,
194+
0B7B26B06D95BCEB16292A17 /* Pods-RunnerTests.debug.xcconfig */,
195+
DC6F8241DD6815538E41698A /* Pods-RunnerTests.release.xcconfig */,
196+
37F8DCFCA52DD48725EE2A89 /* Pods-RunnerTests.profile.xcconfig */,
197197
);
198198
name = Pods;
199199
path = Pods;
@@ -202,8 +202,8 @@
202202
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
203203
isa = PBXGroup;
204204
children = (
205-
176CD18F0DE2101112C68001 /* Pods_Runner.framework */,
206-
DABFA3C4423FDD4816ED48EF /* Pods_RunnerTests.framework */,
205+
07BE15BE53BE770BFBEC76F0 /* Pods_Runner.framework */,
206+
508A8A8CD5B29DF8598EB150 /* Pods_RunnerTests.framework */,
207207
);
208208
name = Frameworks;
209209
sourceTree = "<group>";
@@ -215,7 +215,7 @@
215215
isa = PBXNativeTarget;
216216
buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
217217
buildPhases = (
218-
B077D3777883453CEF655523 /* [CP] Check Pods Manifest.lock */,
218+
D44A57F5FD46560392836FAB /* [CP] Check Pods Manifest.lock */,
219219
331C80D1294CF70F00263BE5 /* Sources */,
220220
331C80D2294CF70F00263BE5 /* Frameworks */,
221221
331C80D3294CF70F00263BE5 /* Resources */,
@@ -234,13 +234,13 @@
234234
isa = PBXNativeTarget;
235235
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
236236
buildPhases = (
237-
06671A9AE7F4FF4CD574E7AF /* [CP] Check Pods Manifest.lock */,
237+
911D527939C7E6D96FD1F622 /* [CP] Check Pods Manifest.lock */,
238238
33CC10E92044A3C60003C045 /* Sources */,
239239
33CC10EA2044A3C60003C045 /* Frameworks */,
240240
33CC10EB2044A3C60003C045 /* Resources */,
241241
33CC110E2044A8840003C045 /* Bundle Framework */,
242242
3399D490228B24CF009A79C7 /* ShellScript */,
243-
F1D59D880CBF6E0A92B3369A /* [CP] Embed Pods Frameworks */,
243+
C73E261AE81520B9290DEA3B /* [CP] Embed Pods Frameworks */,
244244
);
245245
buildRules = (
246246
);
@@ -323,28 +323,6 @@
323323
/* End PBXResourcesBuildPhase section */
324324

325325
/* Begin PBXShellScriptBuildPhase section */
326-
06671A9AE7F4FF4CD574E7AF /* [CP] Check Pods Manifest.lock */ = {
327-
isa = PBXShellScriptBuildPhase;
328-
buildActionMask = 2147483647;
329-
files = (
330-
);
331-
inputFileListPaths = (
332-
);
333-
inputPaths = (
334-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
335-
"${PODS_ROOT}/Manifest.lock",
336-
);
337-
name = "[CP] Check Pods Manifest.lock";
338-
outputFileListPaths = (
339-
);
340-
outputPaths = (
341-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
342-
);
343-
runOnlyForDeploymentPostprocessing = 0;
344-
shellPath = /bin/sh;
345-
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";
346-
showEnvVarsInLog = 0;
347-
};
348326
3399D490228B24CF009A79C7 /* ShellScript */ = {
349327
isa = PBXShellScriptBuildPhase;
350328
alwaysOutOfDate = 1;
@@ -383,7 +361,7 @@
383361
shellPath = /bin/sh;
384362
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
385363
};
386-
B077D3777883453CEF655523 /* [CP] Check Pods Manifest.lock */ = {
364+
911D527939C7E6D96FD1F622 /* [CP] Check Pods Manifest.lock */ = {
387365
isa = PBXShellScriptBuildPhase;
388366
buildActionMask = 2147483647;
389367
files = (
@@ -398,14 +376,14 @@
398376
outputFileListPaths = (
399377
);
400378
outputPaths = (
401-
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
379+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
402380
);
403381
runOnlyForDeploymentPostprocessing = 0;
404382
shellPath = /bin/sh;
405383
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";
406384
showEnvVarsInLog = 0;
407385
};
408-
F1D59D880CBF6E0A92B3369A /* [CP] Embed Pods Frameworks */ = {
386+
C73E261AE81520B9290DEA3B /* [CP] Embed Pods Frameworks */ = {
409387
isa = PBXShellScriptBuildPhase;
410388
buildActionMask = 2147483647;
411389
files = (
@@ -422,6 +400,28 @@
422400
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
423401
showEnvVarsInLog = 0;
424402
};
403+
D44A57F5FD46560392836FAB /* [CP] Check Pods Manifest.lock */ = {
404+
isa = PBXShellScriptBuildPhase;
405+
buildActionMask = 2147483647;
406+
files = (
407+
);
408+
inputFileListPaths = (
409+
);
410+
inputPaths = (
411+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
412+
"${PODS_ROOT}/Manifest.lock",
413+
);
414+
name = "[CP] Check Pods Manifest.lock";
415+
outputFileListPaths = (
416+
);
417+
outputPaths = (
418+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
419+
);
420+
runOnlyForDeploymentPostprocessing = 0;
421+
shellPath = /bin/sh;
422+
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";
423+
showEnvVarsInLog = 0;
424+
};
425425
/* End PBXShellScriptBuildPhase section */
426426

427427
/* Begin PBXSourcesBuildPhase section */
@@ -473,7 +473,7 @@
473473
/* Begin XCBuildConfiguration section */
474474
331C80DB294CF71000263BE5 /* Debug */ = {
475475
isa = XCBuildConfiguration;
476-
baseConfigurationReference = 9FA206784C325509F7FA4B5E /* Pods-RunnerTests.debug.xcconfig */;
476+
baseConfigurationReference = 0B7B26B06D95BCEB16292A17 /* Pods-RunnerTests.debug.xcconfig */;
477477
buildSettings = {
478478
BUNDLE_LOADER = "$(TEST_HOST)";
479479
CURRENT_PROJECT_VERSION = 1;
@@ -489,7 +489,7 @@
489489
};
490490
331C80DC294CF71000263BE5 /* Release */ = {
491491
isa = XCBuildConfiguration;
492-
baseConfigurationReference = A0C02750B9D54FAAA6C9511B /* Pods-RunnerTests.release.xcconfig */;
492+
baseConfigurationReference = DC6F8241DD6815538E41698A /* Pods-RunnerTests.release.xcconfig */;
493493
buildSettings = {
494494
BUNDLE_LOADER = "$(TEST_HOST)";
495495
CURRENT_PROJECT_VERSION = 1;
@@ -505,7 +505,7 @@
505505
};
506506
331C80DD294CF71000263BE5 /* Profile */ = {
507507
isa = XCBuildConfiguration;
508-
baseConfigurationReference = ADA2A65F6AFD7040F637C260 /* Pods-RunnerTests.profile.xcconfig */;
508+
baseConfigurationReference = 37F8DCFCA52DD48725EE2A89 /* Pods-RunnerTests.profile.xcconfig */;
509509
buildSettings = {
510510
BUNDLE_LOADER = "$(TEST_HOST)";
511511
CURRENT_PROJECT_VERSION = 1;

‎colorist/step_02/pubspec.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
name: colorist
22
description: "A new Flutter project."
3-
publish_to: 'none'
3+
publish_to: "none"
44
version: 0.1.0
55

66
environment:
7-
sdk: ^3.7.2
7+
sdk: ^3.8.0-0
88

99
dependencies:
1010
flutter:
1111
sdk: flutter
12-
colorist_ui: ^0.1.0
12+
colorist_ui: ^0.2.2
1313
flutter_riverpod: ^2.6.1
1414
riverpod_annotation: ^2.6.1
1515
firebase_core: ^3.13.0
@@ -22,7 +22,7 @@ dev_dependencies:
2222
build_runner: ^2.4.15
2323
riverpod_generator: ^2.6.5
2424
riverpod_lint: ^2.6.5
25-
json_serializable: ^6.9.4
25+
json_serializable: ^6.9.5
2626
custom_lint: ^0.7.5
2727

2828
flutter:

0 commit comments

Comments
 (0)