diff --git a/EFQRCode.podspec b/EFQRCode.podspec index 29d6fef9..3e657db6 100644 --- a/EFQRCode.podspec +++ b/EFQRCode.podspec @@ -17,27 +17,16 @@ Pod::Spec.new do |s| s.ios.deployment_target = '9.0' s.osx.deployment_target = '10.10' s.tvos.deployment_target = '9.0' + s.watchos.deployment_target = '2.0' s.swift_version = '5.0' s.requires_arc = true + s.frameworks = 'ImageIO', 'CoreGraphics', 'Foundation' s.ios.framework = 'CoreImage' s.osx.framework = 'CoreImage' s.tvos.framework = 'CoreImage' + s.watchos.dependency 'swift_qrcodejs', '~> 1.2.0' - s.default_subspec = 'Core' - - s.subspec 'Core' do |core| - core.source_files = 'Source/**/*.{h,swift}' - end - - s.subspec 'watchOS' do |watchos| - watchos.ios.deployment_target = '9.0' - watchos.osx.deployment_target = '10.10' - watchos.tvos.deployment_target = '9.0' - watchos.watchos.deployment_target = '2.0' - - watchos.source_files = 'Source/**/*.{h,swift}' - watchos.dependency 'swift_qrcodejs', '~> 1.2.0' - end + s.source_files = 'Source/**/*.{h,swift}' end diff --git a/Examples/iOS/iOS Example.xcodeproj/xcshareddata/xcschemes/watchOS Example.xcscheme b/Examples/iOS/iOS Example.xcodeproj/xcshareddata/xcschemes/watchOS Example.xcscheme index 0508b11f..ead71233 100644 --- a/Examples/iOS/iOS Example.xcodeproj/xcshareddata/xcschemes/watchOS Example.xcscheme +++ b/Examples/iOS/iOS Example.xcodeproj/xcshareddata/xcschemes/watchOS Example.xcscheme @@ -63,10 +63,8 @@ debugDocumentVersioning = "YES" debugServiceExtension = "internal" allowLocationSimulation = "YES"> - + - + - + - - - - - + diff --git a/Package@swift-5.3.swift b/Package@swift-5.3.swift new file mode 100644 index 00000000..f739cb97 --- /dev/null +++ b/Package@swift-5.3.swift @@ -0,0 +1,48 @@ +// swift-tools-version:5.3 +// +// Package.swift +// EFQRCode +// +// Created by EyreFree on 2017/4/1. +// +// Copyright (c) 2017 EyreFree +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +import PackageDescription + +let package = Package( + name: "EFQRCode", + products: [ + .library(name: "EFQRCode", targets: ["EFQRCode"]) + ], + dependencies: [ + .package(url: "https://github.com/ApolloZhu/swift_qrcodejs.git", + .upToNextMinor(from: "1.2.0")) + ], + targets: [ + .target(name: "EFQRCode", + dependencies: [ + .product(name: "swift_qrcodejs", package: "swift_qrcodejs", + condition: .when(platforms: [.watchOS])), + ], + path: "Source") + ], + swiftLanguageVersions: [.v5] +)