Merge pull request #25 from scottrhoyt/swift_4

Swift 4
scottrhoyt · Dec 2, 2017 · 39bd932 · 39bd932
2 parents c4dad41 + 6ea5c66
commit 39bd932
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,9 @@ script: placeholder # workaround for https://github.com/travis-ci/travis-ci/issu
 matrix:
   include:
     - script: set -o pipefail && xcodebuild -scheme SwiftyTextTable -project SwiftyTextTable.xcodeproj clean build test | xcpretty
-      env: JOB=Xcode8
+      env: JOB=Xcode9
       os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9
       language: objective-c
       before_install:
         - ./scripts/upstall-carthage.sh
@@ -18,38 +18,24 @@ matrix:
       before_deploy:
         - carthage build --no-skip-current
         - carthage archive $FRAMEWORK_NAME
-    - script: set -o pipefail && xcodebuild -scheme SwiftyTextTable -project SwiftyTextTable.xcodeproj clean build test | xcpretty
-      env: JOB=Xcode9
-      os: osx
-      osx_image: xcode9
-      language: objective-c
     - script:
         - TOOLCHAINS=swift swift build
         - TOOLCHAINS=swift swift test
       env: JOB=SPM
       os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9
       language: objective-c
     - script:
         - swift build
         - swift test
-      env: JOB=Linux SWIFT_VERSION=3.1
-      sudo: required
-      dist: trusty
-      language: generic
-      install:
-        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
-    - script:
-        - swift build
-        - swift test
-      env: JOB=Linux SWIFT_VERSION=swift-4.0-DEVELOPMENT-SNAPSHOT-2017-08-04-a
+      env: JOB=Linux SWIFT_VERSION=4.0
       sudo: required
       dist: trusty
       language: generic
       install:
         - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
-  allow_failures:
-    - env: JOB=Linux SWIFT_VERSION=swift-4.0-DEVELOPMENT-SNAPSHOT-2017-08-04-a
+  #allow_failures:
+  #  - env: JOB=Linux SWIFT_VERSION=4.0
 
   exclude:
     - script: placeholder # workaround for https://github.com/travis-ci/travis-ci/issues/4681
@@ -63,4 +49,4 @@ deploy:
   on:
     repo: scottrhoyt/SwiftyTextTable
     tags: true
-    condition: $JOB = Xcode8
+    condition: $JOB = Xcode9
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ##### Breaking
 
-* None
+* Update to Swift 4.
 
 ##### Enhancements
 

diff --git a/README.md b/README.md
@@ -8,14 +8,15 @@ A lightweight Swift library for generating text tables.
 [![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
 [![CocoaPods](https://img.shields.io/cocoapods/v/SwiftyTextTable.svg)]()
 ![Platform OS X + Linux](https://img.shields.io/badge/Platform-OS%20X%20%2B%20Linux-blue.svg)
-[![Language Swift 3.0](https://img.shields.io/badge/Language-Swift%203.0-orange.svg)](https://swift.org)
+[![Language Swift 4.0](https://img.shields.io/badge/Language-Swift%204.0-orange.svg)](https://swift.org)
 
 ![Example](http://i.imgur.com/utoa6TK.png)
 
 ## Swift Language Support
 
-SwiftyTextTable is now Swift 3.0 compatible! The last release to support Swift
-2.3 was [0.3.1](https://github.com/scottrhoyt/SwiftyTextTable/releases/tag/0.3.1).
+SwiftyTextTable is now Swift 4.0 compatible! The last release to support Swift
+3.1 was [0.7.1](https://github.com/scottrhoyt/SwiftyTextTable/releases/tag/0.7.1).
+The last release to support Swift 2.3 was [0.3.1](https://github.com/scottrhoyt/SwiftyTextTable/releases/tag/0.3.1).
 
 ## Installation
 

diff --git a/SwiftyTextTable.xcodeproj/project.pbxproj b/SwiftyTextTable.xcodeproj/project.pbxproj
@@ -170,11 +170,11 @@
 				TargetAttributes = {
 					3B5BDCE51C63133100592068 = {
 						CreatedOnToolsVersion = 7.1.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = "";
 					};
 					3B5BDCEF1C63133100592068 = {
 						CreatedOnToolsVersion = 7.1.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = "";
 					};
 				};
 			};
@@ -384,8 +384,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -407,8 +407,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.scotthoyt.SwiftyTextTable;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -420,8 +420,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.scotthoyt.SwiftyTextTableTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -433,8 +433,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.scotthoyt.SwiftyTextTableTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     ##### Breaking
-    * None
+    * Update to Swift 4.
     ##### Enhancements
@@ Expand Down @@