Skip to content

adds Version library to fix parsing of -alpha.1 type versions #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
g-Off merged 1 commit into from
Oct 29, 2019
Merged

adds Version library to fix parsing of -alpha.1 type versions #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ let package = Package(
targets: ["XcodeProject"]),
],
dependencies: [
.package(url: "https://github.com/g-Off/ObjectCoder.git", .exact("0.1.0"))
.package(url: "https://github.com/g-Off/ObjectCoder.git", .exact("0.1.0")),
.package(url: "https://github.com/mxcl/Version.git", from: "1.0.0")
],
targets: [
.target(
name: "XcodeProject",
dependencies: ["ObjectCoder"]),
dependencies: ["ObjectCoder", "Version"]),
.testTarget(
name: "XcodeProjectTests",
dependencies: ["XcodeProject"]),
Expand Down
6 changes: 5 additions & 1 deletion Sources/XcodeProject/Objects+Extensions/PBXReference+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ public extension PBXReference {
return nil
}

enum SortOption: String {
enum SortOption: String, CustomStringConvertible, CaseIterable {
public var description: String {
return rawValue
}

case name
case type

Expand Down
28 changes: 1 addition & 27 deletions Sources/XcodeProject/Objects/Swift Package/XCRemoteSwiftPackageReference.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import Version

public final class XCRemoteSwiftPackageReference: XCSwiftPackageReference {
public enum Requirement: Encodable {
Expand All @@ -17,33 +18,6 @@ public final class XCRemoteSwiftPackageReference: XCSwiftPackageReference {
case branch
case revision
}

public struct Version: CustomStringConvertible, Encodable {
let major: Int
let minor: Int
let patch: Int

public init(major: Int, minor: Int, patch: Int) {
self.major = major
self.minor = minor
self.patch = patch
}

init?(_ value: String) {
var integerValues = value.components(separatedBy: ".").compactMap { Int($0) }
guard integerValues.count == 3 else { return nil }
self.init(major: integerValues.removeFirst(), minor: integerValues.removeFirst(), patch: integerValues.removeFirst())
}

public var description: String {
return "\(major).\(minor).\(patch)"
}

public func encode(to encoder: Encoder) throws {
var container = encoder.singleValueContainer()
try container.encode(description)
}
}

public struct GitHash: Encodable, CustomStringConvertible {
private var value: String
Expand Down