From 09725ea5989a3603fff5549d16618199d54b70b3 Mon Sep 17 00:00:00 2001 From: Mark Hughes Date: Wed, 13 Jul 2016 15:32:11 -0700 Subject: [PATCH] Added targets for watchOS and tvOS - Added additional targets for watchOS and tvOS platforms - Tests pass on tvOS - Changed the master `SwiftyRSA.h` file to pull in Foundation and not UIKit/Cocoa since those frameworks aren't needed - The current CI pipeline doesn't assume multiple targets/schemes, so I refactored `.travis.yml` to allow for AppleTV, iOS, and watchOS targets, and based on how Alamofire does theirs for multiple platform support - Updated `podspec` to show multiple platform support - Also raised iOS version to 8.3 since Travis platform doesn't seem to have support for iOS 8.0-8.2 --- .gitignore | 2 + .travis.yml | 65 ++- SwiftyRSA tvOS/Info.plist | 26 ++ SwiftyRSA tvOSTests/Info.plist | 24 ++ SwiftyRSA watchOS/Info.plist | 26 ++ SwiftyRSA.podspec | 6 +- SwiftyRSA.xcodeproj/project.pbxproj | 402 +++++++++++++++++- ...ftyRSA.xcscheme => SwiftyRSA iOS.xcscheme} | 11 +- .../xcschemes/SwiftyRSA tvOS.xcscheme | 99 +++++ .../xcschemes/SwiftyRSA watchOS.xcscheme | 80 ++++ SwiftyRSA/SwiftyRSA.h | 2 +- SwiftyRSATests/.DS_Store | Bin 6148 -> 0 bytes 12 files changed, 714 insertions(+), 29 deletions(-) create mode 100644 SwiftyRSA tvOS/Info.plist create mode 100644 SwiftyRSA tvOSTests/Info.plist create mode 100644 SwiftyRSA watchOS/Info.plist rename SwiftyRSA.xcodeproj/xcshareddata/xcschemes/{SwiftyRSA.xcscheme => SwiftyRSA iOS.xcscheme} (94%) create mode 100644 SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA tvOS.xcscheme create mode 100644 SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA watchOS.xcscheme delete mode 100644 SwiftyRSATests/.DS_Store diff --git a/.gitignore b/.gitignore index 4b7e96b..9d9cdfe 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ Carthage Carthage/Checkouts Carthage/Build + +.DS_Store diff --git a/.travis.yml b/.travis.yml index 8b37933..22a11b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,56 @@ language: objective-c osx_image: xcode7.3 -xcode_sdk: - - iphonesimulator8.1 - - iphonesimulator8.2 - - iphonesimulator8.3 - - iphonesimulator9.0 - - iphonesimulator9.1 - - iphonesimulator9.2 - - iphonesimulator9.3 +env: + global: + - LC_CTYPE=en_US.UTF-8 + - LANG=en_US.UTF-8 + - WORKSPACE=SwiftyRSA.xcworkspace + - IOS_FRAMEWORK_SCHEME="SwiftyRSA iOS" + - OSX_FRAMEWORK_SCHEME="SwiftyRSA OSX" + - TVOS_FRAMEWORK_SCHEME="SwiftyRSA tvOS" + - WATCHOS_FRAMEWORK_SCHEME="SwiftyRSA watchOS" + - IOS_SDK=iphonesimulator9.3 + - OSX_SDK=macosx10.11 + - TVOS_SDK=appletvsimulator9.2 + - WATCHOS_SDK=watchsimulator2.2 + # - EXAMPLE_SCHEME="iOS Example" + matrix: + # - DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES" + # - DESTINATION="OS=8.2,name=iPhone 5" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" + - DESTINATION="OS=8.3,name=iPhone 5S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" + - DESTINATION="OS=8.4,name=iPhone 6" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" + - DESTINATION="OS=9.0,name=iPhone 6" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" + - DESTINATION="OS=9.1,name=iPhone 6 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" + - DESTINATION="OS=9.2,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" + - DESTINATION="OS=9.3,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" + + - DESTINATION="OS=9.2,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" + + - DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO" + before_install: - - gem install scan -v '0.5.2' - - brew install carthage + - gem install xcpretty xcpretty-travis-formatter cocoapods --no-rdoc --no-ri --no-document --quiet + script: - - scan - - cd CarthageIntegrationTest && carthage bootstrap && xcodebuild -configuration Debug -project CarthageIntegrationTest.xcodeproj -sdk iphonesimulator - \ No newline at end of file + - set -o pipefail + - xcodebuild -version + - xcodebuild -showsdks + + # Build Framework in Debug and Run Tests if specified + - if [ $RUN_TESTS == "YES" ]; then + xcodebuild -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -f `xcpretty-travis-formatter`; + else + xcodebuild -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -f `xcpretty-travis-formatter`; + fi + + # Build Framework in Release and Run Tests if specified + - if [ $RUN_TESTS == "YES" ]; then + xcodebuild -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -f `xcpretty-travis-formatter`; + else + xcodebuild -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -f `xcpretty-travis-formatter`; + fi + + # Run `pod lib lint` if specified + - if [ $POD_LINT == "YES" ]; then + pod lib lint; + fi diff --git a/SwiftyRSA tvOS/Info.plist b/SwiftyRSA tvOS/Info.plist new file mode 100644 index 0000000..d3de8ee --- /dev/null +++ b/SwiftyRSA tvOS/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/SwiftyRSA tvOSTests/Info.plist b/SwiftyRSA tvOSTests/Info.plist new file mode 100644 index 0000000..ba72822 --- /dev/null +++ b/SwiftyRSA tvOSTests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/SwiftyRSA watchOS/Info.plist b/SwiftyRSA watchOS/Info.plist new file mode 100644 index 0000000..d3de8ee --- /dev/null +++ b/SwiftyRSA watchOS/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/SwiftyRSA.podspec b/SwiftyRSA.podspec index b81e659..c2cd2b0 100644 --- a/SwiftyRSA.podspec +++ b/SwiftyRSA.podspec @@ -17,6 +17,8 @@ Pod::Spec.new do |s| s.framework = "Security" s.requires_arc = true - s.platform = :ios, "8.0" - + + s.ios.deployment_target = '8.3' + s.tvos.deployment_target = '9.2' + s.watchos.deployment_target = '2.2' end diff --git a/SwiftyRSA.xcodeproj/project.pbxproj b/SwiftyRSA.xcodeproj/project.pbxproj index e7412cf..69d2411 100644 --- a/SwiftyRSA.xcodeproj/project.pbxproj +++ b/SwiftyRSA.xcodeproj/project.pbxproj @@ -7,6 +7,25 @@ objects = { /* Begin PBXBuildFile section */ + 934AB83C1D3707D200365679 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 934AB83B1D3707D200365679 /* Security.framework */; }; + 934AB85F1D370BF200365679 /* SwiftyRSA.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 934AB8551D370BF200365679 /* SwiftyRSA.framework */; }; + 934AB86C1D370C1400365679 /* NSData+SHA.h in Headers */ = {isa = PBXBuildFile; fileRef = BB8460AC1CC608F6006F802C /* NSData+SHA.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 934AB86D1D370C1400365679 /* SwiftyRSA.h in Headers */ = {isa = PBXBuildFile; fileRef = C03D827B1B45E649008711CF /* SwiftyRSA.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 934AB86E1D370C1400365679 /* NSData+SHA.h in Headers */ = {isa = PBXBuildFile; fileRef = BB8460AC1CC608F6006F802C /* NSData+SHA.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 934AB86F1D370C1400365679 /* SwiftyRSA.h in Headers */ = {isa = PBXBuildFile; fileRef = C03D827B1B45E649008711CF /* SwiftyRSA.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 934AB8701D370C1D00365679 /* NSData+SHA.m in Sources */ = {isa = PBXBuildFile; fileRef = BB8460AD1CC608F6006F802C /* NSData+SHA.m */; }; + 934AB8711D370C1D00365679 /* SwiftyRSA.swift in Sources */ = {isa = PBXBuildFile; fileRef = C03D82921B45E663008711CF /* SwiftyRSA.swift */; }; + 934AB8721D370C1E00365679 /* NSData+SHA.m in Sources */ = {isa = PBXBuildFile; fileRef = BB8460AD1CC608F6006F802C /* NSData+SHA.m */; }; + 934AB8731D370C1E00365679 /* SwiftyRSA.swift in Sources */ = {isa = PBXBuildFile; fileRef = C03D82921B45E663008711CF /* SwiftyRSA.swift */; }; + 934AB8751D370C6F00365679 /* SwiftyRSATests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C03D82881B45E649008711CF /* SwiftyRSATests.swift */; }; + 934AB8771D370C7500365679 /* SwiftyRSAObjcTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C01F96131C5AC3E300F232AC /* SwiftyRSAObjcTests.m */; }; + 934AB87E1D370C8600365679 /* swiftyrsa-private-headerless.pem in Resources */ = {isa = PBXBuildFile; fileRef = C0646A461CAF29E000587FF1 /* swiftyrsa-private-headerless.pem */; }; + 934AB87F1D370C8600365679 /* swiftyrsa-public-headerless.pem in Resources */ = {isa = PBXBuildFile; fileRef = C0646A471CAF29E000587FF1 /* swiftyrsa-public-headerless.pem */; }; + 934AB8801D370C8600365679 /* swiftyrsa-private.pem in Resources */ = {isa = PBXBuildFile; fileRef = C03D82961B45E886008711CF /* swiftyrsa-private.pem */; }; + 934AB8811D370C8600365679 /* swiftyrsa-public.der in Resources */ = {isa = PBXBuildFile; fileRef = C03D82971B45E886008711CF /* swiftyrsa-public.der */; }; + 934AB8821D370C8600365679 /* swiftyrsa-public.pem in Resources */ = {isa = PBXBuildFile; fileRef = C03D82981B45E886008711CF /* swiftyrsa-public.pem */; }; + 934AB8851D370CB300365679 /* TestUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0646A4A1CAF5A3D00587FF1 /* TestUtils.swift */; }; + 934AB8871D370F4F00365679 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 934AB8861D370F4F00365679 /* Security.framework */; }; BB8460AE1CC608F6006F802C /* NSData+SHA.h in Headers */ = {isa = PBXBuildFile; fileRef = BB8460AC1CC608F6006F802C /* NSData+SHA.h */; settings = {ATTRIBUTES = (Public, ); }; }; BB8460AF1CC608F6006F802C /* NSData+SHA.m in Sources */ = {isa = PBXBuildFile; fileRef = BB8460AD1CC608F6006F802C /* NSData+SHA.m */; }; C01F96141C5AC3E300F232AC /* SwiftyRSAObjcTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C01F96131C5AC3E300F232AC /* SwiftyRSAObjcTests.m */; }; @@ -23,6 +42,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 934AB8601D370BF200365679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03D826D1B45E649008711CF /* Project object */; + proxyType = 1; + remoteGlobalIDString = 934AB8541D370BF200365679; + remoteInfo = "SwiftyRSA tvOS"; + }; C03D82831B45E649008711CF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C03D826D1B45E649008711CF /* Project object */; @@ -33,6 +59,15 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 934AB83B1D3707D200365679 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 934AB83D1D3707DA00365679 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; + 934AB8481D370BDD00365679 /* SwiftyRSA.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftyRSA.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 934AB84C1D370BDD00365679 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 934AB8551D370BF200365679 /* SwiftyRSA.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftyRSA.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 934AB8591D370BF200365679 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 934AB85E1D370BF200365679 /* SwiftyRSATests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwiftyRSATests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 934AB8651D370BF200365679 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 934AB8861D370F4F00365679 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; BB8460AC1CC608F6006F802C /* NSData+SHA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+SHA.h"; sourceTree = ""; }; BB8460AD1CC608F6006F802C /* NSData+SHA.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+SHA.m"; sourceTree = ""; }; C01F96131C5AC3E300F232AC /* SwiftyRSAObjcTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SwiftyRSAObjcTests.m; sourceTree = ""; }; @@ -52,10 +87,34 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 934AB8441D370BDD00365679 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 934AB8511D370BF200365679 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 934AB8871D370F4F00365679 /* Security.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 934AB85B1D370BF200365679 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 934AB85F1D370BF200365679 /* SwiftyRSA.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; C03D82721B45E649008711CF /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 934AB83C1D3707D200365679 /* Security.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -70,11 +129,49 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 934AB8491D370BDD00365679 /* SwiftyRSA watchOS */ = { + isa = PBXGroup; + children = ( + 934AB84C1D370BDD00365679 /* Info.plist */, + ); + path = "SwiftyRSA watchOS"; + sourceTree = ""; + }; + 934AB8561D370BF200365679 /* SwiftyRSA tvOS */ = { + isa = PBXGroup; + children = ( + 934AB8591D370BF200365679 /* Info.plist */, + ); + path = "SwiftyRSA tvOS"; + sourceTree = ""; + }; + 934AB8621D370BF200365679 /* SwiftyRSA tvOSTests */ = { + isa = PBXGroup; + children = ( + 934AB8651D370BF200365679 /* Info.plist */, + ); + path = "SwiftyRSA tvOSTests"; + sourceTree = ""; + }; + 934AB8881D370F5400365679 /* Linked Frameworks */ = { + isa = PBXGroup; + children = ( + 934AB8861D370F4F00365679 /* Security.framework */, + 934AB83D1D3707DA00365679 /* Security.framework */, + 934AB83B1D3707D200365679 /* Security.framework */, + ); + name = "Linked Frameworks"; + sourceTree = ""; + }; C03D826C1B45E649008711CF = { isa = PBXGroup; children = ( C03D82781B45E649008711CF /* SwiftyRSA */, C03D82851B45E649008711CF /* SwiftyRSATests */, + 934AB8491D370BDD00365679 /* SwiftyRSA watchOS */, + 934AB8561D370BF200365679 /* SwiftyRSA tvOS */, + 934AB8621D370BF200365679 /* SwiftyRSA tvOSTests */, + 934AB8881D370F5400365679 /* Linked Frameworks */, C03D82771B45E649008711CF /* Products */, ); sourceTree = ""; @@ -84,6 +181,9 @@ children = ( C03D82761B45E649008711CF /* SwiftyRSA.framework */, C03D82811B45E649008711CF /* SwiftyRSATests.xctest */, + 934AB8481D370BDD00365679 /* SwiftyRSA.framework */, + 934AB8551D370BF200365679 /* SwiftyRSA.framework */, + 934AB85E1D370BF200365679 /* SwiftyRSATests.xctest */, ); name = Products; sourceTree = ""; @@ -143,6 +243,24 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 934AB8451D370BDD00365679 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 934AB86C1D370C1400365679 /* NSData+SHA.h in Headers */, + 934AB86D1D370C1400365679 /* SwiftyRSA.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 934AB8521D370BF200365679 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 934AB86E1D370C1400365679 /* NSData+SHA.h in Headers */, + 934AB86F1D370C1400365679 /* SwiftyRSA.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; C03D82731B45E649008711CF /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -155,9 +273,63 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - C03D82751B45E649008711CF /* SwiftyRSA */ = { + 934AB8471D370BDD00365679 /* SwiftyRSA watchOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 934AB84D1D370BDD00365679 /* Build configuration list for PBXNativeTarget "SwiftyRSA watchOS" */; + buildPhases = ( + 934AB8431D370BDD00365679 /* Sources */, + 934AB8441D370BDD00365679 /* Frameworks */, + 934AB8451D370BDD00365679 /* Headers */, + 934AB8461D370BDD00365679 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "SwiftyRSA watchOS"; + productName = "SwiftyRSA watchOS"; + productReference = 934AB8481D370BDD00365679 /* SwiftyRSA.framework */; + productType = "com.apple.product-type.framework"; + }; + 934AB8541D370BF200365679 /* SwiftyRSA tvOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 934AB8661D370BF200365679 /* Build configuration list for PBXNativeTarget "SwiftyRSA tvOS" */; + buildPhases = ( + 934AB8501D370BF200365679 /* Sources */, + 934AB8511D370BF200365679 /* Frameworks */, + 934AB8521D370BF200365679 /* Headers */, + 934AB8531D370BF200365679 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "SwiftyRSA tvOS"; + productName = "SwiftyRSA tvOS"; + productReference = 934AB8551D370BF200365679 /* SwiftyRSA.framework */; + productType = "com.apple.product-type.framework"; + }; + 934AB85D1D370BF200365679 /* SwiftyRSA tvOSTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 934AB8691D370BF200365679 /* Build configuration list for PBXNativeTarget "SwiftyRSA tvOSTests" */; + buildPhases = ( + 934AB85A1D370BF200365679 /* Sources */, + 934AB85B1D370BF200365679 /* Frameworks */, + 934AB85C1D370BF200365679 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 934AB8611D370BF200365679 /* PBXTargetDependency */, + ); + name = "SwiftyRSA tvOSTests"; + productName = "SwiftyRSA tvOSTests"; + productReference = 934AB85E1D370BF200365679 /* SwiftyRSATests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + C03D82751B45E649008711CF /* SwiftyRSA iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = C03D828C1B45E649008711CF /* Build configuration list for PBXNativeTarget "SwiftyRSA" */; + buildConfigurationList = C03D828C1B45E649008711CF /* Build configuration list for PBXNativeTarget "SwiftyRSA iOS" */; buildPhases = ( C03D82711B45E649008711CF /* Sources */, C03D82721B45E649008711CF /* Frameworks */, @@ -168,7 +340,7 @@ ); dependencies = ( ); - name = SwiftyRSA; + name = "SwiftyRSA iOS"; productName = SwiftyRSA; productReference = C03D82761B45E649008711CF /* SwiftyRSA.framework */; productType = "com.apple.product-type.framework"; @@ -201,6 +373,15 @@ LastUpgradeCheck = 0700; ORGANIZATIONNAME = Scoop; TargetAttributes = { + 934AB8471D370BDD00365679 = { + CreatedOnToolsVersion = 7.3.1; + }; + 934AB8541D370BF200365679 = { + CreatedOnToolsVersion = 7.3.1; + }; + 934AB85D1D370BF200365679 = { + CreatedOnToolsVersion = 7.3.1; + }; C03D82751B45E649008711CF = { CreatedOnToolsVersion = 6.3; }; @@ -221,13 +402,42 @@ projectDirPath = ""; projectRoot = ""; targets = ( - C03D82751B45E649008711CF /* SwiftyRSA */, + C03D82751B45E649008711CF /* SwiftyRSA iOS */, C03D82801B45E649008711CF /* SwiftyRSATests */, + 934AB8471D370BDD00365679 /* SwiftyRSA watchOS */, + 934AB8541D370BF200365679 /* SwiftyRSA tvOS */, + 934AB85D1D370BF200365679 /* SwiftyRSA tvOSTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 934AB8461D370BDD00365679 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 934AB8531D370BF200365679 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 934AB85C1D370BF200365679 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 934AB87F1D370C8600365679 /* swiftyrsa-public-headerless.pem in Resources */, + 934AB8821D370C8600365679 /* swiftyrsa-public.pem in Resources */, + 934AB8811D370C8600365679 /* swiftyrsa-public.der in Resources */, + 934AB87E1D370C8600365679 /* swiftyrsa-private-headerless.pem in Resources */, + 934AB8801D370C8600365679 /* swiftyrsa-private.pem in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; C03D82741B45E649008711CF /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -250,6 +460,34 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 934AB8431D370BDD00365679 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 934AB8711D370C1D00365679 /* SwiftyRSA.swift in Sources */, + 934AB8701D370C1D00365679 /* NSData+SHA.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 934AB8501D370BF200365679 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 934AB8731D370C1E00365679 /* SwiftyRSA.swift in Sources */, + 934AB8721D370C1E00365679 /* NSData+SHA.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 934AB85A1D370BF200365679 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 934AB8771D370C7500365679 /* SwiftyRSAObjcTests.m in Sources */, + 934AB8851D370CB300365679 /* TestUtils.swift in Sources */, + 934AB8751D370C6F00365679 /* SwiftyRSATests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; C03D82711B45E649008711CF /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -272,14 +510,134 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 934AB8611D370BF200365679 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 934AB8541D370BF200365679 /* SwiftyRSA tvOS */; + targetProxy = 934AB8601D370BF200365679 /* PBXContainerItemProxy */; + }; C03D82841B45E649008711CF /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C03D82751B45E649008711CF /* SwiftyRSA */; + target = C03D82751B45E649008711CF /* SwiftyRSA iOS */; targetProxy = C03D82831B45E649008711CF /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 934AB84E1D370BDD00365679 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NONNULL = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "SwiftyRSA watchOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.takescoop.SwiftyRSA-watchOS"; + PRODUCT_NAME = SwiftyRSA; + SDKROOT = watchos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 2.2; + }; + name = Debug; + }; + 934AB84F1D370BDD00365679 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NONNULL = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "SwiftyRSA watchOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.takescoop.SwiftyRSA-watchOS"; + PRODUCT_NAME = SwiftyRSA; + SDKROOT = watchos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 2.2; + }; + name = Release; + }; + 934AB8671D370BF200365679 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "SwiftyRSA tvOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.takescoop.SwiftyRSA-tvOS"; + PRODUCT_NAME = SwiftyRSA; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.2; + }; + name = Debug; + }; + 934AB8681D370BF200365679 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "SwiftyRSA tvOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.takescoop.SwiftyRSA-tvOS"; + PRODUCT_NAME = SwiftyRSA; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.2; + }; + name = Release; + }; + 934AB86A1D370BF200365679 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + INFOPLIST_FILE = "SwiftyRSA tvOSTests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.takescoop.SwiftyRSA-tvOSTests"; + PRODUCT_NAME = SwiftyRSATests; + SDKROOT = appletvos; + SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h"; + TVOS_DEPLOYMENT_TARGET = 9.2; + }; + name = Debug; + }; + 934AB86B1D370BF200365679 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + INFOPLIST_FILE = "SwiftyRSA tvOSTests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.takescoop.SwiftyRSA-tvOSTests"; + PRODUCT_NAME = SwiftyRSATests; + SDKROOT = appletvos; + SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h"; + TVOS_DEPLOYMENT_TARGET = 9.2; + }; + name = Release; + }; C03D828A1B45E649008711CF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -382,7 +740,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.takescoop.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = SwiftyRSA; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; @@ -400,8 +758,9 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.takescoop.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = SwiftyRSA; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; }; name = Release; }; @@ -443,6 +802,33 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 934AB84D1D370BDD00365679 /* Build configuration list for PBXNativeTarget "SwiftyRSA watchOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 934AB84E1D370BDD00365679 /* Debug */, + 934AB84F1D370BDD00365679 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 934AB8661D370BF200365679 /* Build configuration list for PBXNativeTarget "SwiftyRSA tvOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 934AB8671D370BF200365679 /* Debug */, + 934AB8681D370BF200365679 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 934AB8691D370BF200365679 /* Build configuration list for PBXNativeTarget "SwiftyRSA tvOSTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 934AB86A1D370BF200365679 /* Debug */, + 934AB86B1D370BF200365679 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; C03D82701B45E649008711CF /* Build configuration list for PBXProject "SwiftyRSA" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -452,7 +838,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C03D828C1B45E649008711CF /* Build configuration list for PBXNativeTarget "SwiftyRSA" */ = { + C03D828C1B45E649008711CF /* Build configuration list for PBXNativeTarget "SwiftyRSA iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( C03D828D1B45E649008711CF /* Debug */, diff --git a/SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA.xcscheme b/SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA iOS.xcscheme similarity index 94% rename from SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA.xcscheme rename to SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA iOS.xcscheme index 383f6e3..625519d 100644 --- a/SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA.xcscheme +++ b/SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA iOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C03D82751B45E649008711CF" BuildableName = "SwiftyRSA.framework" - BlueprintName = "SwiftyRSA" + BlueprintName = "SwiftyRSA iOS" ReferencedContainer = "container:SwiftyRSA.xcodeproj"> @@ -40,7 +40,8 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES"> @@ -58,7 +59,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C03D82751B45E649008711CF" BuildableName = "SwiftyRSA.framework" - BlueprintName = "SwiftyRSA" + BlueprintName = "SwiftyRSA iOS" ReferencedContainer = "container:SwiftyRSA.xcodeproj"> @@ -80,7 +81,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C03D82751B45E649008711CF" BuildableName = "SwiftyRSA.framework" - BlueprintName = "SwiftyRSA" + BlueprintName = "SwiftyRSA iOS" ReferencedContainer = "container:SwiftyRSA.xcodeproj"> @@ -98,7 +99,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "C03D82751B45E649008711CF" BuildableName = "SwiftyRSA.framework" - BlueprintName = "SwiftyRSA" + BlueprintName = "SwiftyRSA iOS" ReferencedContainer = "container:SwiftyRSA.xcodeproj"> diff --git a/SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA tvOS.xcscheme b/SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA tvOS.xcscheme new file mode 100644 index 0000000..d58afe6 --- /dev/null +++ b/SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA tvOS.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA watchOS.xcscheme b/SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA watchOS.xcscheme new file mode 100644 index 0000000..7d2b881 --- /dev/null +++ b/SwiftyRSA.xcodeproj/xcshareddata/xcschemes/SwiftyRSA watchOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SwiftyRSA/SwiftyRSA.h b/SwiftyRSA/SwiftyRSA.h index 2f335ef..0b97cf4 100644 --- a/SwiftyRSA/SwiftyRSA.h +++ b/SwiftyRSA/SwiftyRSA.h @@ -6,7 +6,7 @@ // Copyright (c) 2015 Scoop. All rights reserved. // -#import +@import Foundation; //! Project version number for SwiftyRSA. FOUNDATION_EXPORT double SwiftyRSAVersionNumber; diff --git a/SwiftyRSATests/.DS_Store b/SwiftyRSATests/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0