Skip to content

Commit 2ef7598

Browse files
domesticmousedomesticmouse
committed
Add adaptive_app back to the mix
1 parent e7498b9 commit 2ef7598

File tree

14 files changed

+916
-24
lines changed

14 files changed

+916
-24
lines changed

‎adaptive_app/codelab_rebuild.yaml‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ steps:
204204
platforms: [ windows ]
205205
path: adaptive_app
206206
flutter: build windows
207+
- name: Build Web app
208+
path: adaptive_app
209+
flutter: build web
207210
- name: Copy step_03
208211
copydir:
209212
from: adaptive_app
@@ -218,6 +221,9 @@ steps:
218221
- name: Add googleapis http provider url_launcher flex_color_scheme go_router
219222
path: adaptive_app
220223
flutter: pub add googleapis http provider url_launcher flex_color_scheme go_router
224+
- name: Update flex_color_scheme to flex_color_scheme:^8.2.1-dev.1
225+
path: adaptive_app
226+
flutter: pub add flex_color_scheme:^8.2.1-dev.1
221227
- name: Patch android/app/src/main/AndroidManifest.xml
222228
path: adaptive_app/android/app/src/main/AndroidManifest.xml
223229
patch-u: |
@@ -718,10 +724,16 @@ steps:
718724
platforms: [ macos ]
719725
path: adaptive_app/macos
720726
pod: install
727+
- name: Build Web app
728+
path: adaptive_app
729+
flutter: build web
721730
- name: Copy step_04
722731
copydir:
723732
from: adaptive_app
724733
to: step_04
734+
- name: Flutter clean
735+
path: step_04
736+
flutter: clean
725737
- name: step_05
726738
steps:
727739
- name: Remove generated code
@@ -1042,10 +1054,16 @@ steps:
10421054
);
10431055
}
10441056
}
1057+
- name: Build Web app
1058+
path: adaptive_app
1059+
flutter: build web
10451060
- name: Copy step_05
10461061
copydir:
10471062
from: adaptive_app
10481063
to: step_05
1064+
- name: Flutter clean
1065+
path: step_05
1066+
flutter: clean
10491067
- name: step_06
10501068
steps:
10511069
- name: Remove generated code
@@ -1246,17 +1264,20 @@ steps:
12461264
};
12471265
}
12481266
}
1267+
- name: Build Web app
1268+
path: adaptive_app
1269+
flutter: build web
12491270
- name: Copy step_06
12501271
copydir:
12511272
from: adaptive_app
12521273
to: step_06
1274+
- name: Flutter clean
1275+
path: step_06
1276+
flutter: clean
12531277
- name: step_07
12541278
steps:
12551279
- name: Remove generated code
12561280
rmdir: step_07
1257-
- name: Remove http package
1258-
path: adaptive_app
1259-
flutter: pub remove http
12601281
- name: flutter clean
12611282
path: adaptive_app
12621283
flutter: clean
@@ -1265,7 +1286,7 @@ steps:
12651286
flutter: pub get
12661287
- name: Add googleapis_auth google_sign_in extension_google_sign_in_as_googleapis_auth
12671288
path: adaptive_app
1268-
flutter: pub add googleapis_auth google_sign_in extension_google_sign_in_as_googleapis_auth http
1289+
flutter: pub add googleapis_auth google_sign_in:^6.3.0 extension_google_sign_in_as_googleapis_auth:^2.0.13
12691290
- name: Patch .gitignore
12701291
path: adaptive_app/.gitignore
12711292
patch-u: |
@@ -1749,6 +1770,9 @@ steps:
17491770
platforms: [ macos ]
17501771
path: adaptive_app/macos
17511772
pod: install
1773+
- name: Build Web app
1774+
path: adaptive_app
1775+
flutter: build web
17521776
- name: Build iOS simulator bundle
17531777
platforms: [ macos ]
17541778
path: adaptive_app
@@ -1765,9 +1789,6 @@ steps:
17651789
platforms: [ windows ]
17661790
path: adaptive_app
17671791
flutter: build windows
1768-
- name: Build Web app
1769-
path: adaptive_app
1770-
flutter: build web
17711792
- name: Copy step_07
17721793
copydir:
17731794
from: adaptive_app

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

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
1212
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
13+
610D5B66C8EEBACA5D6DD72A /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE323B5ECFF8B937F278BE1 /* Pods_RunnerTests.framework */; };
1314
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
15+
7E19658707FF2DFAA41F7ECA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C8ACBD138D59DFCDCDC0744 /* Pods_Runner.framework */; };
1416
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1517
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1618
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -42,9 +44,13 @@
4244
/* Begin PBXFileReference section */
4345
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4446
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
47+
1C8ACBD138D59DFCDCDC0744 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
48+
263DAAD118C506961F6043C1 /* 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>"; };
4549
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
4650
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4751
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
52+
5CE323B5ECFF8B937F278BE1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
53+
67D8E8CEA7FAB773D05AC64F /* 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>"; };
4854
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4955
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5056
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -55,13 +61,26 @@
5561
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5662
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5763
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
64+
B193FFB0D5527A734562178B /* 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>"; };
65+
C2E0A86CACAF5ECB8C443A21 /* 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+
D3EA0779C9C011F5FBE30077 /* 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>"; };
67+
EF589B92D592659511618C3A /* 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>"; };
5868
/* End PBXFileReference section */
5969

