diff --git a/.gitignore b/.gitignore index abdeb51..e9274d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,13 @@ .DS_Store -/.build -/Packages +/.build-ubuntu/* +/*.xcodeproj + CommonCrypto -/Package.pins -/Package.resolved # Swift Package Manager # -# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. -# Packages/ -.build/ -.swiftpm +/Packages +/Package.resolved +/build +/.build +/.swiftpm diff --git a/.swift-version b/.swift-version deleted file mode 100644 index a75b92f..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -5.1 diff --git a/BlueRSA.podspec b/BlueRSA.podspec index 10de70b..785f2ea 100644 --- a/BlueRSA.podspec +++ b/BlueRSA.podspec @@ -1,20 +1,28 @@ Pod::Spec.new do |s| -s.name = "BlueRSA" -s.version = "1.0.203" -s.summary = "Swift cross-platform RSA crypto library using CommonCrypto/libcrypto via Package Manager." -s.homepage = "https://github.com/Kitura/BlueRSA" -s.license = { :type => "Apache License, Version 2.0" } -s.author = "IBM and the Kitura project authors" -s.module_name = 'CryptorRSA' -s.swift_version = "5.0.2" -s.requires_arc = true -s.osx.deployment_target = "11.5" -s.ios.deployment_target = "14.5" -s.tvos.deployment_target = "14.5" -s.watchos.deployment_target = "7.5" -s.source = { :git => "https://github.com/Kitura/BlueRSA.git", :tag => s.version } -s.source_files = "Sources/CryptorRSA/*.swift" -s.pod_target_xcconfig = { -'SWIFT_VERSION' => '5.0', -} + + s.name = "BlueRSA" + s.module_name = 'CryptorRSA' + s.version = "1.0.203" + s.cocoapods_version = '~> 1.16' + s.summary = "Swift cross-platform RSA crypto library using CommonCrypto/libcrypto via Package Manager." + s.homepage = "https://github.com/Kitura/BlueRSA" + s.license = { + :type => "Apache License, Version 2.0" + } + s.author = "IBM and the Kitura project authors" + + s.source = { + :git => "https://github.com/Kitura/BlueRSA.git", + :tag => s.version + } + + s.swift_version = "5.8" + + s.ios.deployment_target = "14.5" + s.osx.deployment_target = "11.5" + s.tvos.deployment_target = "14.5" + s.watchos.deployment_target = "8.0" + + s.source_files = "Sources/CryptorRSA/*.swift" + end diff --git a/Package@swift-4.0.swift b/Package@swift-4.0.swift deleted file mode 100644 index bbe4886..0000000 --- a/Package@swift-4.0.swift +++ /dev/null @@ -1,68 +0,0 @@ -// swift-tools-version:4.0 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -// -// Package.swift -// CryptorRSA -// -// Copyright © 2017-2020 IBM and the authors of the Kitura project. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import PackageDescription - -var targetDependencies: [Target.Dependency] = [] - -#if !os(Linux) - - let CryptoLibUrl = "https://github.com/Kitura/CommonCrypto.git" - let CryptoLibVersion: Package.Dependency.Requirement = .upToNextMajor(from: "1.0.200") - -#elseif os(Linux) - - let CryptoLibUrl = "https://github.com/Kitura/OpenSSL.git" - let CryptoLibVersion: Package.Dependency.Requirement = .upToNextMajor(from: "1.0.200") - targetDependencies.append(.byName(name: "OpenSSL")) - -#else - - fatalError("Unsupported OS") - -#endif - -let package = Package( - name: "CryptorRSA", - products: [ - // Products define the executables and libraries produced by a package, and make them visible to other packages. - .library( - name: "CryptorRSA", - targets: ["CryptorRSA"] - ) - ], - dependencies: [ - .package(url: CryptoLibUrl, CryptoLibVersion) - ], - 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: "CryptorRSA", - dependencies: targetDependencies - ), - .testTarget( - name: "CryptorRSATests", - dependencies: ["CryptorRSA"] - ) - ] -) diff --git a/Package@swift-4.1.swift b/Package@swift-4.1.swift deleted file mode 100644 index bbe4886..0000000 --- a/Package@swift-4.1.swift +++ /dev/null @@ -1,68 +0,0 @@ -// swift-tools-version:4.0 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -// -// Package.swift -// CryptorRSA -// -// Copyright © 2017-2020 IBM and the authors of the Kitura project. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import PackageDescription - -var targetDependencies: [Target.Dependency] = [] - -#if !os(Linux) - - let CryptoLibUrl = "https://github.com/Kitura/CommonCrypto.git" - let CryptoLibVersion: Package.Dependency.Requirement = .upToNextMajor(from: "1.0.200") - -#elseif os(Linux) - - let CryptoLibUrl = "https://github.com/Kitura/OpenSSL.git" - let CryptoLibVersion: Package.Dependency.Requirement = .upToNextMajor(from: "1.0.200") - targetDependencies.append(.byName(name: "OpenSSL")) - -#else - - fatalError("Unsupported OS") - -#endif - -let package = Package( - name: "CryptorRSA", - products: [ - // Products define the executables and libraries produced by a package, and make them visible to other packages. - .library( - name: "CryptorRSA", - targets: ["CryptorRSA"] - ) - ], - dependencies: [ - .package(url: CryptoLibUrl, CryptoLibVersion) - ], - 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: "CryptorRSA", - dependencies: targetDependencies - ), - .testTarget( - name: "CryptorRSATests", - dependencies: ["CryptorRSA"] - ) - ] -) diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift deleted file mode 100644 index b785a7b..0000000 --- a/Package@swift-4.2.swift +++ /dev/null @@ -1,58 +0,0 @@ -// swift-tools-version:4.2 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -// -// Package.swift -// CryptorRSA -// -// Copyright © 2017-2020 IBM and the authors of the Kitura project. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import PackageDescription - -var dependencies: [Package.Dependency] = [] -var targetDependencies: [Target.Dependency] = [] - - -#if os(Linux) - - dependencies.append(.package(url: "https://github.com/Kitura/OpenSSL.git", from: "2.2.200")) - targetDependencies.append(.byName(name: "OpenSSL")) - -#endif - -let package = Package( - name: "CryptorRSA", - products: [ - // Products define the executables and libraries produced by a package, and make them visible to other packages. - .library( - name: "CryptorRSA", - targets: ["CryptorRSA"] - ) - ], - dependencies: dependencies, - 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: "CryptorRSA", - dependencies: targetDependencies - ), - .testTarget( - name: "CryptorRSATests", - dependencies: ["CryptorRSA"] - ) - ] -)