Skip to content

Commit 0a862ea

Browse files
Update runners (#1658)
* Update runners * Elide `experimental/pedometer` from CI * Mark `primary` scroll view * Re-enable "experimental/pedometer"
1 parent dd3a024 commit 0a862ea

45 files changed

Lines changed: 708 additions & 579 deletions

File tree

Some content is hidden

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

animations/.metadata

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
# This file should be version controlled.
55

66
version:
7-
revision: 686fe913dc963954b99e62048569cb9ac8e551c8
8-
channel: beta
7+
revision: 9944297138845a94256f1cf37beb88ff9a8e811a
8+
channel: stable
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
17-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
16+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
17+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
1818
- platform: android
19-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
20-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
19+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
20+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
2121
- platform: ios
22-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
23-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
22+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
23+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
2424
- platform: linux
25-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
26-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
25+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
26+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
2727
- platform: macos
28-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
29-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
28+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
29+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
3030
- platform: web
31-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
32-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
31+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
32+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
3333
- platform: windows
34-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
35-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
34+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
35+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
3636

3737
# User provided section
3838

animations/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 1.0.0+1
44
publish_to: none
55

66
environment:
7-
sdk: ">=2.17.0-0 <3.0.0"
7+
sdk: ">=2.19.2 <3.0.0"
88

99
dependencies:
1010
flutter:

desktop_photo_search/fluent_ui/.metadata

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
# This file should be version controlled.
55

66
version:
7-
revision: 686fe913dc963954b99e62048569cb9ac8e551c8
8-
channel: beta
7+
revision: 9944297138845a94256f1cf37beb88ff9a8e811a
8+
channel: stable
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
17-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
16+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
17+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
1818
- platform: linux
19-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
20-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
19+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
20+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
2121
- platform: macos
22-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
23-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
22+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
23+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
2424
- platform: windows
25-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
26-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
25+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
26+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
2727

2828
# User provided section
2929

desktop_photo_search/fluent_ui/lib/src/widgets/photo_details.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class _PhotoDetailsState extends State<PhotoDetails> {
5858
Widget build(BuildContext context) {
5959
return Scrollbar(
6060
child: SingleChildScrollView(
61+
primary: true,
6162
child: Center(
6263
child: Column(
6364
mainAxisSize: MainAxisSize.min,

desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2727
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
2828
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
29+
884B81062E7559792AA7D3B1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECEDBFBE73739914BC5F1C68 /* Pods_Runner.framework */; };
2930
/* End PBXBuildFile section */
3031

3132
/* Begin PBXContainerItemProxy section */
@@ -54,7 +55,7 @@
5455
/* Begin PBXFileReference section */
5556
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
5657
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
57-
33CC10ED2044A3C60003C045 /* desktop_photo_search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "desktop_photo_search.app"; sourceTree = BUILT_PRODUCTS_DIR; };
58+
33CC10ED2044A3C60003C045 /* desktop_photo_search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = desktop_photo_search.app; sourceTree = BUILT_PRODUCTS_DIR; };
5859
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5960
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
6061
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -66,21 +67,37 @@
6667
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
6768
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
6869
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
70+
3B16A1750997F6505926E464 /* 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>"; };
6971
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
7072
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
73+
B6AE42105CA3AF465302536C /* 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>"; };
74+
ECEDBFBE73739914BC5F1C68 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
75+
F0AA862A6E953C2BCFB6AF88 /* 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>"; };
7176
/* End PBXFileReference section */
7277

7378
/* Begin PBXFrameworksBuildPhase section */
7479
33CC10EA2044A3C60003C045 /* Frameworks */ = {
7580
isa = PBXFrameworksBuildPhase;
7681
buildActionMask = 2147483647;
7782
files = (
83+
884B81062E7559792AA7D3B1 /* Pods_Runner.framework in Frameworks */,
7884
);
7985
runOnlyForDeploymentPostprocessing = 0;
8086
};
8187
/* End PBXFrameworksBuildPhase section */
8288

8389
/* Begin PBXGroup section */
90+
26BACD4DA88B997B095184E2 /* Pods */ = {
91+
isa = PBXGroup;
92+
children = (
93+
B6AE42105CA3AF465302536C /* Pods-Runner.debug.xcconfig */,
94+
3B16A1750997F6505926E464 /* Pods-Runner.release.xcconfig */,
95+
F0AA862A6E953C2BCFB6AF88 /* Pods-Runner.profile.xcconfig */,
96+
);
97+
name = Pods;
98+
path = Pods;
99+
sourceTree = "<group>";
100+
};
84101
33BA886A226E78AF003329D5 /* Configs */ = {
85102
isa = PBXGroup;
86103
children = (
@@ -99,6 +116,7 @@
99116
33CEB47122A05771004F2AC0 /* Flutter */,
100117
33CC10EE2044A3C60003C045 /* Products */,
101118
D73912EC22F37F3D000D13A0 /* Frameworks */,
119+
26BACD4DA88B997B095184E2 /* Pods */,
102120
);
103121
sourceTree = "<group>";
104122
};
@@ -148,6 +166,7 @@
148166
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
149167
isa = PBXGroup;
150168
children = (
169+
ECEDBFBE73739914BC5F1C68 /* Pods_Runner.framework */,
151170
);
152171
name = Frameworks;
153172
sourceTree = "<group>";
@@ -159,11 +178,13 @@
159178
isa = PBXNativeTarget;
160179
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
161180
buildPhases = (
181+
63BD7651756B53824E56977F /* [CP] Check Pods Manifest.lock */,
162182
33CC10E92044A3C60003C045 /* Sources */,
163183
33CC10EA2044A3C60003C045 /* Frameworks */,
164184
33CC10EB2044A3C60003C045 /* Resources */,
165185
33CC110E2044A8840003C045 /* Bundle Framework */,
166186
3399D490228B24CF009A79C7 /* ShellScript */,
187+
956D466621879AB65441ECEC /* [CP] Embed Pods Frameworks */,
167188
);
168189
buildRules = (
169190
);
@@ -271,6 +292,45 @@
271292
shellPath = /bin/sh;
272293
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
273294
};
295+
63BD7651756B53824E56977F /* [CP] Check Pods Manifest.lock */ = {
296+
isa = PBXShellScriptBuildPhase;
297+
buildActionMask = 2147483647;
298+
files = (
299+
);
300+
inputFileListPaths = (
301+
);
302+
inputPaths = (
303+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
304+
"${PODS_ROOT}/Manifest.lock",
305+
);
306+
name = "[CP] Check Pods Manifest.lock";
307+
outputFileListPaths = (
308+
);
309+
outputPaths = (
310+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
311+
);
312+
runOnlyForDeploymentPostprocessing = 0;
313+
shellPath = /bin/sh;
314+
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";
315+
showEnvVarsInLog = 0;
316+
};
317+
956D466621879AB65441ECEC /* [CP] Embed Pods Frameworks */ = {
318+
isa = PBXShellScriptBuildPhase;
319+
buildActionMask = 2147483647;
320+
files = (
321+
);
322+
inputFileListPaths = (
323+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
324+
);
325+
name = "[CP] Embed Pods Frameworks";
326+
outputFileListPaths = (
327+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
328+
);
329+
runOnlyForDeploymentPostprocessing = 0;
330+
shellPath = /bin/sh;
331+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
332+
showEnvVarsInLog = 0;
333+
};
274334
/* End PBXShellScriptBuildPhase section */
275335

276336
/* Begin PBXSourcesBuildPhase section */

desktop_photo_search/fluent_ui/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ publish_to: 'none'
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ">=2.17.0-0 <3.0.0"
7+
sdk: ">=2.19.2 <3.0.0"
88

99
dependencies:
1010
built_collection: ^5.1.1
@@ -21,7 +21,7 @@ dependencies:
2121
git:
2222
url: https://github.com/google/flutter-desktop-embedding.git
2323
path: plugins/menubar
24-
ref: 12decbe0f592e14e03223f6f2c0c7e0e2dbd70a1
24+
ref: 6c66ad23ee79749f30a8eece542cf54eaf157ed8
2525
provider: ^6.0.2
2626
transparent_image: ^2.0.0
2727
url_launcher: ^6.1.1
@@ -30,7 +30,7 @@ dependencies:
3030
git:
3131
url: https://github.com/google/flutter-desktop-embedding.git
3232
path: plugins/window_size
33-
ref: 12decbe0f592e14e03223f6f2c0c7e0e2dbd70a1
33+
ref: 6c66ad23ee79749f30a8eece542cf54eaf157ed8
3434

3535
dev_dependencies:
3636
analysis_defaults:

desktop_photo_search/material/.metadata

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
# This file should be version controlled.
55

66
version:
7-
revision: 686fe913dc963954b99e62048569cb9ac8e551c8
8-
channel: beta
7+
revision: 9944297138845a94256f1cf37beb88ff9a8e811a
8+
channel: stable
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
17-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
16+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
17+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
1818
- platform: linux
19-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
20-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
19+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
20+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
2121
- platform: macos
22-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
23-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
22+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
23+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
2424
- platform: windows
25-
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
26-
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
25+
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
26+
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
2727

2828
# User provided section
2929

desktop_photo_search/material/lib/src/widgets/photo_details.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ class _PhotoDetailsState extends State<PhotoDetails> {
5656
Widget build(BuildContext context) {
5757
return Scrollbar(
5858
child: SingleChildScrollView(
59+
primary: true,
5960
child: Center(
6061
child: Column(
6162
mainAxisSize: MainAxisSize.min,

0 commit comments

Comments
 (0)