Merge pull request #42 from PureSwift/feature/swift5

Updated for Swift 5

Author: colemancda

.gitignore

@@ -15,3 +15,5 @@ Xcode/SwiftFoundation.xcodeproj/xcuserdata
 Xcode/SwiftFoundation.xcodeproj/project.xcworkspace/xcuserdata
 
 .DS_Store
+
+.swiftpm

.travis.yml

@@ -1,26 +1,29 @@
 language: generic
-osx_image: xcode8
-os:
-  - linux
-sudo: required
-dist: trusty
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install carthage ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then carthage bootstrap ; fi
-install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then SWIFT_DIR=tests ; fi
+matrix:
+   include:
+       # Test Ubuntu Linux 16.04 / Swift 5.2
+       - os: linux
+         dist: xenial
+         sudo: required
+         env:
+           - SWIFT_VERSION=swift-5.2.2-RELEASE
+           - SWIFT_URL=https://swift.org/builds/swift-5.2.2-release/ubuntu1604/swift-5.2.2-RELEASE/swift-5.2.2-RELEASE-ubuntu16.04.tar.gz
+         install:
+           - export PATH=$(pwd)/tests/$SWIFT_VERSION-ubuntu16.04/usr/bin:"${PATH}"
+      # Test Xcode 11.4 / Swift 5.2.2
+       - os: osx
+         osx_image: xcode11.4
+addons:
+  apt:
+    packages:
+    - clang
+    - pkg-config
+script:
+  # Setup Linux environment
   - 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 sudo apt-get install clang ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then SWIFT_DIR=tests ; 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
-env:
-  - SWIFT_VERSION=swift-DEVELOPMENT-SNAPSHOT-2016-08-04-a
-script:
-  - uname
-  - 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 ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then .build/debug/UnitTests ; fi
-  
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl $SWIFT_URL -s | tar xz -C $SWIFT_DIR &> /dev/null ; fi
+  # Run Unit Tests
+  - swift test

Cartfile

@@ -1,10 +1,24 @@
+// swift-tools-version:5.1
 import PackageDescription
 
+let libraryType: PackageDescription.Product.Library.LibraryType
+#if os(Linux)
+libraryType = .dynamic
+#else
+libraryType = .static
+#endif
+
 let package = Package(
     name: "SwiftFoundation",
-    dependencies: [
-        .Package(url: "https://github.com/PureSwift/CStatfs.git", majorVersion: 1),
-        .Package(url: "https://github.com/PureSwift/CJSONC.git", majorVersion: 1)
+    products: [
+        .library(
+            name: "SwiftFoundation",
+            type: libraryType,
+            targets: ["SwiftFoundation"]
+        )
     ],
-    exclude: ["Xcode", "Carthage"]
+    targets: [
+        .target(name: "SwiftFoundation"),
+        .testTarget(name: "SwiftFoundationTests", dependencies: ["SwiftFoundation"])
+    ]
 )