6070
/* Begin PBXFrameworksBuildPhase section */
71+
67CDCE5801768CF5E8108FF2 /* Frameworks */ = {
72+
isa = PBXFrameworksBuildPhase;
73+
buildActionMask = 2147483647;
74+
files = (
75+
610D5B66C8EEBACA5D6DD72A /* Pods_RunnerTests.framework in Frameworks */,
76+
);
77+
runOnlyForDeploymentPostprocessing = 0;
78+
};
6179
97C146EB1CF9000F007C117D /* Frameworks */ = {
6280
isa = PBXFrameworksBuildPhase;
6381
buildActionMask = 2147483647;
6482
files = (
83+
7E19658707FF2DFAA41F7ECA /* Pods_Runner.framework in Frameworks */,
6584
);
6685
runOnlyForDeploymentPostprocessing = 0;
6786
};
@@ -94,6 +113,8 @@
94113
97C146F01CF9000F007C117D /* Runner */,
95114
97C146EF1CF9000F007C117D /* Products */,
96115
331C8082294A63A400263BE5 /* RunnerTests */,
116+
FDC041EADB32D3D71255E2CA /* Pods */,
117+
C991857F1FDC2E001760DE56 /* Frameworks */,
97118
);
98119
sourceTree = "<group>";
99120
};
@@ -121,15 +142,40 @@
121142
path = Runner;
122143
sourceTree = "<group>";
123144
};
145+
C991857F1FDC2E001760DE56 /* Frameworks */ = {
146+
isa = PBXGroup;
147+
children = (
148+
1C8ACBD138D59DFCDCDC0744 /* Pods_Runner.framework */,
149+
5CE323B5ECFF8B937F278BE1 /* Pods_RunnerTests.framework */,
150+
);
151+
name = Frameworks;
152+
sourceTree = "<group>";
153+
};
154+
FDC041EADB32D3D71255E2CA /* Pods */ = {
155+
isa = PBXGroup;
156+
children = (
157+
D3EA0779C9C011F5FBE30077 /* Pods-Runner.debug.xcconfig */,
158+
B193FFB0D5527A734562178B /* Pods-Runner.release.xcconfig */,
159+
263DAAD118C506961F6043C1 /* Pods-Runner.profile.xcconfig */,
160+
EF589B92D592659511618C3A /* Pods-RunnerTests.debug.xcconfig */,
161+
C2E0A86CACAF5ECB8C443A21 /* Pods-RunnerTests.release.xcconfig */,
162+
67D8E8CEA7FAB773D05AC64F /* Pods-RunnerTests.profile.xcconfig */,
163+
);
164+
name = Pods;
165+
path = Pods;
166+
sourceTree = "<group>";
167+
};
124168
/* End PBXGroup section */
125169

126170
/* Begin PBXNativeTarget section */
127171
331C8080294A63A400263BE5 /* RunnerTests */ = {
128172
isa = PBXNativeTarget;
129173
buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
130174
buildPhases = (
175+
3FFF9848EF80F6BCB98ECB80 /* [CP] Check Pods Manifest.lock */,
131176
331C807D294A63A400263BE5 /* Sources */,
132177
331C807F294A63A400263BE5 /* Resources */,
178+
67CDCE5801768CF5E8108FF2 /* Frameworks */,
133179
);
134180
buildRules = (
135181
);
@@ -145,12 +191,14 @@
145191
isa = PBXNativeTarget;
146192
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
147193
buildPhases = (
194+
D35C5F19E376062032A827A7 /* [CP] Check Pods Manifest.lock */,
148195
9740EEB61CF901F6004384FC /* Run Script */,
149196
97C146EA1CF9000F007C117D /* Sources */,
150197
97C146EB1CF9000F007C117D /* Frameworks */,
151198
97C146EC1CF9000F007C117D /* Resources */,
152199
9705A1C41CF9048500538489 /* Embed Frameworks */,
153200
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
201+
C0D40142B38B51BD6290DAC2 /* [CP] Embed Pods Frameworks */,
154202
);
155203
buildRules = (
156204
);
@@ -238,6 +286,28 @@
238286
shellPath = /bin/sh;
239287
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
240288
};
289+
3FFF9848EF80F6BCB98ECB80 /* [CP] Check Pods Manifest.lock */ = {
290+
isa = PBXShellScriptBuildPhase;
291+
buildActionMask = 2147483647;
292+
files = (
293+
);
294+
inputFileListPaths = (
295+
);
296+
inputPaths = (
297+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
298+
"${PODS_ROOT}/Manifest.lock",
299+
);
300+
name = "[CP] Check Pods Manifest.lock";
301+
outputFileListPaths = (
302+
);
303+
outputPaths = (
304+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
305+
);
306+
runOnlyForDeploymentPostprocessing = 0;
307+
shellPath = /bin/sh;
308+
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";
309+
showEnvVarsInLog = 0;
310+
};
241311
9740EEB61CF901F6004384FC /* Run Script */ = {
242312
isa = PBXShellScriptBuildPhase;
243313
alwaysOutOfDate = 1;
@@ -253,6 +323,45 @@
253323
shellPath = /bin/sh;
254324
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
255325
};
326+
C0D40142B38B51BD6290DAC2 /* [CP] Embed Pods Frameworks */ = {
327+
isa = PBXShellScriptBuildPhase;
328+
buildActionMask = 2147483647;
329+
files = (
330+
);
331+
inputFileListPaths = (
332+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
333+
);
334+
name = "[CP] Embed Pods Frameworks";
335+
outputFileListPaths = (
336+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
337+
);
338+
runOnlyForDeploymentPostprocessing = 0;
339+
shellPath = /bin/sh;
340+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
341+
showEnvVarsInLog = 0;
342+
};
343+
D35C5F19E376062032A827A7 /* [CP] Check Pods Manifest.lock */ = {
344+
isa = PBXShellScriptBuildPhase;
345+
buildActionMask = 2147483647;
346+
files = (
347+
);
348+
inputFileListPaths = (
349+
);
350+
inputPaths = (
351+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
352+
"${PODS_ROOT}/Manifest.lock",
353+
);
354+
name = "[CP] Check Pods Manifest.lock";
355+
outputFileListPaths = (
356+
);
357+
outputPaths = (
358+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
359+
);
360+
runOnlyForDeploymentPostprocessing = 0;
361+
shellPath = /bin/sh;
362+
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";
363+
showEnvVarsInLog = 0;
364+
};
256365
/* End PBXShellScriptBuildPhase section */
257366

258367
/* Begin PBXSourcesBuildPhase section */
@@ -378,6 +487,7 @@
378487
};
379488
331C8088294A63A400263BE5 /* Debug */ = {
380489
isa = XCBuildConfiguration;
490+
baseConfigurationReference = EF589B92D592659511618C3A /* Pods-RunnerTests.debug.xcconfig */;
381491
buildSettings = {
382492
BUNDLE_LOADER = "$(TEST_HOST)";
383493
CODE_SIGN_STYLE = Automatic;
@@ -395,6 +505,7 @@
395505
};
396506
331C8089294A63A400263BE5 /* Release */ = {
397507
isa = XCBuildConfiguration;
508+
baseConfigurationReference = C2E0A86CACAF5ECB8C443A21 /* Pods-RunnerTests.release.xcconfig */;
398509
buildSettings = {
399510
BUNDLE_LOADER = "$(TEST_HOST)";
400511
CODE_SIGN_STYLE = Automatic;
@@ -410,6 +521,7 @@
410521
};
411522
331C808A294A63A400263BE5 /* Profile */ = {
412523
isa = XCBuildConfiguration;
524+
baseConfigurationReference = 67D8E8CEA7FAB773D05AC64F /* Pods-RunnerTests.profile.xcconfig */;
413525
buildSettings = {
414526
BUNDLE_LOADER = "$(TEST_HOST)";
415527
CODE_SIGN_STYLE = Automatic;

‎adaptive_app/step_04/ios/Runner.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)