-
-
Save marmeladze/d86b050496908295746e853c12c074bd to your computer and use it in GitHub Desktop.
git diff
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig | |
| index c2efd0b..4b81f9b 100644 | |
| --- a/macos/Flutter/Flutter-Debug.xcconfig | |
| +++ b/macos/Flutter/Flutter-Debug.xcconfig | |
| @@ -1 +1,2 @@ | |
| +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" | |
| #include "ephemeral/Flutter-Generated.xcconfig" | |
| diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig | |
| index c2efd0b..5caa9d1 100644 | |
| --- a/macos/Flutter/Flutter-Release.xcconfig | |
| +++ b/macos/Flutter/Flutter-Release.xcconfig | |
| @@ -1 +1,2 @@ | |
| +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" | |
| #include "ephemeral/Flutter-Generated.xcconfig" | |
| diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj | |
| index d11d4da..b05afc9 100644 | |
| --- a/macos/Runner.xcodeproj/project.pbxproj | |
| +++ b/macos/Runner.xcodeproj/project.pbxproj | |
| @@ -27,6 +27,8 @@ | |
| 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 */; }; | |
| + 63AE17D38DA173D293F676E3 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A8C71BFCCEEF9CA42024548 /* Pods_RunnerTests.framework */; }; | |
| + F1C85310436A0D949E6253F9 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 252A4C96A8D44E11E25C0AB9 /* Pods_Runner.framework */; }; | |
| /* End PBXBuildFile section */ | |
| /* Begin PBXContainerItemProxy section */ | |
| @@ -60,11 +62,13 @@ | |
| /* End PBXCopyFilesBuildPhase section */ | |
| /* Begin PBXFileReference section */ | |
| + 1DD6B20E6942F3332A61411E /* 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>"; }; | |
| + 252A4C96A8D44E11E25C0AB9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; | |
| 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; | |
| 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; }; | |
| 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 /* timescape.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "timescape.app"; sourceTree = BUILT_PRODUCTS_DIR; }; | |
| + 33CC10ED2044A3C60003C045 /* timescape.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = timescape.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>"; }; | |
| @@ -76,8 +80,14 @@ | |
| 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 = "<gr | |
| oup>"; }; | |
| 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; }; | |
| + 4F7D8C3F2FC6BC9C95A258E3 /* 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>"; }; | |
| + 5231B8B9CFF5CDB0A43BF9F5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Tar | |
| get Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; }; | |
| + 6A8C71BFCCEEF9CA42024548 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree | |
| = BUILT_PRODUCTS_DIR; }; | |
| 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; }; | |
| + 7B9B5B3C152EFE4E6FAA16F8 /* 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>"; }; | |
| 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; }; | |
| + AB5912FE5F09C7440845B776 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; p | |
| ath = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; }; | |
| + C13BDBEF73B959E3CA2A7961 /* 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>"; }; | |
| /* End PBXFileReference section */ | |
| /* Begin PBXFrameworksBuildPhase section */ | |
| @@ -85,6 +95,7 @@ | |
| isa = PBXFrameworksBuildPhase; | |
| buildActionMask = 2147483647; | |
| files = ( | |
| + 63AE17D38DA173D293F676E3 /* Pods_RunnerTests.framework in Frameworks */, | |
| ); | |
| runOnlyForDeploymentPostprocessing = 0; | |
| }; | |
| @@ -92,6 +103,7 @@ | |
| isa = PBXFrameworksBuildPhase; | |
| buildActionMask = 2147483647; | |
| files = ( | |
| + F1C85310436A0D949E6253F9 /* Pods_Runner.framework in Frameworks */, | |
| ); | |
| runOnlyForDeploymentPostprocessing = 0; | |
| }; | |
| @@ -125,6 +137,7 @@ | |
| 331C80D6294CF71000263BE5 /* RunnerTests */, | |
| 33CC10EE2044A3C60003C045 /* Products */, | |
| D73912EC22F37F3D000D13A0 /* Frameworks */, | |
| + C2AFD632C1B5B80F13930B8B /* Pods */, | |
| ); | |
| sourceTree = "<group>"; | |
| }; | |
| @@ -172,9 +185,25 @@ | |
| path = Runner; | |
| sourceTree = "<group>"; | |
| }; | |
| + C2AFD632C1B5B80F13930B8B /* Pods */ = { | |
| + isa = PBXGroup; | |
| + children = ( | |
| + 5231B8B9CFF5CDB0A43BF9F5 /* Pods-Runner.debug.xcconfig */, | |
| + 1DD6B20E6942F3332A61411E /* Pods-Runner.release.xcconfig */, | |
| + 7B9B5B3C152EFE4E6FAA16F8 /* Pods-Runner.profile.xcconfig */, | |
| + AB5912FE5F09C7440845B776 /* Pods-RunnerTests.debug.xcconfig */, | |
| + C13BDBEF73B959E3CA2A7961 /* Pods-RunnerTests.release.xcconfig */, | |
| + 4F7D8C3F2FC6BC9C95A258E3 /* Pods-RunnerTests.profile.xcconfig */, | |
| + ); | |
| + name = Pods; | |
| + path = Pods; | |
| + sourceTree = "<group>"; | |
| + }; | |
| D73912EC22F37F3D000D13A0 /* Frameworks */ = { | |
| isa = PBXGroup; | |
| children = ( | |
| + 252A4C96A8D44E11E25C0AB9 /* Pods_Runner.framework */, | |
| + 6A8C71BFCCEEF9CA42024548 /* Pods_RunnerTests.framework */, | |
| ); | |
| name = Frameworks; | |
| sourceTree = "<group>"; | |
| @@ -186,6 +215,7 @@ | |
| isa = PBXNativeTarget; | |
| buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; | |
| buildPhases = ( | |
| + D165A5A127F203E56E266180 /* [CP] Check Pods Manifest.lock */, | |
| 331C80D1294CF70F00263BE5 /* Sources */, | |
| 331C80D2294CF70F00263BE5 /* Frameworks */, | |
| 331C80D3294CF70F00263BE5 /* Resources */, | |
| @@ -204,11 +234,13 @@ | |
| isa = PBXNativeTarget; | |
| buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; | |
| buildPhases = ( | |
| + C50B8775856798DBF7035F19 /* [CP] Check Pods Manifest.lock */, | |
| 33CC10E92044A3C60003C045 /* Sources */, | |
| 33CC10EA2044A3C60003C045 /* Frameworks */, | |
| 33CC10EB2044A3C60003C045 /* Resources */, | |
| 33CC110E2044A8840003C045 /* Bundle Framework */, | |
| 3399D490228B24CF009A79C7 /* ShellScript */, | |
| + 75E8D0F58F985FFB34911442 /* [CP] Embed Pods Frameworks */, | |
| ); | |
| buildRules = ( | |
| ); | |
| @@ -329,6 +361,67 @@ | |
| shellPath = /bin/sh; | |
| shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; | |
| }; | |
| + 75E8D0F58F985FFB34911442 /* [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; | |
| + }; | |
| + C50B8775856798DBF7035F19 /* [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; | |
| + }; | |
| + D165A5A127F203E56E266180 /* [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-RunnerTests-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; | |
| + }; | |
| /* End PBXShellScriptBuildPhase section */ | |
| /* Begin PBXSourcesBuildPhase section */ | |
| @@ -380,6 +473,7 @@ | |
| /* Begin XCBuildConfiguration section */ | |
| 331C80DB294CF71000263BE5 /* Debug */ = { | |
| isa = XCBuildConfiguration; | |
| + baseConfigurationReference = AB5912FE5F09C7440845B776 /* Pods-RunnerTests.debug.xcconfig */; | |
| buildSettings = { | |
| BUNDLE_LOADER = "$(TEST_HOST)"; | |
| CURRENT_PROJECT_VERSION = 1; | |
| @@ -394,6 +488,7 @@ | |
| }; | |
| 331C80DC294CF71000263BE5 /* Release */ = { | |
| isa = XCBuildConfiguration; | |
| + baseConfigurationReference = C13BDBEF73B959E3CA2A7961 /* Pods-RunnerTests.release.xcconfig */; | |
| buildSettings = { | |
| BUNDLE_LOADER = "$(TEST_HOST)"; | |
| CURRENT_PROJECT_VERSION = 1; | |
| @@ -408,6 +503,7 @@ | |
| }; | |
| 331C80DD294CF71000263BE5 /* Profile */ = { | |
| isa = XCBuildConfiguration; | |
| + baseConfigurationReference = 4F7D8C3F2FC6BC9C95A258E3 /* Pods-RunnerTests.profile.xcconfig */; | |
| buildSettings = { | |
| BUNDLE_LOADER = "$(TEST_HOST)"; | |
| CURRENT_PROJECT_VERSION = 1; | |
| diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata | |
| index 1d526a1..21a3cc1 100644 | |
| --- a/macos/Runner.xcworkspace/contents.xcworkspacedata | |
| +++ b/macos/Runner.xcworkspace/contents.xcworkspacedata | |
| @@ -4,4 +4,7 @@ | |
| <FileRef | |
| location = "group:Runner.xcodeproj"> | |
| </FileRef> | |
| + <FileRef | |
| + location = "group:Pods/Pods.xcodeproj"> | |
| + </FileRef> | |
| </Workspace> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment