Skip to content

Commit c34e5f1

Browse files
domesticmousedomesticmouse
authored
Update adaptive_app's deps (#2340)
1 parent 60afd33 commit c34e5f1

File tree

13 files changed

+457
-460
lines changed

13 files changed

+457
-460
lines changed

‎adaptive_app/codelab_rebuild.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,6 @@ steps:
236236
- name: Add googleapis http provider url_launcher flex_color_scheme go_router
237237
path: adaptive_app
238238
flutter: pub add googleapis http provider url_launcher flex_color_scheme go_router
239-
- name: Update flex_color_scheme to flex_color_scheme:^8.2.1-dev.1
240-
path: adaptive_app
241-
flutter: pub add flex_color_scheme:^8.2.1-dev.1
242239
- name: Patch android/app/src/main/AndroidManifest.xml
243240
path: adaptive_app/android/app/src/main/AndroidManifest.xml
244241
patch-u: |

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

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

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

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
/* End PBXAggregateTarget section */
2222

2323
/* Begin PBXBuildFile section */
24-
2E65984B92F9DA1700D464B4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAE39E0772F19B8E21506327 /* Pods_Runner.framework */; };
2524
331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
2625
335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
2726
33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
2827
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2928
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
3029
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
31-
F52EB5165F1C7C2D38209D93 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD697A023332DDE3CA43AA09 /* Pods_RunnerTests.framework */; };
30+
6CD6BA17201650D7870B6391 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A85B4C0133F9F1011365BCB /* Pods_Runner.framework */; };
31+
C7E928D3A3131BABD17C68F9 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C4510C7367E3BBE1533AC9A /* Pods_RunnerTests.framework */; };
3232
/* End PBXBuildFile section */
3333

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

6464
/* Begin PBXFileReference section */
65+
07FAF6C136DE221AC520A559 /* 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>"; };
66+
2CFCE649C7C3E35E13A0EBD3 /* 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>"; };
67+
2D018F7E10E5D0B942565095 /* 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>"; };
6568
331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6669
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
6770
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
@@ -78,52 +81,35 @@
7881
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
7982
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
8083
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
81-
4C6A8B679BEF4A510B37469B /* 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>"; };
82-
744086562EDCD1381D9EDE4E /* 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>"; };
84+
3A85B4C0133F9F1011365BCB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
85+
74837379D0F6F077A7D98C11 /* 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>"; };
8386
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
84-
93D3EFDC14627833E7B468BE /* 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+
82E43834C670AE155600C2F8 /* 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>"; };
88+
8C4510C7367E3BBE1533AC9A /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8589
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
86-
A4BAFE7543A8448A363D4CD4 /* 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>"; };
87-
BD697A023332DDE3CA43AA09 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
88-
CC7975920D9F98F8D5464A5D /* 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-
D134F95F7D3E78CF95754E69 /* 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>"; };
90-
FAE39E0772F19B8E21506327 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
90+
F2DBD41F62E3F6AF33450C66 /* 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-
F52EB5165F1C7C2D38209D93 /* Pods_RunnerTests.framework in Frameworks */,
98+
C7E928D3A3131BABD17C68F9 /* Pods_RunnerTests.framework in Frameworks */,
9999
);
100100
runOnlyForDeploymentPostprocessing = 0;
101101
};
102102
33CC10EA2044A3C60003C045 /* Frameworks */ = {
103103
isa = PBXFrameworksBuildPhase;
104104
buildActionMask = 2147483647;
105105
files = (
106-
2E65984B92F9DA1700D464B4 /* Pods_Runner.framework in Frameworks */,
106+
6CD6BA17201650D7870B6391 /* Pods_Runner.framework in Frameworks */,
107107
);
108108
runOnlyForDeploymentPostprocessing = 0;
109109
};
110110
/* End PBXFrameworksBuildPhase section */
111111

