Skip to content

Create universal framework to support watchOS & tvOS by using xcconfigs. #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 30, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ DerivedData
*.xcuserstate

Carthage/Build
.build
Packages/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "Carthage/Checkouts/Async"]
path = Carthage/Checkouts/Async
url = https://github.com/duemunk/Async.git
[submodule "Carthage/Checkouts/xcconfigs"]
path = Carthage/Checkouts/xcconfigs
url = https://github.com/mrackwitz/xcconfigs.git
3 changes: 2 additions & 1 deletion Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
github "Alamofire/Alamofire" ~> 3.1.3
github "duemunk/Async" ~> 1.6.4
github "duemunk/Async" ~> 1.6.4
github "mrackwitz/xcconfigs"
3 changes: 2 additions & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
github "Alamofire/Alamofire" "3.1.3"
github "Alamofire/Alamofire" "3.1.5"
github "duemunk/Async" "1.6.4"
github "mrackwitz/xcconfigs" "3.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Alamofire
Submodule Alamofire updated 59 files
+3 −0 .gitignore
+10 −12 .travis.yml
+1 −1 Alamofire.podspec
+366 −94 Alamofire.xcodeproj/project.pbxproj
+2 −2 Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire OSX.xcscheme
+2 −2 Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire iOS.xcscheme
+2 −2 Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire tvOS.xcscheme
+56 −1 CHANGELOG.md
+1 −1 Example/AppDelegate.swift
+1 −1 Example/DetailViewController.swift
+1 −1 Example/MasterViewController.swift
+1 −1 LICENSE
+27 −0 Package.swift
+6 −4 README.md
+1 −1 Source/Alamofire.h
+1 −1 Source/Alamofire.swift
+1 −1 Source/Download.swift
+1 −1 Source/Error.swift
+1 −1 Source/Info-tvOS.plist
+1 −1 Source/Info.plist
+9 −24 Source/Manager.swift
+1 −1 Source/MultipartFormData.swift
+2 −2 Source/ParameterEncoding.swift
+12 −10 Source/Request.swift
+1 −1 Source/Response.swift
+1 −1 Source/ResponseSerialization.swift
+1 −1 Source/Result.swift
+7 −10 Source/ServerTrustPolicy.swift
+1 −1 Source/Stream.swift
+1 −1 Source/Upload.swift
+1 −1 Source/Validation.swift
+1 −1 Tests/AuthenticationTests.swift
+1 −1 Tests/BaseTestCase.swift
+1 −1 Tests/CacheTests.swift
+1 −1 Tests/DownloadTests.swift
+1 −1 Tests/ManagerTests.swift
+1 −1 Tests/MultipartFormDataTests.swift
+1 −1 Tests/NSURLSessionConfiguration+AlamofireTests.swift
+25 −7 Tests/ParameterEncodingTests.swift
+12 −0 Tests/RequestTests.swift
+ Tests/Resources/Certificates/disig.sk/intermediate-ca-disig.cer
+ Tests/Resources/Certificates/disig.sk/root-ca-disig.cer
+ Tests/Resources/Certificates/disig.sk/testssl-expire.disig.sk.cer
+ Tests/Resources/Certificates/selfSignedAndMalformedCerts/certDER.cer
+ Tests/Resources/Certificates/selfSignedAndMalformedCerts/certDER.crt
+ Tests/Resources/Certificates/selfSignedAndMalformedCerts/certDER.der
+24 −0 Tests/Resources/Certificates/selfSignedAndMalformedCerts/certPEM.cer
+24 −0 Tests/Resources/Certificates/selfSignedAndMalformedCerts/certPEM.crt
+ Tests/Resources/Certificates/selfSignedAndMalformedCerts/keyDER.der
+ Tests/Resources/Certificates/selfSignedAndMalformedCerts/randomGibberish.crt
+1 −1 Tests/ResponseSerializationTests.swift
+1 −1 Tests/ResponseTests.swift
+1 −1 Tests/ResultTests.swift
+31 −1 Tests/ServerTrustPolicyTests.swift
+1 −1 Tests/String+AlamofireTests.swift
+1 −1 Tests/TLSEvaluationTests.swift
+1 −1 Tests/URLProtocolTests.swift
+1 −1 Tests/UploadTests.swift
+1 −1 Tests/ValidationTests.swift
1 change: 1 addition & 0 deletions Carthage/Checkouts/xcconfigs
Submodule xcconfigs added at 6b2682
13 changes: 13 additions & 0 deletions Configurations/Base.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// Base.xcconfig
// SwiftTask
//
// Created by Yasuhiro Inami on 2016-01-30.
// Copyright © 2015 Yasuhiro Inami. All rights reserved.
//

CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer;
MACOSX_DEPLOYMENT_TARGET = 10.9;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
11 changes: 11 additions & 0 deletions Configurations/Debug.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Debug.xcconfig
// SwiftTask
//
// Created by Yasuhiro Inami on 2016-01-30.
// Copyright © 2015 Yasuhiro Inami. All rights reserved.
//

#include "Base.xcconfig"

SWIFT_OPTIMIZATION_LEVEL = -Onone;
11 changes: 11 additions & 0 deletions Configurations/Release.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Release.xcconfig
// SwiftTask
//
// Created by Yasuhiro Inami on 2016-01-30.
// Copyright © 2015 Yasuhiro Inami. All rights reserved.
//

#include "Base.xcconfig"

SWIFT_OPTIMIZATION_LEVEL = -Owholemodule;
1 change: 1 addition & 0 deletions SwiftTask.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ Pod::Spec.new do |s|

s.osx.deployment_target = '10.9'
s.ios.deployment_target = '8.0'
s.watchos.deployment_target = '2.0'
s.tvos.deployment_target = '9.0'
end
254 changes: 86 additions & 168 deletions SwiftTask.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

99 changes: 0 additions & 99 deletions SwiftTask.xcodeproj/xcshareddata/xcschemes/SwiftTask-iOS.xcscheme

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "1F46DED3199EDF1000F97868"
BuildableName = "SwiftTask.framework"
BlueprintName = "SwiftTask-OSX"
BlueprintName = "SwiftTask"
ReferencedContainer = "container:SwiftTask.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -44,19 +44,19 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "1F46DED3199EDF1000F97868"
BuildableName = "SwiftTask.framework"
BlueprintName = "SwiftTask-OSX"
BlueprintName = "SwiftTask"
ReferencedContainer = "container:SwiftTask.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
Expand All @@ -66,25 +66,25 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "1F46DED3199EDF1000F97868"
BuildableName = "SwiftTask.framework"
BlueprintName = "SwiftTask-OSX"
BlueprintName = "SwiftTask"
ReferencedContainer = "container:SwiftTask.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1F46DED3199EDF1000F97868"
BuildableName = "SwiftTask.framework"
BlueprintName = "SwiftTask-OSX"
BlueprintName = "SwiftTask"
ReferencedContainer = "container:SwiftTask.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
11 changes: 6 additions & 5 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
machine:
xcode:
version: "7.1"
version: "7.2"

checkout:
post:
- git submodule sync
- git submodule update --init --recursive

test:
override:
- set -o pipefail &&
xcodebuild
-workspace "SwiftTask.xcworkspace"
-scheme "SwiftTask-OSX"
-scheme "SwiftTask"
clean build |
tee $CIRCLE_ARTIFACTS/xcode_raw-OSX.log |
xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-OSX.xml
Expand All @@ -21,8 +21,9 @@ test:
CODE_SIGNING_REQUIRED=NO
CODE_SIGN_IDENTITY=
PROVISIONING_PROFILE=
-workspace "SwiftTask.xcworkspace"
-scheme "SwiftTask-iOS"
-sdk iphonesimulator
-destination 'platform=iOS Simulator,OS=9.0,name=iPhone 6'
-scheme "SwiftTask"
clean build |
tee $CIRCLE_ARTIFACTS/xcode_raw-iOS.log |
xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-iOS.xml