Skip to content

Commit 211c5a1

Browse files
matthew-carrollweb-flow
matthew-carroll
authored and
web-flow
committed
[SuperEditor] - Update goldens to render with latest Flutter version, fix lint errors in super_keyboard, fix build error with Quill clone (#3031)
1 parent 9de6922 commit 211c5a1

235 files changed

Lines changed: 149 additions & 96 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.

‎super_clones/quill/macos/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :osx, '10.14'
1+
platform :osx, '10.15'
22

33
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
44
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎super_clones/quill/macos/Podfile.lock‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
PODS:
22
- FlutterMacOS (1.0.0)
3-
- url_launcher_macos (0.0.1):
4-
- FlutterMacOS
53

64
DEPENDENCIES:
75
- FlutterMacOS (from `Flutter/ephemeral`)
8-
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
96

107
EXTERNAL SOURCES:
118
FlutterMacOS:
129
:path: Flutter/ephemeral
13-
url_launcher_macos:
14-
:path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
1510

1611
SPEC CHECKSUMS:
17-
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
18-
url_launcher_macos: de10e46d8d8b9e3a7b8a133e8de92b104379f05e
12+
FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
1913

20-
PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
14+
PODFILE CHECKSUM: 9ebaf0ce3d369aaa26a9ea0e159195ed94724cf3
2115

2216
COCOAPODS: 1.16.2

‎super_clones/quill/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2929
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
3030
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
31+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
3132
B2581CDBAD665B1CFB1CE92D /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AC64B853DA66EBC8DBBCB1C /* Pods_RunnerTests.framework */; };
3233
/* End PBXBuildFile section */
3334

