From 53e4ea21061287172d5d05ba2bd7a058654335ae Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Mon, 2 Apr 2018 20:00:00 -0600 Subject: [PATCH 01/12] =?UTF-8?q?=F0=9F=9B=A0=20Apply=20Xcode=209.3=20reco?= =?UTF-8?q?mmended=20settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mas-cli.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../xcshareddata/xcschemes/mas-cli Debug.xcscheme | 8 +++----- .../xcshareddata/xcschemes/mas-cli Release.xcscheme | 4 +--- 4 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 mas-cli.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index 6b6dac277..9c42b6557 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -378,7 +378,7 @@ attributes = { LastSwiftMigration = 0730; LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Andrew Naylor"; TargetAttributes = { ED031A771B5127C00097692E = { @@ -509,12 +509,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -572,12 +574,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; diff --git a/mas-cli.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mas-cli.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/mas-cli.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/mas-cli.xcodeproj/xcshareddata/xcschemes/mas-cli Debug.xcscheme b/mas-cli.xcodeproj/xcshareddata/xcschemes/mas-cli Debug.xcscheme index 155305474..14d43d229 100644 --- a/mas-cli.xcodeproj/xcshareddata/xcschemes/mas-cli Debug.xcscheme +++ b/mas-cli.xcodeproj/xcshareddata/xcschemes/mas-cli Debug.xcscheme @@ -1,6 +1,6 @@ + codeCoverageEnabled = "YES" + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -57,7 +56,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "1" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/mas-cli.xcodeproj/xcshareddata/xcschemes/mas-cli Release.xcscheme b/mas-cli.xcodeproj/xcshareddata/xcschemes/mas-cli Release.xcscheme index 5afb971d8..d0dd1a3d9 100644 --- a/mas-cli.xcodeproj/xcshareddata/xcschemes/mas-cli Release.xcscheme +++ b/mas-cli.xcodeproj/xcshareddata/xcschemes/mas-cli Release.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 3 Apr 2018 19:30:03 -0600 Subject: [PATCH 02/12] =?UTF-8?q?=F0=9F=91=B7=F0=9F=8F=BB=E2=80=8D?= =?UTF-8?q?=E2=99=80=EF=B8=8F=20Switch=20osx=5Fimage=20to=20xcode9.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b573b2955..af0a416f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,14 @@ +# +# .travis.yml +# mas-cli +# +# https://travis-ci.org/mas-cli/mas +# https://docs.travis-ci.com/user/reference/osx/ +# + language: objective-c xcode_sdk: macosx10.13 -osx_image: xcode9.2 +osx_image: xcode9.3 env: global: From aa5990651f9679c8d303bd753f33fb442d27c280 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Tue, 3 Apr 2018 19:30:48 -0600 Subject: [PATCH 03/12] =?UTF-8?q?=F0=9F=9B=A0=20Convert=20project=20format?= =?UTF-8?q?=20to=209.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mas-cli.xcodeproj/project.pbxproj | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index 9c42b6557..6635f0ceb 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 48; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ @@ -392,7 +392,7 @@ }; }; buildConfigurationList = ED031A731B5127C00097692E /* Build configuration list for PBXProject "mas-cli" */; - compatibilityVersion = "Xcode 8.0"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -556,6 +556,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; + SWIFT_COMPILATION_MODE = singlefile; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; @@ -635,8 +636,9 @@ CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build"; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OBJC_BRIDGING_HEADER = "App/mas-cli-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 4.0; }; name = Release; @@ -655,7 +657,11 @@ COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = AppTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli.tests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -679,12 +685,17 @@ COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = AppTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli.tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 4.0; }; name = Release; From 9a0d2163be9ba04f8170ddfec8afea59aea85ba6 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Tue, 3 Apr 2018 19:31:42 -0600 Subject: [PATCH 04/12] =?UTF-8?q?=F0=9F=9B=A0=20Enable=20new=20build=20sys?= =?UTF-8?q?tem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 mas-cli.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/mas-cli.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mas-cli.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..3ddf867a1 --- /dev/null +++ b/mas-cli.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + BuildSystemType + Latest + + From 43d43fb639cab71c9c4a465a4841da21aca52edb Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Tue, 3 Apr 2018 19:34:45 -0600 Subject: [PATCH 05/12] =?UTF-8?q?=F0=9F=9A=A8=20Replace=20deprecated=20fla?= =?UTF-8?q?tMap=20with=20compactMap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'flatMap' is deprecated: Please use compactMap(_:) for the case where closure returns an optional value --- App/Commands/Install.swift | 2 +- App/Commands/Lucky.swift | 2 +- App/Commands/Upgrade.swift | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/App/Commands/Install.swift b/App/Commands/Install.swift index 5d3591e4a..553253287 100644 --- a/App/Commands/Install.swift +++ b/App/Commands/Install.swift @@ -13,7 +13,7 @@ struct InstallCommand: CommandProtocol { func run(_ options: Options) -> Result<(), MASError> { // Try to download applications with given identifiers and collect results - let downloadResults = options.appIds.flatMap { (appId) -> MASError? in + let downloadResults = options.appIds.compactMap { (appId) -> MASError? in if let product = installedApp(appId) , !options.forceInstall { printWarning("\(product.appName) is already installed") return nil diff --git a/App/Commands/Lucky.swift b/App/Commands/Lucky.swift index b2bc314c6..c139019d3 100644 --- a/App/Commands/Lucky.swift +++ b/App/Commands/Lucky.swift @@ -32,7 +32,7 @@ struct LuckyCommand: CommandProtocol { fileprivate func install(_ appId: UInt64, options: Options) -> Result<(), MASError> { // Try to download applications with given identifiers and collect results - let downloadResults = [appId].flatMap { (appId) -> MASError? in + let downloadResults = [appId].compactMap { (appId) -> MASError? in if let product = installedApp(appId) , !options.forceInstall { printWarning("\(product.appName) is already installed") return nil diff --git a/App/Commands/Upgrade.swift b/App/Commands/Upgrade.swift index 7c3693db1..75070438b 100644 --- a/App/Commands/Upgrade.swift +++ b/App/Commands/Upgrade.swift @@ -23,7 +23,7 @@ struct UpgradeCommand: CommandProtocol { let appIds: [UInt64] - appIds = apps.flatMap { + appIds = apps.compactMap { if let appId = UInt64($0) { return appId } @@ -35,7 +35,7 @@ struct UpgradeCommand: CommandProtocol { // check each of those for updates - updates = appIds.flatMap { + updates = appIds.compactMap { updateController?.availableUpdate(withItemIdentifier: $0) } @@ -56,7 +56,7 @@ struct UpgradeCommand: CommandProtocol { print("Upgrading \(updates.count) outdated application\(updates.count > 1 ? "s" : ""):") print(updates.map({ "\($0.title) (\($0.bundleVersion))" }).joined(separator: ", ")) - let updateResults = updates.flatMap { + let updateResults = updates.compactMap { download($0.itemIdentifier.uint64Value) } From 138e905cffd1002c41c9388a0b7a3ebf5965b2f0 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Tue, 3 Apr 2018 19:36:58 -0600 Subject: [PATCH 06/12] =?UTF-8?q?=F0=9F=94=A7=20Set=20swift=20version=20at?= =?UTF-8?q?=20project=20level?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mas-cli.xcodeproj/project.pbxproj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index 6635f0ceb..95167e635 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -558,7 +558,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; SWIFT_COMPILATION_MODE = singlefile; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -615,7 +615,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -626,7 +626,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "App/mas-cli-Bridging-Header.h"; - SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -639,7 +638,6 @@ SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OBJC_BRIDGING_HEADER = "App/mas-cli-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.0; }; name = Release; }; From 5de6dc13032c7bc1e7496210577775ab67dbf806 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Tue, 3 Apr 2018 19:38:37 -0600 Subject: [PATCH 07/12] =?UTF-8?q?=F0=9F=9B=A0=20Add=20workspace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mas-cli.xcworkspace/contents.xcworkspacedata | 7 +++++++ mas-cli.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++++++++ 3 files changed, 23 insertions(+) create mode 100644 mas-cli.xcworkspace/contents.xcworkspacedata create mode 100644 mas-cli.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 mas-cli.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/mas-cli.xcworkspace/contents.xcworkspacedata b/mas-cli.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..239c1e819 --- /dev/null +++ b/mas-cli.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/mas-cli.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mas-cli.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/mas-cli.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/mas-cli.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/mas-cli.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..3ddf867a1 --- /dev/null +++ b/mas-cli.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + BuildSystemType + Latest + + From dbdc40ae090e9eeea34827998eb88e13aabff0f6 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Tue, 3 Apr 2018 19:50:56 -0600 Subject: [PATCH 08/12] =?UTF-8?q?=F0=9F=93=9D=20Update=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b7492144..1fc0bab83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +- 🛠 Xcode 9.3 #141 - 👷🏻‍♀️⚠️ Re-enable Danger #137 - ✨ Add price to search #62 From 7dcf396c44620e3a78bcc1924526d2df84e4afea Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Tue, 3 Apr 2018 19:56:05 -0600 Subject: [PATCH 09/12] =?UTF-8?q?=E2=AC=87=EF=B8=8F=20No,=20it's=20xcode9.?= =?UTF-8?q?3beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af0a416f4..7d6174041 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ language: objective-c xcode_sdk: macosx10.13 -osx_image: xcode9.3 +osx_image: xcode9.3beta env: global: From b7338eb3cddfcbba031405f3e5f781cba602cf93 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Tue, 3 Apr 2018 20:03:57 -0600 Subject: [PATCH 10/12] =?UTF-8?q?=E2=AC=87=EF=B8=8F=20Back=20to=20Xcode=20?= =?UTF-8?q?8.0=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since 9.3 requires 10.13.2 --- mas-cli.xcodeproj/project.pbxproj | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index 95167e635..92370e3c7 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 48; objects = { /* Begin PBXBuildFile section */ @@ -392,7 +392,7 @@ }; }; buildConfigurationList = ED031A731B5127C00097692E /* Build configuration list for PBXProject "mas-cli" */; - compatibilityVersion = "Xcode 9.3"; + compatibilityVersion = "Xcode 8.0"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -556,7 +556,6 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; - SWIFT_COMPILATION_MODE = singlefile; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; @@ -635,9 +634,8 @@ CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build"; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OBJC_BRIDGING_HEADER = "App/mas-cli-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; }; name = Release; }; @@ -655,11 +653,7 @@ COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = AppTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/../Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli.tests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -683,17 +677,12 @@ COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = AppTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/../Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli.tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 4.0; }; name = Release; From dd461d59c6501208e7a4d62a21ddd593d0868f53 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Wed, 4 Jul 2018 12:56:09 -0600 Subject: [PATCH 11/12] =?UTF-8?q?=E2=AC=86=EF=B8=8F=F0=9F=91=B7?= =?UTF-8?q?=F0=9F=8F=BB=E2=80=8D=E2=99=80=EF=B8=8F=20Update=20osx=5Fimage?= =?UTF-8?q?=20to=20xcode9.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7d6174041..af0a416f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ language: objective-c xcode_sdk: macosx10.13 -osx_image: xcode9.3beta +osx_image: xcode9.3 env: global: From 1ba60aeae8256a182a3902c26e990fe7d8e3e7cc Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Wed, 4 Jul 2018 13:11:47 -0600 Subject: [PATCH 12/12] =?UTF-8?q?=F0=9F=99=88=20Ignore=20Quick=20and=20Nim?= =?UTF-8?q?ble=20dirs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ mas-cli.xcodeproj/project.pbxproj | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 00f11e515..14e22d5be 100644 --- a/.gitignore +++ b/.gitignore @@ -65,6 +65,8 @@ Seeds/**/Tests/ !Seeds/Commandant/Source/*.swift # Result !Seeds/Result/Result/*.swift +Seeds/Quick +Seeds/Nimble ## https://github.com/github/gitignore/blob/master/Global/OSX.gitignore .DS_Store diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index 92370e3c7..00ddb8de2 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -168,6 +168,8 @@ isa = PBXGroup; children = ( A49C8EB621015CD588C621FD /* Commandant */, + A96B40B5852A4F029AFDA669 /* Nimble */, + 6EB4B681BB79E32622860164 /* Quick */, 6569B225928F21A4A639BB22 /* Result */, ); name = Seeds; @@ -182,6 +184,13 @@ name = Result; sourceTree = ""; }; + 6EB4B681BB79E32622860164 /* Quick */ = { + isa = PBXGroup; + children = ( + ); + name = Quick; + sourceTree = ""; + }; A49C8EB621015CD588C621FD /* Commandant */ = { isa = PBXGroup; children = ( @@ -198,6 +207,13 @@ name = Commandant; sourceTree = ""; }; + A96B40B5852A4F029AFDA669 /* Nimble */ = { + isa = PBXGroup; + children = ( + ); + name = Nimble; + sourceTree = ""; + }; ED031A6F1B5127C00097692E = { isa = PBXGroup; children = ( @@ -438,7 +454,6 @@ 4913269B1F48921D0010EB86 /* CKSoftwareMap+AppLookup.swift in Sources */, 0C47E694564FCB59996690DD /* Command.swift in Sources */, ED0F238B1B87569C00AE40CD /* Downloader.swift in Sources */, - ED0F238D1B8756E600AE40CD /* MASError.swift in Sources */, 3053D11E74A22A4C5A6BE833 /* Errors.swift in Sources */, EBD6B44FDF65E0253153629F /* HelpCommand.swift in Sources */, 900A1E811DBAC8CB0069B1A8 /* Info.swift in Sources */, @@ -447,6 +462,7 @@ ED0F23831B87533A00AE40CD /* List.swift in Sources */, 8078FAA81EC4F2FB004B5B3F /* Lucky.swift in Sources */, ED031A7C1B5127C00097692E /* main.swift in Sources */, + ED0F238D1B8756E600AE40CD /* MASError.swift in Sources */, 693A989B1CBFFAAA0004D3B4 /* NSURLSession+Synchronous.swift in Sources */, 30EA893640B02CCF679F9C57 /* Option.swift in Sources */, 92AE0FD7BE06D64692E6C1E6 /* OrderedSet.swift in Sources */, @@ -470,18 +486,18 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F86588272030FAE70093DE57 /* MASError.swift in Sources */, 3F177C62A7053BA3ED415E5E /* Argument.swift in Sources */, 09A04CB22DC02B86AE4ACC8A /* ArgumentParser.swift in Sources */, 27340A5BB9F2A5B166E3A72A /* ArgumentProtocol.swift in Sources */, DE6E193A6671F3D6807F746D /* Command.swift in Sources */, 4C8321353B9AE40539A1AC8A /* Errors.swift in Sources */, F48562FA81B0C0258AC063B4 /* HelpCommand.swift in Sources */, + F86588272030FAE70093DE57 /* MASError.swift in Sources */, + F865880B2030F6DE0093DE57 /* MASErrorTestCase.swift in Sources */, F6D2058A70757D3477185A50 /* Option.swift in Sources */, 073998C12AE3BEEC41CE0DAD /* OrderedSet.swift in Sources */, C50DD25454FC5CAA1F37763F /* Result.swift in Sources */, EC113CE6C98E8D8358228D33 /* ResultProtocol.swift in Sources */, - F865880B2030F6DE0093DE57 /* MASErrorTestCase.swift in Sources */, 49C2F3FDD805256BE934A70E /* Switch.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0;