Skip to content

Commit cfa0d5a

Browse files
domesticmousedomesticmouse
committed
Update firebase-get-to-know-flutter for flutter beta
1 parent d470224 commit cfa0d5a

File tree

32 files changed

+802
-700
lines changed

32 files changed

+802
-700
lines changed

‎firebase-get-to-know-flutter/codelab_rebuild.yaml‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ steps:
3232
# The following line prevents the package from being accidentally published to
3333
# pub.dev using `flutter pub publish`. This is preferred for private packages.
3434
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
35-
@@ -58,6 +59,8 @@ flutter:
35+
@@ -59,6 +60,8 @@ flutter:
3636
# included with your application, so that you can use the icons in
3737
# the material Icons class.
3838
uses-material-design: true
@@ -1699,11 +1699,10 @@ steps:
16991699
platforms: [ macos ]
17001700
path: gtk_flutter
17011701
flutter: build apk
1702-
# TODO: Re-enable once macOS Firebase configuration builds
1703-
# - name: Build for macOS
1704-
# platforms: [ macos ]
1705-
# path: gtk_flutter
1706-
# flutter: build macos --debug
1702+
- name: Build for macOS
1703+
platforms: [ macos ]
1704+
path: gtk_flutter
1705+
flutter: build macos --debug
17071706
- name: Copy step_02
17081707
copydir:
17091708
from: gtk_flutter
@@ -1825,11 +1824,10 @@ steps:
18251824
platforms: [ macos ]
18261825
path: gtk_flutter
18271826
flutter: build apk
1828-
# TODO: Re-enable once macOS Firebase configuration builds
1829-
# - name: Build for macOS
1830-
# platforms: [ macos ]
1831-
# path: gtk_flutter
1832-
# flutter: build macos --debug
1827+
- name: Build for macOS
1828+
platforms: [ macos ]
1829+
path: gtk_flutter
1830+
flutter: build macos --debug
18331831
- name: Copy step_04
18341832
copydir:
18351833
from: gtk_flutter
@@ -2834,11 +2832,10 @@ steps:
28342832
platforms: [ macos ]
28352833
path: gtk_flutter
28362834
flutter: build apk
2837-
# TODO: Re-enable once macOS Firebase configuration builds
2838-
# - name: Build for macOS
2839-
# platforms: [ macos ]
2840-
# path: gtk_flutter
2841-
# flutter: build macos --debug
2835+
- name: Build for macOS
2836+
platforms: [ macos ]
2837+
path: gtk_flutter
2838+
flutter: build macos --debug
28422839
- name: Build for iOS
28432840
platforms: [ macos ]
28442841
path: gtk_flutter

‎firebase-get-to-know-flutter/step_02/android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
1+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

‎firebase-get-to-know-flutter/step_02/ios/Runner.xcodeproj/project.pbxproj‎

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

‎firebase-get-to-know-flutter/step_02/macos/Runner.xcodeproj/project.pbxproj‎

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

2323
/* Begin PBXBuildFile section */
24+
128B8F8A6B5C6CF14D6E0342 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5B5999B70200B3809C6D01 /* Pods_RunnerTests.framework */; };
2425
331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
2526
335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
2627
33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
2728
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2829
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
2930
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
31+
4A2FD2A9AD946C2E174286CE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90F1F021E64641C89665DD10 /* Pods_Runner.framework */; };
3032
/* End PBXBuildFile section */
3133

3234
/* Begin PBXContainerItemProxy section */
@@ -60,6 +62,7 @@
6062
/* End PBXCopyFilesBuildPhase section */
6163

6264
/* Begin PBXFileReference section */
65+
1C25B3513592ABFAAB2831E2 /* 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>"; };
6366
331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6467
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
6568
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
@@ -76,22 +79,31 @@
7679
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
7780
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
7881
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
82+
4D5B5999B70200B3809C6D01 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
83+
563FAA1D5896D8E471921C79 /* 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>"; };
7984
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
85+
90F1F021E64641C89665DD10 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
86+
95D0AE963ADC3E494A4D37F0 /* 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>"; };
8087
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
88+
A2FFC262C51DDC226C58343C /* 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>"; };
89+
BEA42C2E42664EC2D5EA8594 /* 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>"; };
90+
F22AA56F8A11105EB865C7C0 /* 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>"; };
8191
/* End PBXFileReference section */
8292

