From bc207ab2e367fbafef51a47b85a7e1eb2821ce57 Mon Sep 17 00:00:00 2001 From: Alsey Coleman Miller Date: Wed, 22 Nov 2017 02:44:46 -0500 Subject: [PATCH] Fixed for Swift 3.0.2 compatibility --- Package.pins | 2 +- Package.resolved | 18 +++++++++--------- Package.swift | 30 +++++++++--------------------- 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/Package.pins b/Package.pins index 99a0ad3..f20769f 100644 --- a/Package.pins +++ b/Package.pins @@ -17,7 +17,7 @@ "package": "CFreeType", "reason": null, "repositoryURL": "https://github.com/PureSwift/CFreeType.git", - "version": "1.0.3" + "version": "1.0.4" } ], "version": 1 diff --git a/Package.resolved b/Package.resolved index 4cb14e3..dd16c9d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,27 +5,27 @@ "package": "CCairo", "repositoryURL": "https://github.com/PureSwift/CCairo.git", "state": { - "branch": "master", - "revision": "9828dafe5d7d4df38cc81614416c52df1c707d7d", - "version": null + "branch": null, + "revision": "1bd46ac81056766182be22fccc2cdf0e457f042f", + "version": "1.1.1" } }, { "package": "CFontConfig", "repositoryURL": "https://github.com/PureSwift/CFontConfig.git", "state": { - "branch": "master", - "revision": "149b01e9a29e265f785dc6ab5003b4a6f1074a5f", - "version": null + "branch": null, + "revision": "e5bae817dbd1eb402f395d960485c52350b2bd88", + "version": "1.0.1" } }, { "package": "CFreeType", "repositoryURL": "https://github.com/PureSwift/CFreeType.git", "state": { - "branch": "master", - "revision": "5d65c8825addca5f30ff2c16e8b7e6f61562f618", - "version": null + "branch": null, + "revision": "079909dc68c13c700bb6bab3059ddf51f642b43a", + "version": "1.0.4" } } ] diff --git a/Package.swift b/Package.swift index c90009d..159743b 100644 --- a/Package.swift +++ b/Package.swift @@ -1,29 +1,17 @@ -// swift-tools-version:4.0 +// swift-tools-version:3.0.2 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( name: "Cairo", - products: [ - // Products define the executables and libraries produced by a package, and make them visible to other packages. - .library( - name: "Cairo", - targets: ["Cairo"]), - ], - dependencies: [ - .package(url: "https://github.com/PureSwift/CCairo.git", .branch("master")), - .package(url: "https://github.com/PureSwift/CFontConfig.git", .branch("master")), - .package(url: "https://github.com/PureSwift/CFreeType.git", .branch("master")) - ], targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages which this package depends on. - .target( - name: "Cairo", - dependencies: []), - .testTarget( - name: "CairoTests", - dependencies: ["Cairo"]), - ] + 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) + ] )