Merge pull request #17 from bcylin/feature/xcode-8.3

Xcode 8.3 with Swift 3.1

Author: bcylin

.ruby-version

@@ -1 +1 @@
-2.3.1
+2.4.1

.swift-version

@@ -1 +1 @@
-3.0.0
+3.1

.swiftlint-version

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.2
+osx_image: xcode8.3
 cache:
   bundler: true
   directories:

.travis.yml

@@ -192,12 +192,12 @@
 				TargetAttributes = {
 					B548C5C11C8E91B0009D5AEE = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0830;
 						TestTargetID = B5E9F8FA1C8D3B6E00443DC7;
 					};
 					B5E9F8FA1C8D3B6E00443DC7 = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0830;
 					};
 				};
 			};
@@ -263,13 +263,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Example-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		B5C50ADD1C917F4A0059032B /* Swift Lint */ = {
@@ -284,17 +287,20 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "sh ${SRCROOT}/scripts/swiftlint.sh";
+			shellScript = "${PODS_ROOT}/SwiftLint/swiftlint";
 		};
 		CAB3B20531AAE2438C48D751 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/ICInputAccessory/ICInputAccessory.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ICInputAccessory.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

Example.xcodeproj/project.pbxproj

@@ -1,9 +1,8 @@
 source "http://rubygems.org"
-ruby "2.3.1"
 
-gem "cocoapods", "~> 1.1.0"
-gem "danger", "~> 4.0.0"
-gem "jazzy", "~> 0.7.0"
+gem "cocoapods"
+gem "danger"
+gem "jazzy", "~> 0.8.0"
 gem "pry"
 gem "rake"
 gem "xcpretty"

Gemfile

@@ -2,39 +2,39 @@ GEM
   remote: http://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    activesupport (4.2.7.1)
+    activesupport (4.2.9)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    claide (1.0.1)
+    claide (1.0.2)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.1.1)
+    cocoapods (1.3.1)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.1.1)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.3.1)
       cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.2, < 2.0)
+      cocoapods-downloader (>= 1.1.3, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.1.1, < 2.0)
+      cocoapods-trunk (>= 1.2.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.1)
+      molinillo (~> 0.5.7)
       nap (~> 1.0)
-      xcodeproj (>= 1.3.3, < 2.0)
-    cocoapods-core (1.1.1)
-      activesupport (>= 4.0.2, < 5)
+      ruby-macho (~> 1.1)
+      xcodeproj (>= 1.5.1, < 2.0)
+    cocoapods-core (1.3.1)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.1)
@@ -43,36 +43,37 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.2)
+    cocoapods-trunk (1.2.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
     coderay (1.1.1)
-    colored (1.2)
-    cork (0.2.0)
-      colored (~> 1.2)
-    danger (4.0.5)
+    colored2 (3.1.2)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    danger (5.3.4)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
       faraday-http-cache (~> 1.0)
       git (~> 1)
       kramdown (~> 1.5)
-      octokit (~> 4.2)
+      octokit (~> 4.7)
       terminal-table (~> 1)
     escape (0.0.4)
-    faraday (0.11.0)
+    faraday (0.13.0)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (1.3.1)
       faraday (~> 0.8)
+    ffi (1.9.18)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.0.3)
     git (1.3.0)
-    i18n (0.7.0)
-    jazzy (0.7.3)
+    i18n (0.8.6)
+    jazzy (0.8.3)
       cocoapods (~> 1.0)
       mustache (~> 0.99)
       open4
@@ -81,18 +82,17 @@ GEM
       sass (~> 3.4)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
-    json (1.8.6)
-    kramdown (1.13.2)
+    kramdown (1.14.0)
     liferaft (0.0.6)
     method_source (0.8.2)
-    minitest (5.10.1)
-    molinillo (0.5.5)
+    minitest (5.10.3)
+    molinillo (0.5.7)
     multipart-post (2.0.0)
     mustache (0.99.8)
     nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
-    octokit (4.6.2)
+    octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
     pry (0.10.4)
@@ -101,44 +101,48 @@ GEM
       slop (~> 3.4)
     public_suffix (2.0.5)
     rake (12.0.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     redcarpet (3.4.0)
     rouge (1.11.1)
-    sass (3.4.23)
+    ruby-macho (1.1.0)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     slop (3.6.0)
     sqlite3 (1.3.13)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.3.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.4.2)
+    xcodeproj (1.5.1)
       CFPropertyList (~> 2.3.3)
-      activesupport (>= 3)
-      claide (>= 1.0.1, < 2.0)
-      colored (~> 1.2)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
-    xcpretty (0.2.4)
+    xcpretty (0.2.6)
       rouge (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.1.0)
-  danger (~> 4.0.0)
-  jazzy (~> 0.7.0)
+  cocoapods
+  danger
+  jazzy (~> 0.8.0)
   pry
   rake
   xcpretty
 
-RUBY VERSION
-   ruby 2.3.1p112
-
 BUNDLED WITH
-   1.13.6
+   1.15.3

Gemfile.lock

@@ -132,7 +132,7 @@
 				TargetAttributes = {
 					B56BC4291C89A7EA00C20AD6 = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0830;
 					};
 				};
 			};

ICInputAccessory.xcodeproj/project.pbxproj

@@ -1,4 +1,9 @@
-install: brew-install bundle-install pod-install
+bootstrap:
+	gem install bundler
+	bundle install
+	bundle exec pod install
+
+install: bundle-install pod-install
 
 brew-install:
 	brew tap homebrew/bundle
@@ -8,14 +13,7 @@ bundle-install:
 	bundle install --without development --deployment --jobs=3 --retry=3
 
 pod-install:
-	bundle exec pod install --no-repo-update
-
-bootstrap:
-	brew tap homebrew/bundle
-	brew bundle
-	gem install bundler
-	bundle install
-	bundle exec pod install --no-repo-update
+	bundle exec pod install
 
 carthage:
 	set -o pipefail && carthage build --no-skip-current --verbose | bundle exec xcpretty

Makefile

@@ -2,19 +2,10 @@ platform :ios, "8.0"
 use_frameworks!
 
 workspace "ICInputAccessory"
-project "ICInputAccessory"
 project "Example"
 
 target "Example" do
   pod "ICInputAccessory/KeyboardDismissTextField", path: "./"
   pod "ICInputAccessory/TokenField", path: "./"
-end
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings["SWIFT_VERSION"] = "3.0"
-      config.build_settings['CONFIGURATION_BUILD_DIR'] = '$PODS_CONFIGURATION_BUILD_DIR'
-    end
-  end
+  pod "SwiftLint", "0.19.0"
 end