Skip to content

Commit

Permalink
Update runners (flutter#1658)
Browse files Browse the repository at this point in the history 
* Update runners

* Elide `experimental/pedometer` from CI

* Mark `primary` scroll view

* Re-enable "experimental/pedometer"
  • Loading branch information
@domesticmouse
domesticmouse authored Feb 20, 2023
1 parent dd3a024 commit 0a862ea
Show file tree
Hide file tree
Showing 45 changed files with 708 additions and 579 deletions.
32 changes: 16 additions & 16 deletions animations/.metadata
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@
# This file should be version controlled.

version:
revision: 686fe913dc963954b99e62048569cb9ac8e551c8
channel: beta
revision: 9944297138845a94256f1cf37beb88ff9a8e811a
channel: stable

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: android
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: ios
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: linux
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: macos
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: web
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: windows
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a

# User provided section

Expand Down
2 changes: 1 addition & 1 deletion animations/pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 1.0.0+1
publish_to: none

environment:
sdk: ">=2.17.0-0 <3.0.0"
sdk: ">=2.19.2 <3.0.0"

dependencies:
flutter:
Expand Down
20 changes: 10 additions & 10 deletions desktop_photo_search/fluent_ui/.metadata
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@
# This file should be version controlled.

version:
revision: 686fe913dc963954b99e62048569cb9ac8e551c8
channel: beta
revision: 9944297138845a94256f1cf37beb88ff9a8e811a
channel: stable

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: linux
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: macos
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: windows
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a

# User provided section

Expand Down
1 change: 1 addition & 0 deletions desktop_photo_search/fluent_ui/lib/src/widgets/photo_details.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class _PhotoDetailsState extends State<PhotoDetails> {
Widget build(BuildContext context) {
return Scrollbar(
child: SingleChildScrollView(
primary: true,
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
Expand Down
62 changes: 61 additions & 1 deletion desktop_photo_search/fluent_ui/macos/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
884B81062E7559792AA7D3B1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECEDBFBE73739914BC5F1C68 /* Pods_Runner.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -54,7 +55,7 @@
/* Begin PBXFileReference section */
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
33CC10ED2044A3C60003C045 /* desktop_photo_search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "desktop_photo_search.app"; sourceTree = BUILT_PRODUCTS_DIR; };
33CC10ED2044A3C60003C045 /* desktop_photo_search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = desktop_photo_search.app; sourceTree = BUILT_PRODUCTS_DIR; };
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
Expand All @@ -66,21 +67,37 @@
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
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>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
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>"; };
ECEDBFBE73739914BC5F1C68 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
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>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
33CC10EA2044A3C60003C045 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
884B81062E7559792AA7D3B1 /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
26BACD4DA88B997B095184E2 /* Pods */ = {
isa = PBXGroup;
children = (
B6AE42105CA3AF465302536C /* Pods-Runner.debug.xcconfig */,
3B16A1750997F6505926E464 /* Pods-Runner.release.xcconfig */,
F0AA862A6E953C2BCFB6AF88 /* Pods-Runner.profile.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
33BA886A226E78AF003329D5 /* Configs */ = {
isa = PBXGroup;
children = (
Expand All @@ -99,6 +116,7 @@
33CEB47122A05771004F2AC0 /* Flutter */,
33CC10EE2044A3C60003C045 /* Products */,
D73912EC22F37F3D000D13A0 /* Frameworks */,
26BACD4DA88B997B095184E2 /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -148,6 +166,7 @@
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
isa = PBXGroup;
children = (
ECEDBFBE73739914BC5F1C68 /* Pods_Runner.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -159,11 +178,13 @@
isa = PBXNativeTarget;
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = (
63BD7651756B53824E56977F /* [CP] Check Pods Manifest.lock */,
33CC10E92044A3C60003C045 /* Sources */,
33CC10EA2044A3C60003C045 /* Frameworks */,
33CC10EB2044A3C60003C045 /* Resources */,
33CC110E2044A8840003C045 /* Bundle Framework */,
3399D490228B24CF009A79C7 /* ShellScript */,
956D466621879AB65441ECEC /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -271,6 +292,45 @@
shellPath = /bin/sh;
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
};
63BD7651756B53824E56977F /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
showEnvVarsInLog = 0;
};
956D466621879AB65441ECEC /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down
6 changes: 3 additions & 3 deletions desktop_photo_search/fluent_ui/pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'
version: 1.0.0+1

environment:
sdk: ">=2.17.0-0 <3.0.0"
sdk: ">=2.19.2 <3.0.0"

dependencies:
built_collection: ^5.1.1
Expand All @@ -21,7 +21,7 @@ dependencies:
git:
url: https://github.com/google/flutter-desktop-embedding.git
path: plugins/menubar
ref: 12decbe0f592e14e03223f6f2c0c7e0e2dbd70a1
ref: 6c66ad23ee79749f30a8eece542cf54eaf157ed8
provider: ^6.0.2
transparent_image: ^2.0.0
url_launcher: ^6.1.1
Expand All @@ -30,7 +30,7 @@ dependencies:
git:
url: https://github.com/google/flutter-desktop-embedding.git
path: plugins/window_size
ref: 12decbe0f592e14e03223f6f2c0c7e0e2dbd70a1
ref: 6c66ad23ee79749f30a8eece542cf54eaf157ed8

dev_dependencies:
analysis_defaults:
Expand Down
20 changes: 10 additions & 10 deletions desktop_photo_search/material/.metadata
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@
# This file should be version controlled.

version:
revision: 686fe913dc963954b99e62048569cb9ac8e551c8
channel: beta
revision: 9944297138845a94256f1cf37beb88ff9a8e811a
channel: stable

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: linux
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: macos
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
- platform: windows
create_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
base_revision: 686fe913dc963954b99e62048569cb9ac8e551c8
create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a

# User provided section

Expand Down
1 change: 1 addition & 0 deletions desktop_photo_search/material/lib/src/widgets/photo_details.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class _PhotoDetailsState extends State<PhotoDetails> {
Widget build(BuildContext context) {
return Scrollbar(
child: SingleChildScrollView(
primary: true,
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
Expand Down
Loading

0 comments on commit 0a862ea

Please sign in to comment.