From e3d167dc10e93005a6cfd413997156d3a9096d9b Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Mon, 1 Oct 2018 20:06:38 -0600 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Swift=204.2,=20Xcode=2010?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 +--- Homebrew/mas-tap.rb | 2 +- Homebrew/mas.rb | 2 +- mas-cli.xcodeproj/project.pbxproj | 9 ++++++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index a88a657..c3c90ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,7 @@ # os: osx -osx_image: xcode9.4 # macOS 10.13 -xcode_sdk: macosx10.13 -language: objective-c +osx_image: xcode10 # macOS 10.13 env: global: diff --git a/Homebrew/mas-tap.rb b/Homebrew/mas-tap.rb index 9e6b2ff..16e065d 100644 --- a/Homebrew/mas-tap.rb +++ b/Homebrew/mas-tap.rb @@ -15,7 +15,7 @@ class Mas < Formula sha256 "a99d0d7baecf45a00787365a2a078ae94068a0c63012e87f92282efb120e586e" => :yosemite end - depends_on :xcode => ["9.3", :build] + depends_on :xcode => ["10.0", :build] resource "cocoapods" do url "https://dl.bintray.com/phatblat/mas-bottles/master.tar.gz" diff --git a/Homebrew/mas.rb b/Homebrew/mas.rb index 3e66b32..4cfd139 100644 --- a/Homebrew/mas.rb +++ b/Homebrew/mas.rb @@ -11,7 +11,7 @@ class Mas < Formula sha256 "af5be6aa9902d9cfc2aa69dbf313441a7c201463d516face721f900ceae9556b" => :sierra end - depends_on :xcode => ["9.3", :build] + depends_on :xcode => ["10.0", :build] resource "cocoapods" do url "https://dl.bintray.com/phatblat/mas-bottles/master.tar.gz" diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index 692d019..9c07568 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -412,10 +412,11 @@ TargetAttributes = { ED031A771B5127C00097692E = { CreatedOnToolsVersion = 7.0; - LastSwiftMigration = 0920; + LastSwiftMigration = 1000; }; F8233C86201EBDF000268278 = { CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1000; ProvisioningStyle = Automatic; }; }; @@ -640,6 +641,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "App/mas-cli-Bridging-Header.h"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -659,6 +661,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "App/mas-cli-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -686,7 +689,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -714,7 +717,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; };