Merge branch 'develop'

Author: colemancda

.travis.yml

@@ -1,5 +1,5 @@
 language: generic
-osx_image: xcode7.3
+osx_image: xcode8
 os:
   - linux
   - osx
@@ -13,15 +13,15 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install clang uuid-dev libjson-c-dev ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir $SWIFT_DIR ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl https://swift.org/builds/development/ubuntu1404/$SWIFT_VERSION/$SWIFT_VERSION-ubuntu14.04.tar.gz -s | tar xz -C $SWIFT_DIR &> /dev/null ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl https://swift.org/builds/swift-3.0-preview-1/ubuntu1404/$SWIFT_VERSION/$SWIFT_VERSION-ubuntu14.04.tar.gz -s | tar xz -C $SWIFT_DIR &> /dev/null ; fi
 env:
-  - SWIFT_VERSION=swift-DEVELOPMENT-SNAPSHOT-2016-02-25-a
+  - SWIFT_VERSION=swift-3.0-PREVIEW-1
 script:
   - uname
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xctool test -workspace SwiftFoundation.xcworkspace -scheme "SwiftFoundation OS X" -sdk macosx ONLY_ACTIVE_ARCH=NO ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xctool build -workspace SwiftFoundation.xcworkspace -scheme "SwiftFoundation iOS" -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xctool test -project Xcode/SwiftFoundation.xcodeproj -scheme "SwiftFoundation OS X" -sdk macosx ONLY_ACTIVE_ARCH=NO ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xctool build -project Xcode/SwiftFoundation.xcodeproj -scheme "SwiftFoundation iOS" -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO ; fi
 
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH=$(pwd)/tests/$SWIFT_VERSION-ubuntu14.04/usr/bin:"${PATH}" ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then swift build -c release ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then .build/release/UnitTests ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then swift build ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then .build/debug/UnitTests ; fi
 

Cartfile.resolved

@@ -1 +1 @@
-github "PureSwift/json-c" "e8e38025563d43e425536200002ad13c3f35a98b"
+github "PureSwift/JSON-C" "098c5ad91d262de5ad695a6162b6d0d4b384741d"

Introduction.playground/Contents.swift

@@ -2,22 +2,16 @@ import PackageDescription
 
 let package = Package(
     name: "SwiftFoundation",
-    dependencies: [
-        .Package(url: "https://github.com/PureSwift/CUUID.git", majorVersion: 1),
-        .Package(url: "https://github.com/PureSwift/CStatfs.git", majorVersion: 1),
-        .Package(url: "https://github.com/PureSwift/CJSONC.git", majorVersion: 1)
-    ],
     targets: [
         Target(
             name: "UnitTests",
             dependencies: [.Target(name: "SwiftFoundation")]),
-        Target(
-            name: "FoundationUnitTests",
-            dependencies: [.Target(name: "SwiftFoundation")]),
-        Target(
-            name: "FoundationConvertible",
-            dependencies: [.Target(name: "SwiftFoundation")]),
         Target(
             name: "SwiftFoundation")
-    ]
-)
+    ],
+    dependencies: [
+        .Package(url: "https://github.com/PureSwift/CStatfs.git", majorVersion: 1),
+        .Package(url: "https://github.com/PureSwift/CJSONC.git", majorVersion: 1)
+    ],
+    exclude: ["Xcode", "Carthage"]
+)

Introduction.playground/contents.xcplayground

@@ -1,5 +1,5 @@
 # SwiftFoundation #
-[![Swift](https://img.shields.io/badge/swift-2.2-orange.svg?style=flat)](https://developer.apple.com/swift/)
+[![Swift](https://img.shields.io/badge/swift-3.0-orange.svg?style=flat)](https://developer.apple.com/swift/)
 [![Platforms](https://img.shields.io/badge/platform-osx%20%7C%20ios%20%7C%20watchos%20%7C%20tvos%20%7C%20linux-lightgrey.svg)](https://developer.apple.com/swift/)
 [![Release](https://img.shields.io/github/release/pureswift/swiftfoundation.svg)](https://github.com/PureSwift/SwiftFoundation/releases)
 [![License](https://img.shields.io/badge/license-MIT-71787A.svg)](https://tldrlegal.com/license/mit-license)
@@ -42,17 +42,18 @@ swift build
 ## Implemented
 To see what parts of Foundation are implemented, just look at the unit tests. Completed functionality will be fully unit tested. Note that there is some functionality that is written as a protocol only, that will not be included on this list.
 
+- [x] Base64
+- [x] Data
 - [x] Date
+- [x] FileManager
+- [x] JSON
 - [x] Null
 - [x] Order (equivalent to ```NSComparisonResult```)
+- [X] RegularExpression (POSIX, not ICU)
 - [x] SortDescriptor
-- [x] UUID
-- [x] FileManager
-- [x] Data
+- [x] Thread
 - [x] URL
-- [X] RegularExpression (POSIX, not ICU)
-- [x] JSON
-- [x] Base64
+- [x] UUID
 
 # License