112112
/* Begin PBXGroup section */
113-
224712E10B6605416B0937C0 /* Pods */ = {
114-
isa = PBXGroup;
115-
children = (
116-
744086562EDCD1381D9EDE4E /* Pods-Runner.debug.xcconfig */,
117-
D134F95F7D3E78CF95754E69 /* Pods-Runner.release.xcconfig */,
118-
CC7975920D9F98F8D5464A5D /* Pods-Runner.profile.xcconfig */,
119-
93D3EFDC14627833E7B468BE /* Pods-RunnerTests.debug.xcconfig */,
120-
4C6A8B679BEF4A510B37469B /* Pods-RunnerTests.release.xcconfig */,
121-
A4BAFE7543A8448A363D4CD4 /* Pods-RunnerTests.profile.xcconfig */,
122-
);
123-
name = Pods;
124-
path = Pods;
125-
sourceTree = "<group>";
126-
};
127113
331C80D6294CF71000263BE5 /* RunnerTests */ = {
128114
isa = PBXGroup;
129115
children = (
@@ -151,7 +137,7 @@
151137
331C80D6294CF71000263BE5 /* RunnerTests */,
152138
33CC10EE2044A3C60003C045 /* Products */,
153139
D73912EC22F37F3D000D13A0 /* Frameworks */,
154-
224712E10B6605416B0937C0 /* Pods */,
140+
6C07A19B2F13F4547EBE93A8 /* Pods */,
155141
);
156142
sourceTree = "<group>";
157143
};
@@ -199,11 +185,25 @@
199185
path = Runner;
200186
sourceTree = "<group>";
201187
};
188+
6C07A19B2F13F4547EBE93A8 /* Pods */ = {
189+
isa = PBXGroup;
190+
children = (
191+
F2DBD41F62E3F6AF33450C66 /* Pods-Runner.debug.xcconfig */,
192+
74837379D0F6F077A7D98C11 /* Pods-Runner.release.xcconfig */,
193+
2CFCE649C7C3E35E13A0EBD3 /* Pods-Runner.profile.xcconfig */,
194+
2D018F7E10E5D0B942565095 /* Pods-RunnerTests.debug.xcconfig */,
195+
07FAF6C136DE221AC520A559 /* Pods-RunnerTests.release.xcconfig */,
196+
82E43834C670AE155600C2F8 /* Pods-RunnerTests.profile.xcconfig */,
197+
);
198+
name = Pods;
199+
path = Pods;
200+
sourceTree = "<group>";
201+
};
202202
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
203203
isa = PBXGroup;
204204
children = (
205-
FAE39E0772F19B8E21506327 /* Pods_Runner.framework */,
206-
BD697A023332DDE3CA43AA09 /* Pods_RunnerTests.framework */,
205+
3A85B4C0133F9F1011365BCB /* Pods_Runner.framework */,
206+
8C4510C7367E3BBE1533AC9A /* 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-
1A3629794040C6C9B1130F43 /* [CP] Check Pods Manifest.lock */,
218+
EA4EC04D7E17DBF4EC1A24FF /* [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-
6163615AE6F29DED3B8F08B5 /* [CP] Check Pods Manifest.lock */,
237+
08396279D4FD93DDA125AA33 /* [CP] Check Pods Manifest.lock */,
238238
33CC10E92044A3C60003C045 /* Sources */,
239239
33CC10EA2044A3C60003C045 /* Frameworks */,
240240
33CC10EB2044A3C60003C045 /* Resources */,
241241
33CC110E2044A8840003C045 /* Bundle Framework */,
242242
3399D490228B24CF009A79C7 /* ShellScript */,
243-
4EEF651504F28267374266AC /* [CP] Embed Pods Frameworks */,
243+
36D5D75D7E4DC5CF6A556EAD /* [CP] Embed Pods Frameworks */,
244244
);
245245
buildRules = (
246246
);
@@ -323,7 +323,7 @@
323323
/* End PBXResourcesBuildPhase section */
324324

325325
/* Begin PBXShellScriptBuildPhase section */
326-
1A3629794040C6C9B1130F43 /* [CP] Check Pods Manifest.lock */ = {
326+
08396279D4FD93DDA125AA33 /* [CP] Check Pods Manifest.lock */ = {
327327
isa = PBXShellScriptBuildPhase;
328328
buildActionMask = 2147483647;
329329
files = (
@@ -338,7 +338,7 @@
338338
outputFileListPaths = (
339339
);
340340
outputPaths = (
341-
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
341+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
342342
);
343343
runOnlyForDeploymentPostprocessing = 0;
344344
shellPath = /bin/sh;
@@ -383,7 +383,7 @@
383383
shellPath = /bin/sh;
384384
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
385385
};
386-
4EEF651504F28267374266AC /* [CP] Embed Pods Frameworks */ = {
386+
36D5D75D7E4DC5CF6A556EAD /* [CP] Embed Pods Frameworks */ = {
387387
isa = PBXShellScriptBuildPhase;
388388
buildActionMask = 2147483647;
389389
files = (
@@ -400,7 +400,7 @@
400400
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
401401
showEnvVarsInLog = 0;
402402
};
403-
6163615AE6F29DED3B8F08B5 /* [CP] Check Pods Manifest.lock */ = {
403+
EA4EC04D7E17DBF4EC1A24FF /* [CP] Check Pods Manifest.lock */ = {
404404
isa = PBXShellScriptBuildPhase;
405405
buildActionMask = 2147483647;
406406
files = (
@@ -415,7 +415,7 @@
415415
outputFileListPaths = (
416416
);
417417
outputPaths = (
418-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
418+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
419419
);
420420
runOnlyForDeploymentPostprocessing = 0;
421421
shellPath = /bin/sh;
@@ -473,7 +473,7 @@
473473
/* Begin XCBuildConfiguration section */
474474
331C80DB294CF71000263BE5 /* Debug */ = {
475475
isa = XCBuildConfiguration;
476-
baseConfigurationReference = 93D3EFDC14627833E7B468BE /* Pods-RunnerTests.debug.xcconfig */;
476+
baseConfigurationReference = 2D018F7E10E5D0B942565095 /* 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 = 4C6A8B679BEF4A510B37469B /* Pods-RunnerTests.release.xcconfig */;
491+
baseConfigurationReference = 07FAF6C136DE221AC520A559 /* 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 = A4BAFE7543A8448A363D4CD4 /* Pods-RunnerTests.profile.xcconfig */;
506+
baseConfigurationReference = 82E43834C670AE155600C2F8 /* 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
@@ -38,8 +38,8 @@ dependencies:
3838
http: ^1.5.0
3939
provider: ^6.1.5
4040
url_launcher: ^6.3.2
41-
flex_color_scheme: ^8.2.1-dev.1
42-
go_router: ^16.1.0
41+
flex_color_scheme: ^8.3.0
42+
go_router: ^16.2.0
4343

4444
dev_dependencies:
4545
flutter_test:

0 commit comments

Comments
 (0)