From ffde5821a2c40f5e7cd82c45f47d40d046d89dfa Mon Sep 17 00:00:00 2001 From: Eike Reinel Date: Fri, 15 Nov 2019 22:08:32 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Changed=20xcodeproj=20compatibility=20setti?= =?UTF-8?q?ng=20to=20"Xcode=2011"=20and=20added=20build=20scheme=20fu?= =?UTF-8?q?=CC=88r=20macOS=20manually=20to=20fix=20issue=20#75=20in=20naki?= =?UTF-8?q?ostudio/EasyPeasy=20(Carthage=20macOS=20support=20#75)=20see=20?= =?UTF-8?q?https://github.com/nakiostudio/EasyPeasy/issues/75?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contents.xcworkspacedata | 7 ++ .../xcschemes/EasyPeasy-iOS.xcscheme | 24 +++---- .../xcschemes/EasyPeasy-macOS.xcscheme | 67 +++++++++++++++++++ 3 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/EasyPeasy-macOS.xcscheme diff --git a/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/EasyPeasy-iOS.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/EasyPeasy-iOS.xcscheme index 5e22fa0..08756b3 100644 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/EasyPeasy-iOS.xcscheme +++ b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/EasyPeasy-iOS.xcscheme @@ -26,9 +26,17 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" shouldUseLaunchSchemeArgsEnv = "YES" codeCoverageEnabled = "YES"> + + + + @@ -45,23 +53,11 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + From 4062eeaa517b6d1934e33161be76b86491be3512 Mon Sep 17 00:00:00 2001 From: Eike Reinel Date: Fri, 15 Nov 2019 22:45:45 +0100 Subject: [PATCH 2/2] macOS 10.10 -> 10.15 --- Example/Pods/Pods.xcodeproj/project.pbxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index b9bf66f..04710eb 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -800,7 +800,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.3; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; ONLY_ACTIVE_ARCH = YES; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; @@ -832,7 +832,7 @@ INFOPLIST_FILE = "Target Support Files/EasyPeasy-macOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; MODULEMAP_FILE = "Target Support Files/EasyPeasy-macOS/EasyPeasy-macOS.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = EasyPeasy; @@ -905,7 +905,7 @@ INFOPLIST_FILE = "Target Support Files/EasyPeasy-macOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; MODULEMAP_FILE = "Target Support Files/EasyPeasy-macOS/EasyPeasy-macOS.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = EasyPeasy; @@ -1018,7 +1018,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; MODULEMAP_FILE = "Target Support Files/Pods-Demo macOS/Pods-Demo macOS.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; @@ -1057,7 +1057,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; MODULEMAP_FILE = "Target Support Files/Pods-Demo macOS/Pods-Demo macOS.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; @@ -1171,7 +1171,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; MODULEMAP_FILE = "Target Support Files/Pods-Tests macOS/Pods-Tests macOS.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; @@ -1233,7 +1233,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.3; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; SYMROOT = "${SRCROOT}/../build"; @@ -1263,7 +1263,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.15; MODULEMAP_FILE = "Target Support Files/Pods-Tests macOS/Pods-Tests macOS.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = "";