Skip to content

Commit 3d3a359

Browse files
committed
Update adaptive_app
1 parent 59ae6f9 commit 3d3a359

File tree

14 files changed

+483
-483
lines changed

14 files changed

+483
-483
lines changed

adaptive_app/step_04/ios/Runner.xcodeproj/project.pbxproj

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

adaptive_app/step_04/macos/Runner.xcodeproj/project.pbxproj

Lines changed: 48 additions & 48 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-
DE74231D82140FDB47200BA9 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1756D326697779A5B45E812 /* Pods_Runner.framework */; };
31-
FB81AA3135684CAEF4124989 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 78092EC8DF6D0C819C419E1F /* Pods_RunnerTests.framework */; };
30+
7BDB475EAE12196F47FFEACF /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A76F6D0F9A9ECF5F372C2225 /* Pods_Runner.framework */; };
31+
E9B346FCCB84F4EA1D68C334 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 730B02D05566FDB3B0AEDB76 /* Pods_RunnerTests.framework */; };
3232
/* End PBXBuildFile section */
3333

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

6464
/* Begin PBXFileReference section */
65-
116485AEE8E10424A562617E /* 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>"; };
65+
14895E96298C624464DBFB8C /* 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>"; };
66+
29C543CCDB05C79A3F587798 /* 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>"; };
6667
331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6768
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
6869
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
@@ -79,31 +80,30 @@
7980
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
8081
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
8182
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
82-
3E8DC6A181902F0FB1FD4764 /* 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>"; };
83-
706365BDF86283D895351070 /* 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>"; };
84-
78092EC8DF6D0C819C419E1F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
85-
78B933927F84D48D2BB12F05 /* 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>"; };
83+
5FD9945727C4F1E36849A9F7 /* 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>"; };
84+
730B02D05566FDB3B0AEDB76 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8685
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
86+
88BE8072AAD162173C43127D /* 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>"; };
8787
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
88-
C1756D326697779A5B45E812 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
89-
D32DA8F1992A8F6C9A559998 /* 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>"; };
90-
F15D5362A46BC431413FB95D /* 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>"; };
88+
9B72268C6ED12489C79A9053 /* 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>"; };
89+
A76F6D0F9A9ECF5F372C2225 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
90+
E0BA8669BFAF0D7D3530D231 /* 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>"; };
9191
/* End PBXFileReference section */
9292

9393
/* Begin PBXFrameworksBuildPhase section */
9494
331C80D2294CF70F00263BE5 /* Frameworks */ = {
9595
isa = PBXFrameworksBuildPhase;
9696
buildActionMask = 2147483647;
9797
files = (
98-
FB81AA3135684CAEF4124989 /* Pods_RunnerTests.framework in Frameworks */,
98+
E9B346FCCB84F4EA1D68C334 /* Pods_RunnerTests.framework in Frameworks */,
9999
);
100100
runOnlyForDeploymentPostprocessing = 0;
101101
};
102102
33CC10EA2044A3C60003C045 /* Frameworks */ = {
103103
isa = PBXFrameworksBuildPhase;
104104
buildActionMask = 2147483647;
105105
files = (
106-
DE74231D82140FDB47200BA9 /* Pods_Runner.framework in Frameworks */,
106+
7BDB475EAE12196F47FFEACF /* Pods_Runner.framework in Frameworks */,
107107
);
108108
runOnlyForDeploymentPostprocessing = 0;
109109
};
@@ -137,7 +137,7 @@
137137
331C80D6294CF71000263BE5 /* RunnerTests */,
138138
33CC10EE2044A3C60003C045 /* Products */,
139139
D73912EC22F37F3D000D13A0 /* Frameworks */,
140-
72163AF517AA73BD4776A047 /* Pods */,
140+
D9486C6BFEBDC468325B5CA3 /* Pods */,
141141
);
142142
sourceTree = "<group>";
143143
};
@@ -185,27 +185,27 @@
185185
path = Runner;
186186
sourceTree = "<group>";
187187
};
188-
72163AF517AA73BD4776A047 /* Pods */ = {
188+
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
189189
isa = PBXGroup;
190190
children = (
191-
F15D5362A46BC431413FB95D /* Pods-Runner.debug.xcconfig */,
192-
78B933927F84D48D2BB12F05 /* Pods-Runner.release.xcconfig */,
193-
D32DA8F1992A8F6C9A559998 /* Pods-Runner.profile.xcconfig */,
194-
3E8DC6A181902F0FB1FD4764 /* Pods-RunnerTests.debug.xcconfig */,
195-
706365BDF86283D895351070 /* Pods-RunnerTests.release.xcconfig */,
196-
116485AEE8E10424A562617E /* Pods-RunnerTests.profile.xcconfig */,
191+
A76F6D0F9A9ECF5F372C2225 /* Pods_Runner.framework */,
192+
730B02D05566FDB3B0AEDB76 /* Pods_RunnerTests.framework */,
197193
);
198-
name = Pods;
199-
path = Pods;
194+
name = Frameworks;
200195
sourceTree = "<group>";
201196
};
202-
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
197+
D9486C6BFEBDC468325B5CA3 /* Pods */ = {
203198
isa = PBXGroup;
204199
children = (
205-
C1756D326697779A5B45E812 /* Pods_Runner.framework */,
206-
78092EC8DF6D0C819C419E1F /* Pods_RunnerTests.framework */,
200+
29C543CCDB05C79A3F587798 /* Pods-Runner.debug.xcconfig */,
201+
E0BA8669BFAF0D7D3530D231 /* Pods-Runner.release.xcconfig */,
202+
5FD9945727C4F1E36849A9F7 /* Pods-Runner.profile.xcconfig */,
203+
14895E96298C624464DBFB8C /* Pods-RunnerTests.debug.xcconfig */,
204+
9B72268C6ED12489C79A9053 /* Pods-RunnerTests.release.xcconfig */,
205+
88BE8072AAD162173C43127D /* Pods-RunnerTests.profile.xcconfig */,
207206
);
208-
name = Frameworks;
207+
name = Pods;
208+
path = Pods;
209209
sourceTree = "<group>";
210210
};
211211
/* End PBXGroup section */
@@ -215,7 +215,7 @@
215215
isa = PBXNativeTarget;
216216
buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
217217
buildPhases = (
218-
AC10C5A31EC9F5476CA11131 /* [CP] Check Pods Manifest.lock */,
218+
C174CBC3E8D2724091838EDC /* [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-
B66C8E102C1E1688CBEDA761 /* [CP] Check Pods Manifest.lock */,
237+
FA3DA86855CBE4C6E115CE10 /* [CP] Check Pods Manifest.lock */,
238238
33CC10E92044A3C60003C045 /* Sources */,
239239
33CC10EA2044A3C60003C045 /* Frameworks */,
240240
33CC10EB2044A3C60003C045 /* Resources */,
241241
33CC110E2044A8840003C045 /* Bundle Framework */,
242242
3399D490228B24CF009A79C7 /* ShellScript */,
243-
61C6B49607938996047B36DA /* [CP] Embed Pods Frameworks */,
243+
D76E5D624E19B5A423D1EBD9 /* [CP] Embed Pods Frameworks */,
244244
);
245245
buildRules = (
246246
);
@@ -361,46 +361,46 @@
361361
shellPath = /bin/sh;
362362
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
363363
};
364-
61C6B49607938996047B36DA /* [CP] Embed Pods Frameworks */ = {
364+
C174CBC3E8D2724091838EDC /* [CP] Check Pods Manifest.lock */ = {
365365
isa = PBXShellScriptBuildPhase;
366366
buildActionMask = 2147483647;
367367
files = (
368368
);
369369
inputFileListPaths = (
370-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
371370
);
372-
name = "[CP] Embed Pods Frameworks";
371+
inputPaths = (
372+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
373+
"${PODS_ROOT}/Manifest.lock",
374+
);
375+
name = "[CP] Check Pods Manifest.lock";
373376
outputFileListPaths = (
374-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
377+
);
378+
outputPaths = (
379+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
375380
);
376381
runOnlyForDeploymentPostprocessing = 0;
377382
shellPath = /bin/sh;
378-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
383+
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";
379384
showEnvVarsInLog = 0;
380385
};
381-
AC10C5A31EC9F5476CA11131 /* [CP] Check Pods Manifest.lock */ = {
386+
D76E5D624E19B5A423D1EBD9 /* [CP] Embed Pods Frameworks */ = {
382387
isa = PBXShellScriptBuildPhase;
383388
buildActionMask = 2147483647;
384389
files = (
385390
);
386391
inputFileListPaths = (
392+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
387393
);
388-
inputPaths = (
389-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
390-
"${PODS_ROOT}/Manifest.lock",
391-
);
392-
name = "[CP] Check Pods Manifest.lock";
394+
name = "[CP] Embed Pods Frameworks";
393395
outputFileListPaths = (
394-
);
395-
outputPaths = (
396-
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
396+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
397397
);
398398
runOnlyForDeploymentPostprocessing = 0;
399399
shellPath = /bin/sh;
400-
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";
400+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
401401
showEnvVarsInLog = 0;
402402
};
403-
B66C8E102C1E1688CBEDA761 /* [CP] Check Pods Manifest.lock */ = {
403+
FA3DA86855CBE4C6E115CE10 /* [CP] Check Pods Manifest.lock */ = {
404404
isa = PBXShellScriptBuildPhase;
405405
buildActionMask = 2147483647;
406406
files = (
@@ -473,7 +473,7 @@
473473
/* Begin XCBuildConfiguration section */
474474
331C80DB294CF71000263BE5 /* Debug */ = {
475475
isa = XCBuildConfiguration;
476-
baseConfigurationReference = 3E8DC6A181902F0FB1FD4764 /* Pods-RunnerTests.debug.xcconfig */;
476+
baseConfigurationReference = 14895E96298C624464DBFB8C /* Pods-RunnerTests.debug.xcconfig */;
477477
buildSettings = {
478478
BUNDLE_LOADER = "$(TEST_HOST)";
479479
CURRENT_PROJECT_VERSION = 1;
@@ -488,7 +488,7 @@
488488
};
489489
331C80DC294CF71000263BE5 /* Release */ = {
490490
isa = XCBuildConfiguration;
491-
baseConfigurationReference = 706365BDF86283D895351070 /* Pods-RunnerTests.release.xcconfig */;
491+
baseConfigurationReference = 9B72268C6ED12489C79A9053 /* Pods-RunnerTests.release.xcconfig */;
492492
buildSettings = {
493493
BUNDLE_LOADER = "$(TEST_HOST)";
494494
CURRENT_PROJECT_VERSION = 1;
@@ -503,7 +503,7 @@
503503
};
504504
331C80DD294CF71000263BE5 /* Profile */ = {
505505
isa = XCBuildConfiguration;
506-
baseConfigurationReference = 116485AEE8E10424A562617E /* Pods-RunnerTests.profile.xcconfig */;
506+
baseConfigurationReference = 88BE8072AAD162173C43127D /* Pods-RunnerTests.profile.xcconfig */;
507507
buildSettings = {
508508
BUNDLE_LOADER = "$(TEST_HOST)";
509509
CURRENT_PROJECT_VERSION = 1;

adaptive_app/step_04/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ dependencies:
3535
# Use with the CupertinoIcons class for iOS style icons.
3636
cupertino_icons: ^1.0.8
3737
googleapis: ^14.0.0
38-
http: ^1.4.0
38+
http: ^1.5.0
3939
provider: ^6.1.5
4040
url_launcher: ^6.3.2
4141
flex_color_scheme: ^8.2.1-dev.1
42-
go_router: ^16.0.0
42+
go_router: ^16.1.0
4343

4444
dev_dependencies:
4545
flutter_test:

0 commit comments

Comments
 (0)