From 19576fd5ca8292cb834ed8652d7ddd7a459f3611 Mon Sep 17 00:00:00 2001 From: Jesse Squires Date: Sun, 3 May 2015 17:53:31 -0700 Subject: [PATCH] fix delpoy targets and travis script --- .travis.yml | 2 +- Example/Example.xcodeproj/project.pbxproj | 14 ++++++++------ .../JSQSystemSoundPlayer.xcodeproj/project.pbxproj | 11 +++++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15614c4..8a9a933 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,5 @@ before_install: script: - xctool clean build -project Example/Example.xcodeproj -scheme Example-iOS -sdk iphonesimulator8.1 ONLY_ACTIVE_ARCH=NO - xctool clean build -project Example/Example.xcodeproj -scheme Example-OSX ONLY_ACTIVE_ARCH=NO -- xcodebuild clean build -project JSQSystemSoundPlayer/JSQSystemSoundPlayer.xcodeproj -scheme JSQSystemSoundPlayer-OSX -sdk iphonesimulator8.1 ONLY_ACTIVE_ARCH=NO +- xctool clean build -project JSQSystemSoundPlayer/JSQSystemSoundPlayer.xcodeproj -scheme JSQSystemSoundPlayer-OSX -sdk iphonesimulator8.1 ONLY_ACTIVE_ARCH=NO - xcodebuild clean build test -project JSQSystemSoundPlayer/JSQSystemSoundPlayer.xcodeproj -scheme JSQSystemSoundPlayer-iOS -sdk iphonesimulator8.1 ONLY_ACTIVE_ARCH=NO diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index d3a53fa..0cfe399 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -472,8 +472,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; - MACOSX_DEPLOYMENT_TARGET = 10.10; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.7; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -511,8 +511,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; - MACOSX_DEPLOYMENT_TARGET = 10.10; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.7; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -525,6 +525,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = Example/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = SoundPlayer; }; @@ -535,6 +536,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = Example/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = SoundPlayer; }; @@ -553,7 +555,7 @@ ); INFOPLIST_FILE = "Example-OSX/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; @@ -567,7 +569,7 @@ COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = "Example-OSX/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; diff --git a/JSQSystemSoundPlayer/JSQSystemSoundPlayer.xcodeproj/project.pbxproj b/JSQSystemSoundPlayer/JSQSystemSoundPlayer.xcodeproj/project.pbxproj index 5c5cc3d..bc02522 100644 --- a/JSQSystemSoundPlayer/JSQSystemSoundPlayer.xcodeproj/project.pbxproj +++ b/JSQSystemSoundPlayer/JSQSystemSoundPlayer.xcodeproj/project.pbxproj @@ -346,7 +346,7 @@ INFOPLIST_FILE = "JSQSystemSoundPlayer-OSX/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.7; PRODUCT_NAME = JSQSystemSoundPlayer; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -365,7 +365,7 @@ INFOPLIST_FILE = "JSQSystemSoundPlayer-OSX/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.7; PRODUCT_NAME = JSQSystemSoundPlayer; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -409,7 +409,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.7; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -450,7 +451,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.7; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -530,6 +532,7 @@ 884DF6781AF6E96700D97D16 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 8892FA981AF6E4DA00F2D347 /* Build configuration list for PBXProject "JSQSystemSoundPlayer" */ = { isa = XCConfigurationList;