Skip to content

Redesign for Swift 2 #49

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.

Sign up for GitHub

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 46 commits into from
Jun 30, 2015
Merged

Redesign for Swift 2 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
8cf1116
Remove Assertions from dependencies to migrate to swift 2
ishkawa Jun 9, 2015
1029795
Just convert to Swift 2
ishkawa Jun 10, 2015
9740c6b
Express no option by array literal
ishkawa Jun 10, 2015
0008a4f
Disable CI until CircleCI supports Swift 2
ishkawa Jun 10, 2015
877863f
Start migrating to new design to optimized for Swift 2
ishkawa Jun 11, 2015
f2f11d5
More errors
ishkawa Jun 12, 2015
debcda1
Temp commit
ishkawa Jun 12, 2015
bb6b375
Fix tests
ishkawa Jun 13, 2015
e0ead8b
Rewrite URLEncodedSerialization using throw in Swift 2
ishkawa Jun 13, 2015
90c8ae6
Rewrite RequestBodyBuilder using throw
ishkawa Jun 13, 2015
9a8c467
Rewrite ResponseBodyParser using throw
ishkawa Jun 13, 2015
48c97ba
Update README
ishkawa Jun 13, 2015
3786697
Update MockAPI in tests
ishkawa Jun 19, 2015
9236f19
Fix typo
ishkawa Jun 19, 2015
e2117a4
Remove "build" from method name
ishkawa Jun 19, 2015
8af7ddd
More documentation in Request protocol
ishkawa Jun 19, 2015
58680ae
Remove APIKitErrorDomain
ishkawa Jun 19, 2015
bbdefa9
Remove default implementation of baseURL
ishkawa Jun 19, 2015
9864e60
Replace DemoApp with playground
ishkawa Jun 19, 2015
c02e0e2
Markup playground
ishkawa Jun 19, 2015
204f034
Rename file Method.swift -> HTTPMethod.swift
ishkawa Jun 19, 2015
0cf0f01
Reduce error types
ishkawa Jun 19, 2015
ce7e9e1
Update README
ishkawa Jun 19, 2015
2bae2d9
Refine errors
ishkawa Jun 20, 2015
d755227
Replace ugly code
ishkawa Jun 20, 2015
0477e91
Grammar
ishkawa Jun 20, 2015
8b65d07
Update README
ishkawa Jun 20, 2015
465c007
Merge branch 'master' into swift2
ishkawa Jun 20, 2015
961406e
Remove DemoApp completely
ishkawa Jun 23, 2015
17f42e2
Set product bundle identifier
ishkawa Jun 23, 2015
53bff00
Remove OTHER_SWIFT_FLAGS
ishkawa Jun 23, 2015
e963f67
Refactor error handling in closure of NSURLSessionTask
ishkawa Jun 23, 2015
ce975d3
Omit label of associated value in APIKitError
ishkawa Jun 23, 2015
14a0994
Use "Error" for name of error type instead of "Errors"
ishkawa Jun 23, 2015
45b62fc
Minor refactoring in URLEncodedSerialization
ishkawa Jun 23, 2015
a70960d
Omit objc_AssociationPolicy
ishkawa Jun 23, 2015
688eaaf
Set ENABLE_BITCODE YES
ishkawa Jun 23, 2015
ad5273f
Add comment about isValidJSONObject()
ishkawa Jun 23, 2015
b501b3b
Add Errors.swift to APIKit-Mac
ishkawa Jun 23, 2015
ef3d410
Change stringFromObject in URLEncodedSerialization to stringFromDicti…
ishkawa Jun 23, 2015
c34d70c
More detailed error in URLEncodedSerialization
ishkawa Jun 24, 2015
39d9ab2
Refine errors
ishkawa Jun 25, 2015
43c4708
Refactor completion handler
ishkawa Jun 26, 2015
199f952
Restore return value of sendRequest()
ishkawa Jun 28, 2015
2e03412
Update README and doc
ishkawa Jun 28, 2015
e4ffd12
Merge branch 'master' into swift2
ishkawa Jun 28, 2015
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
*.xcscmblueprint

# CocoaPods
#
Expand Down
15 changes: 3 additions & 12 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
[submodule "Carthage/Checkouts/Assertions"]
path = Carthage/Checkouts/Assertions
url = https://github.com/antitypical/Assertions.git
[submodule "Carthage/Checkouts/OHHTTPStubs"]
path = Carthage/Checkouts/OHHTTPStubs
url = https://github.com/AliSoftware/OHHTTPStubs.git
[submodule "Carthage/Checkouts/Box"]
path = Carthage/Checkouts/Box
url = https://github.com/robrix/Box.git
[submodule "Carthage/Checkouts/Result"]
path = Carthage/Checkouts/Result
url = https://github.com/antitypical/Result.git
[submodule "Carthage/Checkouts/Himotoki"]
path = Carthage/Checkouts/Himotoki
url = https://github.com/ikesyo/Himotoki.git
[submodule "Carthage/Checkouts/OHHTTPStubs"]
path = Carthage/Checkouts/OHHTTPStubs
url = https://github.com/AliSoftware/OHHTTPStubs.git
244 changes: 27 additions & 217 deletions APIKit.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion APIKit.xcodeproj/xcshareddata/xcschemes/APIKit-Mac.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,6 +26,7 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES"
buildConfiguration = "Release">
<Testables>
<TestableReference
Expand All @@ -48,6 +49,8 @@
ReferencedContainer = "container:APIKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
Expand All @@ -57,6 +60,7 @@
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
Expand Down
6 changes: 5 additions & 1 deletion APIKit.xcodeproj/xcshareddata/xcschemes/APIKit-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -40,6 +40,7 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES"
buildConfiguration = "Release">
<Testables>
<TestableReference
Expand All @@ -62,6 +63,8 @@
ReferencedContainer = "container:APIKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
Expand All @@ -71,6 +74,7 @@
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
Expand Down
86 changes: 0 additions & 86 deletions APIKit.xcodeproj/xcshareddata/xcschemes/DemoApp.xcscheme
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions APIKit.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading