diff --git a/Package.swift b/Package.swift index 26c76d06..c60fd000 100644 --- a/Package.swift +++ b/Package.swift @@ -1,26 +1,29 @@ -// swift-tools-version:5.0 +// swift-tools-version:5.9 import PackageDescription #if canImport(Compression) let targets: [Target] = [ - .target(name: "ZIPFoundation"), - .testTarget(name: "ZIPFoundationTests", dependencies: ["ZIPFoundation"]) + .target(name: "ReadiumZIPFoundation", + resources: [ + .copy("Resources/PrivacyInfo.xcprivacy") + ]), + .testTarget(name: "ReadiumZIPFoundationTests", dependencies: ["ReadiumZIPFoundation"]) ] #else let targets: [Target] = [ .systemLibrary(name: "CZLib", pkgConfig: "zlib", providers: [.brew(["zlib"]), .apt(["zlib"])]), - .target(name: "ZIPFoundation", dependencies: ["CZLib"], cSettings: [.define("_GNU_SOURCE", to: "1")]), - .testTarget(name: "ZIPFoundationTests", dependencies: ["ZIPFoundation"]) + .target(name: "ReadiumZIPFoundation", dependencies: ["CZLib"], cSettings: [.define("_GNU_SOURCE", to: "1")]), + .testTarget(name: "ReadiumZIPFoundationTests", dependencies: ["ReadiumZIPFoundation"]) ] #endif let package = Package( - name: "ZIPFoundation", + name: "ReadiumZIPFoundation", platforms: [ - .macOS(.v10_11), .iOS(.v9), .tvOS(.v9), .watchOS(.v2) + .macOS(.v10_13), .iOS(.v12), .tvOS(.v12), .watchOS(.v4), .visionOS(.v1) ], products: [ - .library(name: "ZIPFoundation", targets: ["ZIPFoundation"]) + .library(name: "ReadiumZIPFoundation", targets: ["ReadiumZIPFoundation"]) ], targets: targets, swiftLanguageVersions: [.v4, .v4_2, .v5] diff --git a/Package@swift-4.0.swift b/Package@swift-4.0.swift deleted file mode 100644 index 94e0c3e1..00000000 --- a/Package@swift-4.0.swift +++ /dev/null @@ -1,20 +0,0 @@ -// swift-tools-version:4.0 -import PackageDescription - -#if os(macOS) || os(iOS) || os(tvOS) || os(visionOS) || os(watchOS) -let dependencies: [Package.Dependency] = [] -#else -let dependencies: [Package.Dependency] = [.package(url: "https://github.com/IBM-Swift/CZlib.git", .exact("0.1.2"))] -#endif - -let package = Package( - name: "ZIPFoundation", - products: [ - .library(name: "ZIPFoundation", targets: ["ZIPFoundation"]) - ], - dependencies: dependencies, - targets: [ - .target(name: "ZIPFoundation"), - .testTarget(name: "ZIPFoundationTests", dependencies: ["ZIPFoundation"]) - ] -) diff --git a/Package@swift-4.1.swift b/Package@swift-4.1.swift deleted file mode 100644 index 12de7d20..00000000 --- a/Package@swift-4.1.swift +++ /dev/null @@ -1,20 +0,0 @@ -// swift-tools-version:4.1 -import PackageDescription - -#if canImport(Compression) -let dependencies: [Package.Dependency] = [] -#else -let dependencies: [Package.Dependency] = [.package(url: "https://github.com/IBM-Swift/CZlib.git", .exact("0.1.2"))] -#endif - -let package = Package( - name: "ZIPFoundation", - products: [ - .library(name: "ZIPFoundation", targets: ["ZIPFoundation"]) - ], - dependencies: dependencies, - targets: [ - .target(name: "ZIPFoundation"), - .testTarget(name: "ZIPFoundationTests", dependencies: ["ZIPFoundation"]) - ] -) diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift deleted file mode 100644 index 7aba4744..00000000 --- a/Package@swift-4.2.swift +++ /dev/null @@ -1,21 +0,0 @@ -// swift-tools-version:4.2 -import PackageDescription - -#if canImport(Compression) -let dependencies: [Package.Dependency] = [] -#else -let dependencies: [Package.Dependency] = [.package(url: "https://github.com/IBM-Swift/CZlib.git", .exact("0.1.2"))] -#endif - -let package = Package( - name: "ZIPFoundation", - products: [ - .library(name: "ZIPFoundation", targets: ["ZIPFoundation"]) - ], - dependencies: dependencies, - targets: [ - .target(name: "ZIPFoundation"), - .testTarget(name: "ZIPFoundationTests", dependencies: ["ZIPFoundation"]) - ], - swiftLanguageVersions: [.v4, .v4_2] -) diff --git a/Package@swift-5.9.swift b/Package@swift-5.9.swift deleted file mode 100644 index 8357a49d..00000000 --- a/Package@swift-5.9.swift +++ /dev/null @@ -1,30 +0,0 @@ -// swift-tools-version:5.9 -import PackageDescription - -#if canImport(Compression) -let targets: [Target] = [ - .target(name: "ZIPFoundation", - resources: [ - .copy("Resources/PrivacyInfo.xcprivacy") - ]), - .testTarget(name: "ZIPFoundationTests", dependencies: ["ZIPFoundation"]) -] -#else -let targets: [Target] = [ - .systemLibrary(name: "CZLib", pkgConfig: "zlib", providers: [.brew(["zlib"]), .apt(["zlib"])]), - .target(name: "ZIPFoundation", dependencies: ["CZLib"], cSettings: [.define("_GNU_SOURCE", to: "1")]), - .testTarget(name: "ZIPFoundationTests", dependencies: ["ZIPFoundation"]) -] -#endif - -let package = Package( - name: "ZIPFoundation", - platforms: [ - .macOS(.v10_13), .iOS(.v12), .tvOS(.v12), .watchOS(.v4), .visionOS(.v1) - ], - products: [ - .library(name: "ZIPFoundation", targets: ["ZIPFoundation"]) - ], - targets: targets, - swiftLanguageVersions: [.v4, .v4_2, .v5] -) diff --git a/ZIPFoundation.podspec b/ZIPFoundation.podspec index e3db735f..740fff85 100644 --- a/ZIPFoundation.podspec +++ b/ZIPFoundation.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| - s.name = 'ZIPFoundation' + s.name = 'ReadiumZIPFoundation' s.version = '0.9.19' s.license = 'MIT' s.summary = 'Effortless ZIP Handling in Swift' - s.homepage = 'https://github.com/weichsel/ZIPFoundation' + s.homepage = 'https://github.com/readium/ZIPFoundation' s.social_media_url = 'http://twitter.com/weichsel' s.authors = { 'Thomas Zoechling' => 'thomas@peakstep.com' } - s.source = { :git => 'https://github.com/weichsel/ZIPFoundation.git', :tag => s.version } + s.source = { :git => 'https://github.com/readium/ZIPFoundation.git', :tag => s.version } s.swift_versions = ['4.0', '4.2', '5.0'] s.ios.deployment_target = '12.0'