8393
/* Begin PBXFrameworksBuildPhase section */
8494
331C80D2294CF70F00263BE5 /* Frameworks */ = {
8595
isa = PBXFrameworksBuildPhase;
8696
buildActionMask = 2147483647;
8797
files = (
98+
128B8F8A6B5C6CF14D6E0342 /* Pods_RunnerTests.framework in Frameworks */,
8899
);
89100
runOnlyForDeploymentPostprocessing = 0;
90101
};
91102
33CC10EA2044A3C60003C045 /* Frameworks */ = {
92103
isa = PBXFrameworksBuildPhase;
93104
buildActionMask = 2147483647;
94105
files = (
106+
4A2FD2A9AD946C2E174286CE /* Pods_Runner.framework in Frameworks */,
95107
);
96108
runOnlyForDeploymentPostprocessing = 0;
97109
};
@@ -125,6 +137,7 @@
125137
331C80D6294CF71000263BE5 /* RunnerTests */,
126138
33CC10EE2044A3C60003C045 /* Products */,
127139
D73912EC22F37F3D000D13A0 /* Frameworks */,
140+
E51BE6CEB1BDEEEF7114DDF8 /* Pods */,
128141
);
129142
sourceTree = "<group>";
130143
};
@@ -175,17 +188,34 @@
175188
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
176189
isa = PBXGroup;
177190
children = (
191+
90F1F021E64641C89665DD10 /* Pods_Runner.framework */,
192+
4D5B5999B70200B3809C6D01 /* Pods_RunnerTests.framework */,
178193
);
179194
name = Frameworks;
180195
sourceTree = "<group>";
181196
};
197+
E51BE6CEB1BDEEEF7114DDF8 /* Pods */ = {
198+
isa = PBXGroup;
199+
children = (
200+
563FAA1D5896D8E471921C79 /* Pods-Runner.debug.xcconfig */,
201+
A2FFC262C51DDC226C58343C /* Pods-Runner.release.xcconfig */,
202+
1C25B3513592ABFAAB2831E2 /* Pods-Runner.profile.xcconfig */,
203+
BEA42C2E42664EC2D5EA8594 /* Pods-RunnerTests.debug.xcconfig */,
204+
F22AA56F8A11105EB865C7C0 /* Pods-RunnerTests.release.xcconfig */,
205+
95D0AE963ADC3E494A4D37F0 /* Pods-RunnerTests.profile.xcconfig */,
206+
);
207+
name = Pods;
208+
path = Pods;
209+
sourceTree = "<group>";
210+
};
182211
/* End PBXGroup section */
183212

