Merge pull request #91 from phatblat/build

Resolve build issues

.bundle/config

@@ -0,0 +1,4 @@
+---
+BUNDLE_CLEAN: "true"
+BUNDLE_BIN: "bin"
+BUNDLE_JOBS: "8"

.gitignore

@@ -28,6 +28,10 @@ xcuserdata
 *.hmap
 *.ipa
 
+# Bundler
+/.rubygems/
+/bin/
+
 # CocoaPods
 #
 # We recommend against adding the Pods directory to your .gitignore. However
@@ -69,8 +73,7 @@ Icon
 Network Trash Folder
 Temporary Items
 .apdisk
-
+# Build artifacts
 mas-cli.zip
 mas-cli.dSYM.zip
 mas.xcarchive.zip
-

.travis.yml

@@ -1,6 +1,6 @@
 language: objective-c
-xcode_sdk: macosx10.11
-osx_image: xcode8.2
+xcode_sdk: macosx10.12
+osx_image: xcode8.3
 
 env:
   global:
@@ -8,6 +8,9 @@ env:
     - LC_ALL=en_US.UTF-8
     - LANGUAGE=en_US.UTF-8
 
+install:
+  - bundle install
+
 script:
   - script/build
 

mas-cli.xcodeproj/project.pbxproj

@@ -307,7 +307,7 @@
 			attributes = {
 				LastSwiftMigration = 0730;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = "Andrew Naylor";
 				TargetAttributes = {
 					ED031A771B5127C00097692E = {
@@ -501,7 +501,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "mas-cli/mas-cli-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};

mas-cli.xcodeproj/xcshareddata/xcschemes/mas-cli.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

script/build

@@ -11,11 +11,21 @@ main() {
 }
 
 build() {
-  set -o pipefail && xcodebuild -project "mas-cli.xcodeproj" -scheme mas-cli -configuration Release clean build | xcpretty -c
+  set -o pipefail && \
+      xcodebuild -project "mas-cli.xcodeproj" \
+          -scheme mas-cli \
+          -configuration Release \
+          clean build \
+      | xcpretty --color
 }
 
 archive() {
-  set -o pipefail && xcodebuild -project "mas-cli.xcodeproj" -scheme mas-cli -archivePath mas.xcarchive archive | xcpretty -c
+  set -o pipefail && \
+      xcodebuild -project "mas-cli.xcodeproj" \
+          -scheme mas-cli \
+          -archivePath mas.xcarchive \
+          archive \
+      | xcpretty --color
 }
 
 main

script/package

@@ -1,6 +1,7 @@
 #!/bin/bash -e
 
 echo "==> Moving dSYM to xcarchive"
+mkdir -p mas.xcarchive/dSYMs/
 mv build/mas.dSYM mas.xcarchive/dSYMs/
 
 echo "==> Compressing mas.xcarchive"