Merge pull request #39 from jianstm/2.x

2.x

.swiftlint.yml

@@ -1,10 +1,10 @@
 included:
   - Sources
+  - Tests
 
 disabled_rules:
   - cyclomatic_complexity
   - file_length
   - function_body_length
   - identifier_name
-
-line_length: 200
+  - type_name

.travis.yml

@@ -3,23 +3,25 @@ branches:
     - master
 
 language: objective-c
-osx_image: xcode10
+osx_image: xcode10.2
+
+env:
+  global: 
+    - PROJECT="Schedule.xcodeproj"
+    - SCHEME="Schedule-Package"
 
 matrix:
   include:
     - os: osx
       env:
-        - SCHEME="Schedule-iOS"
-        - SDK="iphonesimulator12.0"
-        - DESTINATION="OS=12.0,name=iPhone X"
+        - SDK="iphonesimulator12.2"
+        - DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=12.2"
     - os: osx
       env:
-        - SCHEME="Schedule-macOS"
-        - SDK="macosx10.13"
+        - SDK="macosx10.14"
         - DESTINATION="arch=x86_64"
     - os: osx
       env:
-        - SCHEME="Schedule-tvOS"
         - SDK="appletvsimulator12.0"
         - DESTINATION="OS=12.0,name=Apple TV 4K"
     - os: linux
@@ -28,18 +30,17 @@ matrix:
 
 before_install:
   - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-      gem install xcpretty --no-rdoc --no-ri --no-document --quiet;
+      gem install xcpretty;
     fi
   - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
       eval "$(curl -sL https://swiftenv.fuller.li/install.sh)";
     fi
 
 script:
   - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-      xcodebuild clean build test -project Schedule.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -enableCodeCoverage YES | xcpretty;
+      xcodebuild clean build test -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -enableCodeCoverage YES | xcpretty;
     fi
   - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
-      swift build;
       swift test;
     fi
 

Package.swift

@@ -1,16 +1,23 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 
 import PackageDescription
 
 let package = Package(
     name: "Schedule",
+    platforms: [
+        .macOS(.v10_12),
+        .iOS(.v10),
+        .tvOS(.v10),
+        .watchOS(.v3)
+    ],
     products: [
-        .library(name: "Schedule", targets: ["Schedule"]),
-        .executable(name: "ScheduleDemo", targets: ["ScheduleDemo"])
+        .library(name: "Schedule", targets: ["Schedule"])
     ],
     targets: [
         .target(name: "Schedule"),
-        .testTarget(name: "ScheduleTests", dependencies: ["Schedule"]),
-        .target(name: "ScheduleDemo", dependencies: ["Schedule"])
+        .testTarget(name: "ScheduleTests", dependencies: ["Schedule"])
+    ],
+    swiftLanguageVersions: [
+        .v5
     ]
 )