Merge pull request Carthage#2256 from Carthage/deprecated-string-char…

…acters `String.characters` is now deprecated in Swift 4.0.2
abrindam · Nov 14, 2017 · f3d43f3 · f3d43f3
2 parents 7885fbb + 971da1b
commit f3d43f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Source/CarthageKit/FrameworkExtensions.swift b/Source/CarthageKit/FrameworkExtensions.swift
@@ -22,7 +22,7 @@ extension String {
 	/// Strips off a trailing string, if present.
 	internal func stripping(suffix: String) -> String {
 		if hasSuffix(suffix) {
-			let end = characters.index(endIndex, offsetBy: -suffix.count)
+			let end = index(endIndex, offsetBy: -suffix.count)
 			return String(self[startIndex..<end])
 		} else {
 			return self

diff --git a/Source/carthage/Extensions.swift b/Source/carthage/Extensions.swift
@@ -43,8 +43,7 @@ internal func print<T>(_ object: T) {
 extension String {
 	/// Split the string into substrings separated by the given separators.
 	internal func split(maxSplits: Int = .max, omittingEmptySubsequences: Bool = true, separators: [Character] = [ ",", " " ]) -> [String] {
-		return characters
-			.split(maxSplits: maxSplits, omittingEmptySubsequences: omittingEmptySubsequences, whereSeparator: separators.contains)
+		return split(maxSplits: maxSplits, omittingEmptySubsequences: omittingEmptySubsequences, whereSeparator: separators.contains)
 			.map(String.init)
 	}
 }