Skip to content

Commit 87dbbfd

Browse files
committed
回滚了ios/mac文件夹下的改动以及pubspec.lock
1 parent 6e6c207 commit 87dbbfd

File tree

9 files changed

+97
-277
lines changed

9 files changed

+97
-277
lines changed

ios/Flutter/Debug.xcconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
21
#include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
21
#include "Generated.xcconfig"

ios/Podfile

Lines changed: 0 additions & 43 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
21
#include "ephemeral/Flutter-Generated.xcconfig"
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
21
#include "ephemeral/Flutter-Generated.xcconfig"

macos/Podfile

Lines changed: 0 additions & 42 deletions
This file was deleted.

macos/Runner.xcodeproj/project.pbxproj

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2828
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
2929
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
30-
3B7CF53B63E844C78B4B6064 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7294F632E961E7746F783445 /* Pods_Runner.framework */; };
31-
C75501BBC69A2D43AC87E7E8 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEB4A74AD1B7E183A8B17F77 /* Pods_RunnerTests.framework */; };
3230
/* End PBXBuildFile section */
3331

3432
/* Begin PBXContainerItemProxy section */
@@ -65,7 +63,6 @@
6563
08D6925B2E3A29C100F22E48 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/MainMenu.strings"; sourceTree = "<group>"; };
6664
08D6925D2E3A29CC00F22E48 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = "<group>"; };
6765
08D6925F2E3A29CE00F22E48 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/MainMenu.strings"; sourceTree = "<group>"; };
68-
24B592CDA354E3DEF399E72C /* 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>"; };
6966
331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
7067
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
7168
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
@@ -82,31 +79,22 @@
8279
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
8380
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
8481
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
85-
4FB7018A93D7BECDFBBA3443 /* 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>"; };
86-
648A135E6024768F33E8295D /* 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>"; };
87-
7294F632E961E7746F783445 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8882
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
89-
92E472F33E8B39D15484E644 /* 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>"; };
9083
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
91-
CEB4A74AD1B7E183A8B17F77 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
92-
D05116BD1646AC74251C3216 /* 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>"; };
93-
D4B66AE85A9BCE9EDE7E74CF /* 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>"; };
9484
/* End PBXFileReference section */
9585

9686
/* Begin PBXFrameworksBuildPhase section */
9787
331C80D2294CF70F00263BE5 /* Frameworks */ = {
9888
isa = PBXFrameworksBuildPhase;
9989
buildActionMask = 2147483647;
10090
files = (
101-
C75501BBC69A2D43AC87E7E8 /* Pods_RunnerTests.framework in Frameworks */,
10291
);
10392
runOnlyForDeploymentPostprocessing = 0;
10493
};
10594
33CC10EA2044A3C60003C045 /* Frameworks */ = {
10695
isa = PBXFrameworksBuildPhase;
10796
buildActionMask = 2147483647;
10897
files = (
109-
3B7CF53B63E844C78B4B6064 /* Pods_Runner.framework in Frameworks */,
11098
);
11199
runOnlyForDeploymentPostprocessing = 0;
112100
};
@@ -140,7 +128,6 @@
140128
331C80D6294CF71000263BE5 /* RunnerTests */,
141129
33CC10EE2044A3C60003C045 /* Products */,
142130
D73912EC22F37F3D000D13A0 /* Frameworks */,
143-
EAD83B756B257F043F7F257A /* Pods */,
144131
);
145132
sourceTree = "<group>";
146133
};
@@ -191,34 +178,17 @@
191178
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
192179
isa = PBXGroup;
193180
children = (
194-
7294F632E961E7746F783445 /* Pods_Runner.framework */,
195-
CEB4A74AD1B7E183A8B17F77 /* Pods_RunnerTests.framework */,
196181
);
197182
name = Frameworks;
198183
sourceTree = "<group>";
199184
};
200-
EAD83B756B257F043F7F257A /* Pods */ = {
201-
isa = PBXGroup;
202-
children = (
203-
D05116BD1646AC74251C3216 /* Pods-Runner.debug.xcconfig */,
204-
648A135E6024768F33E8295D /* Pods-Runner.release.xcconfig */,
205-
D4B66AE85A9BCE9EDE7E74CF /* Pods-Runner.profile.xcconfig */,
206-
92E472F33E8B39D15484E644 /* Pods-RunnerTests.debug.xcconfig */,
207-
4FB7018A93D7BECDFBBA3443 /* Pods-RunnerTests.release.xcconfig */,
208-
24B592CDA354E3DEF399E72C /* Pods-RunnerTests.profile.xcconfig */,
209-
);
210-
name = Pods;
211-
path = Pods;
212-
sourceTree = "<group>";
213-
};
214185
/* End PBXGroup section */
215186

216187
/* Begin PBXNativeTarget section */
217188
331C80D4294CF70F00263BE5 /* RunnerTests */ = {
218189
isa = PBXNativeTarget;
219190
buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
220191
buildPhases = (
221-
2AEE9FBB114350F884E055D1 /* [CP] Check Pods Manifest.lock */,
222192
331C80D1294CF70F00263BE5 /* Sources */,
223193
331C80D2294CF70F00263BE5 /* Frameworks */,
224194
331C80D3294CF70F00263BE5 /* Resources */,
@@ -237,13 +207,11 @@
237207
isa = PBXNativeTarget;
238208
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
239209
buildPhases = (
240-
DA151A4FD615A43CEFDCB223 /* [CP] Check Pods Manifest.lock */,
241210
33CC10E92044A3C60003C045 /* Sources */,
242211
33CC10EA2044A3C60003C045 /* Frameworks */,
243212
33CC10EB2044A3C60003C045 /* Resources */,
244213
33CC110E2044A8840003C045 /* Bundle Framework */,
245214
3399D490228B24CF009A79C7 /* ShellScript */,
246-
0EA2945724B979E5FFD820DC /* [CP] Embed Pods Frameworks */,
247215
);
248216
buildRules = (
249217
);
@@ -328,45 +296,6 @@
328296
/* End PBXResourcesBuildPhase section */
329297

330298
/* Begin PBXShellScriptBuildPhase section */
331-
0EA2945724B979E5FFD820DC /* [CP] Embed Pods Frameworks */ = {
332-
isa = PBXShellScriptBuildPhase;
333-
buildActionMask = 2147483647;
334-
files = (
335-
);
336-
inputFileListPaths = (
337-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
338-
);
339-
name = "[CP] Embed Pods Frameworks";
340-
outputFileListPaths = (
341-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
342-
);
343-
runOnlyForDeploymentPostprocessing = 0;
344-
shellPath = /bin/sh;
345-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
346-
showEnvVarsInLog = 0;
347-
};
348-
2AEE9FBB114350F884E055D1 /* [CP] Check Pods Manifest.lock */ = {
349-
isa = PBXShellScriptBuildPhase;
350-
buildActionMask = 2147483647;
351-
files = (
352-
);
353-
inputFileListPaths = (
354-
);
355-
inputPaths = (
356-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
357-
"${PODS_ROOT}/Manifest.lock",
358-
);
359-
name = "[CP] Check Pods Manifest.lock";
360-
outputFileListPaths = (
361-
);
362-
outputPaths = (
363-
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
364-
);
365-
runOnlyForDeploymentPostprocessing = 0;
366-
shellPath = /bin/sh;
367-
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";
368-
showEnvVarsInLog = 0;
369-
};
370299
3399D490228B24CF009A79C7 /* ShellScript */ = {
371300
isa = PBXShellScriptBuildPhase;
372301
alwaysOutOfDate = 1;
@@ -405,28 +334,6 @@
405334
shellPath = /bin/sh;
406335
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
407336
};
408-
DA151A4FD615A43CEFDCB223 /* [CP] Check Pods Manifest.lock */ = {
409-
isa = PBXShellScriptBuildPhase;
410-
buildActionMask = 2147483647;
411-
files = (
412-
);
413-
inputFileListPaths = (
414-
);
415-
inputPaths = (
416-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
417-
"${PODS_ROOT}/Manifest.lock",
418-
);
419-
name = "[CP] Check Pods Manifest.lock";
420-
outputFileListPaths = (
421-
);
422-
outputPaths = (
423-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
424-
);
425-
runOnlyForDeploymentPostprocessing = 0;
426-
shellPath = /bin/sh;
427-
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";
428-
showEnvVarsInLog = 0;
429-
};
430337
/* End PBXShellScriptBuildPhase section */
431338

432339
/* Begin PBXSourcesBuildPhase section */
@@ -481,7 +388,6 @@
481388
/* Begin XCBuildConfiguration section */
482389
331C80DB294CF71000263BE5 /* Debug */ = {
483390
isa = XCBuildConfiguration;
484-
baseConfigurationReference = 92E472F33E8B39D15484E644 /* Pods-RunnerTests.debug.xcconfig */;
485391
buildSettings = {
486392
BUNDLE_LOADER = "$(TEST_HOST)";
487393
CURRENT_PROJECT_VERSION = 1;
@@ -496,7 +402,6 @@
496402
};
497403
331C80DC294CF71000263BE5 /* Release */ = {
498404
isa = XCBuildConfiguration;
499-
baseConfigurationReference = 4FB7018A93D7BECDFBBA3443 /* Pods-RunnerTests.release.xcconfig */;
500405
buildSettings = {
501406
BUNDLE_LOADER = "$(TEST_HOST)";
502407
CURRENT_PROJECT_VERSION = 1;
@@ -511,7 +416,6 @@
511416
};
512417
331C80DD294CF71000263BE5 /* Profile */ = {
513418
isa = XCBuildConfiguration;
514-
baseConfigurationReference = 24B592CDA354E3DEF399E72C /* Pods-RunnerTests.profile.xcconfig */;
515419
buildSettings = {
516420
BUNDLE_LOADER = "$(TEST_HOST)";
517421
CURRENT_PROJECT_VERSION = 1;

macos/Runner.xcworkspace/contents.xcworkspacedata

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

0 commit comments

Comments
 (0)