184213
/* Begin PBXNativeTarget section */
185214
331C80D4294CF70F00263BE5 /* RunnerTests */ = {
186215
isa = PBXNativeTarget;
187216
buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
188217
buildPhases = (
218+
6C13E7904DC3004B41332335 /* [CP] Check Pods Manifest.lock */,
189219
331C80D1294CF70F00263BE5 /* Sources */,
190220
331C80D2294CF70F00263BE5 /* Frameworks */,
191221
331C80D3294CF70F00263BE5 /* Resources */,
@@ -204,11 +234,13 @@
204234
isa = PBXNativeTarget;
205235
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
206236
buildPhases = (
237+
0F9D9D66708D755567BE1F99 /* [CP] Check Pods Manifest.lock */,
207238
33CC10E92044A3C60003C045 /* Sources */,
208239
33CC10EA2044A3C60003C045 /* Frameworks */,
209240
33CC10EB2044A3C60003C045 /* Resources */,
210241
33CC110E2044A8840003C045 /* Bundle Framework */,
211242
3399D490228B24CF009A79C7 /* ShellScript */,
243+
D82041256BE3E1863C6F9760 /* [CP] Embed Pods Frameworks */,
212244
);
213245
buildRules = (
214246
);
@@ -291,6 +323,28 @@
291323
/* End PBXResourcesBuildPhase section */
292324

293325
/* Begin PBXShellScriptBuildPhase section */
326+
0F9D9D66708D755567BE1F99 /* [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+
};
294348
3399D490228B24CF009A79C7 /* ShellScript */ = {
295349
isa = PBXShellScriptBuildPhase;
296350
alwaysOutOfDate = 1;
@@ -329,6 +383,45 @@
329383
shellPath = /bin/sh;
330384
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
331385
};
386+
6C13E7904DC3004B41332335 /* [CP] Check Pods Manifest.lock */ = {
387+
isa = PBXShellScriptBuildPhase;
388+
buildActionMask = 2147483647;
389+
files = (
390+
);
391+
inputFileListPaths = (
392+
);
393+
inputPaths = (
394+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
395+
"${PODS_ROOT}/Manifest.lock",
396+
);
397+
name = "[CP] Check Pods Manifest.lock";
398+
outputFileListPaths = (
399+
);
400+
outputPaths = (
401+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
402+
);
403+
runOnlyForDeploymentPostprocessing = 0;
404+
shellPath = /bin/sh;
405+
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";
406+
showEnvVarsInLog = 0;
407+
};
408+
D82041256BE3E1863C6F9760 /* [CP] Embed Pods Frameworks */ = {
409+
isa = PBXShellScriptBuildPhase;
410+
buildActionMask = 2147483647;
411+
files = (
412+
);
413+
inputFileListPaths = (
414+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
415+
);
416+
name = "[CP] Embed Pods Frameworks";
417+
outputFileListPaths = (
418+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
419+
);
420+
runOnlyForDeploymentPostprocessing = 0;
421+
shellPath = /bin/sh;
422+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
423+
showEnvVarsInLog = 0;
424+
};
332425
/* End PBXShellScriptBuildPhase section */
333426

334427
/* Begin PBXSourcesBuildPhase section */
@@ -380,6 +473,7 @@
380473
/* Begin XCBuildConfiguration section */
381474
331C80DB294CF71000263BE5 /* Debug */ = {
382475
isa = XCBuildConfiguration;
476+
baseConfigurationReference = BEA42C2E42664EC2D5EA8594 /* Pods-RunnerTests.debug.xcconfig */;
383477
buildSettings = {
384478
BUNDLE_LOADER = "$(TEST_HOST)";
385479
CURRENT_PROJECT_VERSION = 1;
@@ -395,6 +489,7 @@
395489
};
396490
331C80DC294CF71000263BE5 /* Release */ = {
397491
isa = XCBuildConfiguration;
492+
baseConfigurationReference = F22AA56F8A11105EB865C7C0 /* Pods-RunnerTests.release.xcconfig */;
398493
buildSettings = {
399494
BUNDLE_LOADER = "$(TEST_HOST)";
400495
CURRENT_PROJECT_VERSION = 1;
@@ -410,6 +505,7 @@
410505
};
411506
331C80DD294CF71000263BE5 /* Profile */ = {
412507
isa = XCBuildConfiguration;
508+
baseConfigurationReference = 95D0AE963ADC3E494A4D37F0 /* Pods-RunnerTests.profile.xcconfig */;
413509
buildSettings = {
414510
BUNDLE_LOADER = "$(TEST_HOST)";
415511
CURRENT_PROJECT_VERSION = 1;

‎firebase-get-to-know-flutter/step_02/macos/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.

‎firebase-get-to-know-flutter/step_02/pubspec.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ dependencies:
3232
flutter:
3333
sdk: flutter
3434

35+
3536
# The following adds the Cupertino Icons font to your application.
3637
# Use with the CupertinoIcons class for iOS style icons.
3738
cupertino_icons: ^1.0.8

‎firebase-get-to-know-flutter/step_02/web/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<meta name="description" content="A new Flutter project.">
2222

2323
<!-- iOS meta tags & icons -->
24-
<meta name="mobile-web-app-capable" content="yes">
24+
<meta name="apple-mobile-web-app-capable" content="yes">
2525
<meta name="apple-mobile-web-app-status-bar-style" content="black">
2626
<meta name="apple-mobile-web-app-title" content="gtk_flutter">
2727
<link rel="apple-touch-icon" href="icons/Icon-192.png">

‎firebase-get-to-know-flutter/step_04/android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
1+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

0 commit comments

Comments
 (0)