From d5e12fa6eb43b8db8601bb908c2ed266098fd33d Mon Sep 17 00:00:00 2001 From: fwcd Date: Sat, 30 Mar 2019 21:56:50 +0100 Subject: [PATCH 1/5] Update Package.swift to Swift 4.2 --- Package.swift | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Package.swift b/Package.swift index 159743b..ed78a27 100644 --- a/Package.swift +++ b/Package.swift @@ -1,17 +1,18 @@ -// swift-tools-version:3.0.2 +// swift-tools-version:4.2 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( name: "Cairo", - targets: [ - Target( - name: "Cairo") - ], dependencies: [ - .Package(url: "https://github.com/PureSwift/CCairo.git", majorVersion: 1), - .Package(url: "https://github.com/PureSwift/CFontConfig.git", majorVersion: 1), - .Package(url: "https://github.com/PureSwift/CFreeType.git", majorVersion: 1) + .package(url: "https://github.com/PureSwift/CCairo.git", from: "1.0.0"), + .package(url: "https://github.com/PureSwift/CFontConfig.git", from: "1.0.0"), + .package(url: "https://github.com/PureSwift/CFreeType.git", from: "1.0.0") + ], + targets: [ + .target( + name: "Cairo" + ) ] ) From a8587302a9dc42602d6c3de3c62b63badcbc377a Mon Sep 17 00:00:00 2001 From: fwcd Date: Sat, 30 Mar 2019 21:59:02 +0100 Subject: [PATCH 2/5] Update C library versions to latest revisions --- Package.resolved | 12 ++++++------ Package.swift | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Package.resolved b/Package.resolved index dd16c9d..28cdf20 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/PureSwift/CCairo.git", "state": { "branch": null, - "revision": "1bd46ac81056766182be22fccc2cdf0e457f042f", - "version": "1.1.1" + "revision": "2051a137b52995d7795c0dc9c08cd2ea2a2b570c", + "version": null } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/PureSwift/CFontConfig.git", "state": { "branch": null, - "revision": "e5bae817dbd1eb402f395d960485c52350b2bd88", - "version": "1.0.1" + "revision": "f47c3ea87307478428df762dc2e181c12643a884", + "version": null } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/PureSwift/CFreeType.git", "state": { "branch": null, - "revision": "079909dc68c13c700bb6bab3059ddf51f642b43a", - "version": "1.0.4" + "revision": "a8c830218999af31691e154cecae783bae1f0ab9", + "version": null } } ] diff --git a/Package.swift b/Package.swift index ed78a27..2757863 100644 --- a/Package.swift +++ b/Package.swift @@ -6,9 +6,9 @@ import PackageDescription let package = Package( name: "Cairo", dependencies: [ - .package(url: "https://github.com/PureSwift/CCairo.git", from: "1.0.0"), - .package(url: "https://github.com/PureSwift/CFontConfig.git", from: "1.0.0"), - .package(url: "https://github.com/PureSwift/CFreeType.git", from: "1.0.0") + .package(url: "https://github.com/PureSwift/CCairo.git", .revision("2051a137b52995d7795c0dc9c08cd2ea2a2b570c")), + .package(url: "https://github.com/PureSwift/CFontConfig.git", .revision("f47c3ea87307478428df762dc2e181c12643a884")), + .package(url: "https://github.com/PureSwift/CFreeType.git", .revision("a8c830218999af31691e154cecae783bae1f0ab9")) ], targets: [ .target( From 6684b8b14142dcfe5508ca984208ae392190597e Mon Sep 17 00:00:00 2001 From: fwcd Date: Sat, 30 Mar 2019 22:02:00 +0100 Subject: [PATCH 3/5] Add CCairo, CFontConfig and CFreeType as target dependencies --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 2757863..962e852 100644 --- a/Package.swift +++ b/Package.swift @@ -12,7 +12,8 @@ let package = Package( ], targets: [ .target( - name: "Cairo" + name: "Cairo", + dependencies: ["CCairo", "CFontConfig", "CFreeType"] ) ] ) From 747bb150f3e47bf5ec1dafd3ea89cb0b07a70435 Mon Sep 17 00:00:00 2001 From: fwcd Date: Sat, 30 Mar 2019 22:32:20 +0100 Subject: [PATCH 4/5] Add 'products' section to Package.swift --- Package.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Package.swift b/Package.swift index 962e852..fc3077d 100644 --- a/Package.swift +++ b/Package.swift @@ -10,6 +10,9 @@ let package = Package( .package(url: "https://github.com/PureSwift/CFontConfig.git", .revision("f47c3ea87307478428df762dc2e181c12643a884")), .package(url: "https://github.com/PureSwift/CFreeType.git", .revision("a8c830218999af31691e154cecae783bae1f0ab9")) ], + products: [ + .library(name: "Cairo", targets: ["Cairo"]) + ], targets: [ .target( name: "Cairo", From 2e0a981dbe8d7599edd86fcc5544d66d1fd7e0ad Mon Sep 17 00:00:00 2001 From: fwcd Date: Sat, 30 Mar 2019 22:33:20 +0100 Subject: [PATCH 5/5] Moved 'products' section above 'dependencies' as required --- Package.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index fc3077d..06801c5 100644 --- a/Package.swift +++ b/Package.swift @@ -5,14 +5,14 @@ import PackageDescription let package = Package( name: "Cairo", + products: [ + .library(name: "Cairo", targets: ["Cairo"]) + ], dependencies: [ .package(url: "https://github.com/PureSwift/CCairo.git", .revision("2051a137b52995d7795c0dc9c08cd2ea2a2b570c")), .package(url: "https://github.com/PureSwift/CFontConfig.git", .revision("f47c3ea87307478428df762dc2e181c12643a884")), .package(url: "https://github.com/PureSwift/CFreeType.git", .revision("a8c830218999af31691e154cecae783bae1f0ab9")) ], - products: [ - .library(name: "Cairo", targets: ["Cairo"]) - ], targets: [ .target( name: "Cairo",