@@ -83,6 +84,7 @@
8384
4AC64B853DA66EBC8DBBCB1C /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8485
65C8695AB1FA0A06BB1F1E7E /* 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>"; };
8586
6828AFA0C502C2FAB178B22E /* 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+
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
8688
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
8789
893BFFAE5C4C372A2CA82DF2 /* 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>"; };
8890
8E0092687091B38D84CD0477 /* 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>"; };
@@ -103,6 +105,7 @@
103105
isa = PBXFrameworksBuildPhase;
104106
buildActionMask = 2147483647;
105107
files = (
108+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
106109
18F21EFB5E09EFC425F2A67F /* Pods_Runner.framework in Frameworks */,
107110
);
108111
runOnlyForDeploymentPostprocessing = 0;
@@ -164,6 +167,7 @@
164167
33CEB47122A05771004F2AC0 /* Flutter */ = {
165168
isa = PBXGroup;
166169
children = (
170+
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
167171
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */,
168172
33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */,
169173
33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */,
@@ -240,14 +244,16 @@
240244
33CC10EB2044A3C60003C045 /* Resources */,
241245
33CC110E2044A8840003C045 /* Bundle Framework */,
242246
3399D490228B24CF009A79C7 /* ShellScript */,
243-
B12C2D7B3AD01B1DBAFF03C5 /* [CP] Embed Pods Frameworks */,
244247
);
245248
buildRules = (
246249
);
247250
dependencies = (
248251
33CC11202044C79F0003C045 /* PBXTargetDependency */,
249252
);
250253
name = Runner;
254+
packageProductDependencies = (
255+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
256+
);
251257
productName = Runner;
252258
productReference = 33CC10ED2044A3C60003C045 /* feather.app */;
253259
productType = "com.apple.product-type.application";
@@ -292,6 +298,9 @@
292298
Base,
293299
);
294300
mainGroup = 33CC10E42044A3C60003C045;
301+
packageReferences = (
302+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
303+
);
295304
productRefGroup = 33CC10EE2044A3C60003C045 /* Products */;
296305
projectDirPath = "";
297306
projectRoot = "";
@@ -383,23 +392,6 @@
383392
shellPath = /bin/sh;
384393
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
385394
};
386-
B12C2D7B3AD01B1DBAFF03C5 /* [CP] Embed Pods Frameworks */ = {
387-
isa = PBXShellScriptBuildPhase;
388-
buildActionMask = 2147483647;
389-
files = (
390-
);
391-
inputFileListPaths = (
392-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
393-
);
394-
name = "[CP] Embed Pods Frameworks";
395-
outputFileListPaths = (
396-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
397-
);
398-
runOnlyForDeploymentPostprocessing = 0;
399-
shellPath = /bin/sh;
400-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
401-
showEnvVarsInLog = 0;
402-
};
403395
FF9B26D6B7C0FA75BE0C8577 /* [CP] Check Pods Manifest.lock */ = {
404396
isa = PBXShellScriptBuildPhase;
405397
buildActionMask = 2147483647;
@@ -557,7 +549,7 @@
557549
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
558550
GCC_WARN_UNUSED_FUNCTION = YES;
559551
GCC_WARN_UNUSED_VARIABLE = YES;
560-
MACOSX_DEPLOYMENT_TARGET = 10.14;
552+
MACOSX_DEPLOYMENT_TARGET = 10.15;
561553
MTL_ENABLE_DEBUG_INFO = NO;
562554
SDKROOT = macosx;
563555
SWIFT_COMPILATION_MODE = wholemodule;
@@ -639,7 +631,7 @@
639631
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
640632
GCC_WARN_UNUSED_FUNCTION = YES;
641633
GCC_WARN_UNUSED_VARIABLE = YES;
642-
MACOSX_DEPLOYMENT_TARGET = 10.14;
634+
MACOSX_DEPLOYMENT_TARGET = 10.15;
643635
MTL_ENABLE_DEBUG_INFO = YES;
644636
ONLY_ACTIVE_ARCH = YES;
645637
SDKROOT = macosx;
@@ -689,7 +681,7 @@
689681
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
690682
GCC_WARN_UNUSED_FUNCTION = YES;
691683
GCC_WARN_UNUSED_VARIABLE = YES;
692-
MACOSX_DEPLOYMENT_TARGET = 10.14;
684+
MACOSX_DEPLOYMENT_TARGET = 10.15;
693685
MTL_ENABLE_DEBUG_INFO = NO;
694686
SDKROOT = macosx;
695687
SWIFT_COMPILATION_MODE = wholemodule;
@@ -796,6 +788,20 @@
796788
defaultConfigurationName = Release;
797789
};
798790
/* End XCConfigurationList section */
791+
792+
/* Begin XCLocalSwiftPackageReference section */
793+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
794+
isa = XCLocalSwiftPackageReference;
795+
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
796+
};
797+
/* End XCLocalSwiftPackageReference section */
798+
799+
/* Begin XCSwiftPackageProductDependency section */
800+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
801+
isa = XCSwiftPackageProductDependency;
802+
productName = FlutterGeneratedPluginSwiftPackage;
803+
};
804+
/* End XCSwiftPackageProductDependency section */
799805
};
800806
rootObject = 33CC10E52044A3C60003C045 /* Project object */;
801807
}

‎super_clones/quill/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<PreActions>
9+
<ExecutionAction
10+
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11+
<ActionContent
12+
title = "Run Prepare Flutter Framework Script"
13+
scriptText = "&quot;$FLUTTER_ROOT&quot;/packages/flutter_tools/bin/macos_assemble.sh prepare&#10;">
14+
<EnvironmentBuildable>
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
18+
BuildableName = "feather.app"
19+
BlueprintName = "Runner"
20+
ReferencedContainer = "container:Runner.xcodeproj">
21+
</BuildableReference>
22+
</EnvironmentBuildable>
23+
</ActionContent>
24+
</ExecutionAction>
25+
</PreActions>
826
<BuildActionEntries>
927
<BuildActionEntry
1028
buildForTesting = "YES"
@@ -59,6 +77,7 @@
5977
ignoresPersistentStateOnLaunch = "NO"
6078
debugDocumentVersioning = "YES"
6179
debugServiceExtension = "internal"
80+
enableGPUValidationMode = "1"
6281
allowLocationSimulation = "YES">
6382
<BuildableProductRunnable
6483
runnableDebuggingMode = "0">

0 commit comments

Comments
 (0)