Update dependencies

- Update SourceKitten from 0.19.1 to 0.20.0
- Update SWXMLHash from 4.3.6 to 4.6.0
- Update Yams from 0.5.0 to 0.7.0

Cartfile

@@ -1,2 +1,2 @@
-github "jpsim/SourceKitten" ~> 0.19.1
+github "jpsim/SourceKitten" ~> 0.20.0
 github "scottrhoyt/SwiftyTextTable" ~> 0.8.0

Cartfile.private

@@ -1,3 +1,3 @@
 github "Carthage/Commandant" ~> 0.13.0
 github "jspahrsummers/xcconfigs" "4ac967d12f72c2ccc7f34d163268d09296923a7c"
-github "jpsim/Yams" ~> 0.5
+github "jpsim/Yams" ~> 0.7

Cartfile.resolved

@@ -1,7 +1,7 @@
 github "Carthage/Commandant" "0.13.0"
 github "antitypical/Result" "3.2.4"
-github "drmohundro/SWXMLHash" "4.3.6"
-github "jpsim/SourceKitten" "0.19.1"
-github "jpsim/Yams" "0.5.0"
+github "drmohundro/SWXMLHash" "4.6.0"
+github "jpsim/SourceKitten" "0.20.0"
+github "jpsim/Yams" "0.7.0"
 github "jspahrsummers/xcconfigs" "4ac967d12f72c2ccc7f34d163268d09296923a7c"
 github "scottrhoyt/SwiftyTextTable" "0.8.0"

Package.resolved

@@ -46,15 +46,6 @@
           "version": "3.2.4"
         }
       },
-      {
-        "package": "SWXMLHash",
-        "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git",
-        "state": {
-          "branch": null,
-          "revision": "4e7f5af6331735d39fc357b2c71c3bb15af97c8f",
-          "version": "4.3.6"
-        }
-      },
       {
         "package": "SourceKit",
         "repositoryURL": "https://github.com/norio-nomura/SourceKit.git",
@@ -69,8 +60,8 @@
         "repositoryURL": "https://github.com/jpsim/SourceKitten.git",
         "state": {
           "branch": null,
-          "revision": "e06eb730499439ae32c5fbb6f72809ebec2371fd",
-          "version": "0.19.1"
+          "revision": "b6b10419ee439167ba6f7bd928ad30754ff5eb5d",
+          "version": "0.20.0"
         }
       },
       {
@@ -82,13 +73,22 @@
           "version": "0.8.0"
         }
       },
+      {
+        "package": "SWXMLHash",
+        "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git",
+        "state": {
+          "branch": null,
+          "revision": "17d992beb3aaeda403fd35f8d5e70ab1a8124f35",
+          "version": "4.6.0"
+        }
+      },
       {
         "package": "Yams",
         "repositoryURL": "https://github.com/jpsim/Yams.git",
         "state": {
           "branch": null,
-          "revision": "95f45caf07472ec78223ebada45255086a85b01a",
-          "version": "0.5.0"
+          "revision": "6652aa7b793d3c8a075db0614acb575fcaecf457",
+          "version": "0.7.0"
         }
       }
     ]

Package.swift

@@ -9,8 +9,8 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/Carthage/Commandant.git", from: "0.13.0"),
-        .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.19.1"),
-        .package(url: "https://github.com/jpsim/Yams.git", from: "0.5.0"),
+        .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.20.0"),
+        .package(url: "https://github.com/jpsim/Yams.git", from: "0.7.0"),
         .package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.8.0"),
     ],
     targets: [

Source/SwiftLintFramework/Extensions/File+SwiftLint.swift

@@ -242,7 +242,6 @@ extension File {
         fileHandle.write(stringData)
         fileHandle.closeFile()
         contents += string
-        lines = contents.bridge().lines()
     }
 
     internal func write<S: StringProtocol>(_ string: S) {
@@ -262,7 +261,6 @@ extension File {
         }
         contents = String(string)
         invalidateCache()
-        lines = contents.bridge().lines()
     }
 
     internal func ruleEnabled(violatingRanges: [NSRange], for rule: Rule) -> [NSRange] {

Source/SwiftLintFramework/Models/YamlParser.swift

@@ -38,11 +38,11 @@ public struct YamlParser {
 
 private extension Constructor {
     static func swiftlintContructor(env: [String: String]) -> Constructor {
-        return Constructor(customMap(env: env))
+        return Constructor(customScalarMap(env: env))
     }
 
-    static func customMap(env: [String: String]) -> Map {
-        var map = defaultMap
+    static func customScalarMap(env: [String: String]) -> ScalarMap {
+        var map = defaultScalarMap
         map[.str] = String.constructExpandingEnvVars(env: env)
         map[.bool] = Bool.constructUsingOnlyTrueAndFalse
 
@@ -51,10 +51,9 @@ private extension Constructor {
 }
 
 private extension String {
-    static func constructExpandingEnvVars(env: [String: String]) -> (_ node: Node) -> String? {
-        return { (node: Node) -> String? in
-            assert(node.isScalar)
-            return node.scalar!.string.expandingEnvVars(env: env)
+    static func constructExpandingEnvVars(env: [String: String]) -> (_ scalar: Node.Scalar) -> String? {
+        return { (scalar: Node.Scalar) -> String? in
+            return scalar.string.expandingEnvVars(env: env)
         }
     }
 
@@ -69,9 +68,8 @@ private extension String {
 }
 
 private extension Bool {
-    static func constructUsingOnlyTrueAndFalse(from node: Node) -> Bool? {
-        assert(node.isScalar)
-        switch node.scalar!.string.lowercased() {
+    static func constructUsingOnlyTrueAndFalse(from scalar: Node.Scalar) -> Bool? {
+        switch scalar.string.lowercased() {
         case "true":
             return true
         case "false":
@@ -81,12 +79,3 @@ private extension Bool {
         }
     }
 }
-
-private extension Node {
-    var isScalar: Bool {
-        if case .scalar = self {
-            return true
-        }
-        return false
-    }
-}

SwiftLintFramework.podspec

@@ -9,6 +9,6 @@ Pod::Spec.new do |s|
   s.platform            = :osx, '10.10'
   s.source_files        = 'Source/SwiftLintFramework/**/*.swift'
   s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
-  s.dependency            'SourceKittenFramework', '~> 0.18'
-  s.dependency            'Yams', '~> 0.4'
+  s.dependency            'SourceKittenFramework', '~> 0.20'
+  s.dependency            'Yams', '~> 0.7'
 end