Fixes deprecated APIs.

Author: kzaher

scripts/package-spm.swift

@@ -156,7 +156,7 @@ func buildAllTestsTarget(_ testsPath: String) throws {
 
         print(fileRelativePath)
 
-        let classMatches = splitClassesRegularExpression.matches(in: testContent as String, options: [], range: NSRange(location: 0, length: testContent.characters.count))
+        let classMatches = splitClassesRegularExpression.matches(in: testContent as String, options: [], range: NSRange(location: 0, length: testContent.count))
         let matchIndexes = classMatches
             .map { $0.range.location }
 
@@ -166,7 +166,7 @@ func buildAllTestsTarget(_ testsPath: String) throws {
             let classNames = classMatches.map { (testContent as NSString).substring(with: $0.rangeAt(1)) as NSString }
         #endif
 
-        let ranges = zip([0] + matchIndexes, matchIndexes + [testContent.characters.count]).map { NSRange(location: $0, length: $1 - $0) }
+        let ranges = zip([0] + matchIndexes, matchIndexes + [testContent.count]).map { NSRange(location: $0, length: $1 - $0) }
         let classRanges = ranges[1 ..< ranges.count]
 
         let classes = zip(classNames, classRanges.map { (testContent as NSString).substring(with: $0) as NSString })

scripts/validate-headers.swift

@@ -72,7 +72,7 @@ let createdBy = try NSRegularExpression(pattern: "//  Created by .* on \\d+/\\d+
 let copyrightLine = try NSRegularExpression(pattern: "//  Copyright © (\\d+) Krunoslav Zaher. All rights reserved.", options: [])
 
 func validateRegexMatches(regularExpression: NSRegularExpression, content: String) -> ([String], Bool) {
-    let range = NSRange(location: 0, length: content.characters.count)
+    let range = NSRange(location: 0, length: content.count)
     let matches = regularExpression.matches(in: content, options: [], range: range)
 
     if matches.count == 0 {