diff --git a/Sources/apk/Common/ApkRequirement.swift b/Sources/apk/Common/ApkRequirement.swift index 29f99d1..7fb0638 100644 --- a/Sources/apk/Common/ApkRequirement.swift +++ b/Sources/apk/Common/ApkRequirement.swift @@ -14,7 +14,7 @@ internal struct ApkRequirement: Hashable { self.versionSpec = spec } - init(extract: String) throws(ParseError) { + init(extract: Substring) throws(ParseError) { var comparer: ComparatorBits = [] var dependStr = extract[...] let nameEnd: String.Index, versionStart: String.Index diff --git a/Sources/apk/Index/ApkIndexPackage.swift b/Sources/apk/Index/ApkIndexPackage.swift index 1959637..3c5952c 100644 --- a/Sources/apk/Index/ApkIndexPackage.swift +++ b/Sources/apk/Index/ApkIndexPackage.swift @@ -75,7 +75,7 @@ extension ApkIndexPackage { architecture = record.value case "D": do { - dependencies = try record.value.components(separatedBy: " ") + dependencies = try record.value.split(separator: " ") .map { .init(requirement: try .init(extract: $0)) } } catch { throw .badValue(key: record.key) } case "C": @@ -95,12 +95,12 @@ extension ApkIndexPackage { installedSize = value case "p": do { - provides = try record.value.components(separatedBy: " ") + provides = try record.value.split(separator: " ") .map { .init(requirement: try .init(extract: $0)) } } catch { throw .badValue(key: record.key) } case "i": do { - installIf = try record.value.components(separatedBy: " ") + installIf = try record.value.split(separator: " ") .map { .init(requirement: try .init(extract: $0)) } } catch { throw .badValue(key: record.key) } case "o":