Merge pull request #3 from Ponyboy47/Swift4

Swift4

.gitignore

@@ -4,4 +4,6 @@
 /*.xcodeproj
 .*.sw[po]
 Package.pins
+Package.resolved
 .AppleDouble
+/renzoku.conf

.swift-version

@@ -1 +1 @@
-3.1.1
+4.0.3

.swiftlint.yml

@@ -1 +1,6 @@
 line_length: 200
+disabled_rules:
+  - force_cast
+  - todo
+included:
+  - Sources

.travis.yml

@@ -1,12 +1,14 @@
 os:
   - linux
   - osx
-osx_image: xcode8.3
+osx_image: xcode9.2
 dist: trusty
 sudo: required
 language: generic
+before_install:
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install kylef/formulae/swiftenv; fi
 install:
-    - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
+    - swiftenv install $(cat .swift-version) | grep -qe "\(been\|already\) installed"
 script:
-  - travis_wait swift build
   - travis_wait swift build -c release

Package.swift

@@ -1,28 +1,35 @@
+// swift-tools-version:4.0
+
 import PackageDescription
 
 var dependencies: [Package.Dependency] = [
-    .Package(url: "https://github.com/Ponyboy47/PathKit.git", majorVersion: 0, minor: 8),
-    .Package(url: "https://github.com/Ponyboy47/Strings.git", majorVersion: 1),
-    .Package(url: "https://github.com/Ponyboy47/CLI.git", majorVersion: 1),
-    // My Downpour fork requires vdka/JSON so I don't need it's dependency here
-    .Package(url: "https://github.com/Ponyboy47/Downpour.git", majorVersion: 0, minor: 4),
-    .Package(url: "https://github.com/IBM-Swift/BlueSignals.git", majorVersion: 0, minor: 9),
-    .Package(url: "https://github.com/Ponyboy47/Async.git", majorVersion: 2),
-    .Package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver.git", majorVersion: 1, minor: 3),
-    .Package(url: "https://github.com/Ponyboy47/Duration.git", majorVersion: 2),
-    .Package(url: "https://github.com/Ponyboy47/UUID.git", majorVersion: 0, minor: 8),
-    .Package(url: "https://github.com/Ponyboy47/Cron-Swift.git", majorVersion: 1)
+    .package(url: "https://github.com/IBM-Swift/BlueSignals.git", .upToNextMajor(from: "0.9.50")),
+    .package(url: "https://github.com/Ponyboy47/CLI.git", .upToNextMinor(from: "2.1.0")),
+    .package(url: "https://github.com/Ponyboy47/Cron-Swift.git", .upToNextMajor(from: "2.1.0")),
+    .package(url: "https://github.com/Ponyboy47/Downpour.git", .upToNextMinor(from: "0.5.0")),
+    .package(url: "https://github.com/Ponyboy47/PathKit.git", .upToNextMajor(from: "0.9.0")),
+    .package(url: "https://github.com/kareman/SwiftShell.git", .upToNextMinor(from: "4.0.0")),
+    .package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver.git", .upToNextMinor(from: "1.4.0")),
+    .package(url: "https://github.com/Ponyboy47/LockSmith.git", .upToNextMinor(from: "0.2.0"))
 ]
+var namedDependencies: [Target.Dependency] = ["Signals", "CLI", "Cron", "Downpour", "PathKit", "SwiftShell", "SwiftyBeaver", "LockSmith"]
 
 #if os(Linux)
-dependencies.append(.Package(url: "https://github.com/Ponyboy47/inotify.git", majorVersion: 0))
-#else
-// Importing this package through both Downpour and here causes issues with multiple libraries found on linux
-dependencies.append(.Package(url: "https://github.com/vdka/JSON", majorVersion: 0))
+dependencies.append(.package(url: "https://github.com/Ponyboy47/inotify.git", .upToNextMinor(from: "0.4.3")))
+namedDependencies.append("Inotify")
 #endif
 
 let package = Package(
     name: "Plex-Monitr",
+    products: [
+        .executable(
+            name: "monitr",
+            targets: ["monitr"])
+    ],
     dependencies: dependencies,
-    exclude: ["Tests"]
+    targets: [
+        .target(
+            name: "monitr",
+            dependencies: namedDependencies)
+    ]
 )