update for Xcode 7 Beta 6

rozeridilar · Aug 27, 2015 · 57a8abb · 57a8abb
1 parent 19cc87a
commit 57a8abb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -21,4 +21,4 @@
 	url = https://github.com/antitypical/Result.git
 [submodule "Carthage/Checkouts/YamlSwift"]
 	path = Carthage/Checkouts/YamlSwift
-	url = https://github.com/behrang/YamlSwift.git
+	url = https://github.com/jpsim/YamlSwift.git
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "Carthage/Commandant" "swift-2.0"
 github "jspahrsummers/xcconfigs" >= 0.8
-github "behrang/YamlSwift" ~> 1.2
+github "jpsim/YamlSwift" "master"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,7 +1,7 @@
 github "antitypical/Result" "0.6-beta.1"
 github "drmohundro/SWXMLHash" "050154bfc56032f04fcca37464693a17f897200a"
 github "jpsim/SwiftXPC" "d32e70f1b35cfa833be85fd40e70401f4190f5b0"
-github "behrang/YamlSwift" "v1.2.0"
+github "jpsim/YamlSwift" "ed060df018b5693a045f207088b95ce15f433065"
 github "jspahrsummers/xcconfigs" "0.8.1"
 github "Carthage/Commandant" "40f503c33121431dc098adb7c44d9496e3a1de2f"
 github "jpsim/SourceKitten" "ace729472170a4ec2996b8f921fc66784e5ef4fe"
diff --git a/Carthage/Checkouts/YamlSwift b/Carthage/Checkouts/YamlSwift
diff --git a/Source/SwiftLintFramework/Configuration.swift b/Source/SwiftLintFramework/Configuration.swift
@@ -37,7 +37,7 @@ public struct Configuration {
         if invalidRules.count > 0 {
             for invalidRule in invalidRules {
                 fputs("config error: '\(invalidRule)' is not a valid rule identifier\n", stderr)
-                let listOfValidRuleIdentifiers = "\n".join(validRuleIdentifiers)
+                let listOfValidRuleIdentifiers = validRuleIdentifiers.joinWithSeparator("\n")
                 fputs("Valid rule identifiers:\n\(listOfValidRuleIdentifiers)\n", stderr)
             }
             return nil
+2 −2		Readme.md
+1 −1		Yaml/Tokenizer.swift
+2 −2		Yaml/Yaml.swift