-
Notifications
You must be signed in to change notification settings - Fork 475
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #152 from tristanhimmelman/swift-3
Swift 3
- Loading branch information
Showing
18 changed files
with
625 additions
and
197 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| Pod::Spec.new do |s| | ||
|
|
||
| s.name = "AlamofireObjectMapper" | ||
| s.version = "3.0.2" | ||
| s.version = "4.0.0" | ||
| s.license = { :type => "MIT", :file => "LICENSE" } | ||
| s.summary = "An extension to Alamofire which automatically converts JSON response data into swift objects using ObjectMapper" | ||
| s.homepage = "https://github.com/tristanhimmelman/AlamofireObjectMapper" | ||
| s.author = { "Tristan Himmelman" => "[email protected]" } | ||
| s.source = { :git => 'https://github.com/tristanhimmelman/AlamofireObjectMapper.git', :tag => s.version.to_s } | ||
|
|
||
| s.ios.deployment_target = '8.0' | ||
| s.osx.deployment_target = '10.9' | ||
| s.ios.deployment_target = '9.0' | ||
| s.osx.deployment_target = '10.11' | ||
| s.watchos.deployment_target = '2.0' | ||
| s.tvos.deployment_target = '9.0' | ||
|
|
||
| s.requires_arc = 'true' | ||
| s.source_files = 'AlamofireObjectMapper/**/*.swift' | ||
| s.dependency 'Alamofire', '~> 3.2' | ||
| s.dependency 'ObjectMapper', '~> 1.0' | ||
| s.dependency 'Alamofire', '~> 4.0' | ||
| s.dependency 'ObjectMapper', '~> 2.0' | ||
| end |
Large diffs are not rendered by default.
Oops, something went wrong.
41 changes: 41 additions & 0 deletions
41
...eObjectMapper.xcodeproj/project.xcworkspace/xcshareddata/AlamofireObjectMapper.xccheckout
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>IDESourceControlProjectFavoriteDictionaryKey</key> | ||
| <false/> | ||
| <key>IDESourceControlProjectIdentifier</key> | ||
| <string>E216F167-6BBD-4B09-9721-39268CC4E710</string> | ||
| <key>IDESourceControlProjectName</key> | ||
| <string>AlamofireObjectMapper</string> | ||
| <key>IDESourceControlProjectOriginsDictionary</key> | ||
| <dict> | ||
| <key>D712610954CA9BFA7A6E793AC8CA9FD9B6557F56</key> | ||
| <string>https://github.com/tristanhimmelman/Alamofire-ObjectMapper.git</string> | ||
| </dict> | ||
| <key>IDESourceControlProjectPath</key> | ||
| <string>AlamofireObjectMapper.xcodeproj</string> | ||
| <key>IDESourceControlProjectRelativeInstallPathDictionary</key> | ||
| <dict> | ||
| <key>D712610954CA9BFA7A6E793AC8CA9FD9B6557F56</key> | ||
| <string>../..</string> | ||
| </dict> | ||
| <key>IDESourceControlProjectURL</key> | ||
| <string>https://github.com/tristanhimmelman/Alamofire-ObjectMapper.git</string> | ||
| <key>IDESourceControlProjectVersion</key> | ||
| <integer>111</integer> | ||
| <key>IDESourceControlProjectWCCIdentifier</key> | ||
| <string>D712610954CA9BFA7A6E793AC8CA9FD9B6557F56</string> | ||
| <key>IDESourceControlProjectWCConfigurations</key> | ||
| <array> | ||
| <dict> | ||
| <key>IDESourceControlRepositoryExtensionIdentifierKey</key> | ||
| <string>public.vcs.git</string> | ||
| <key>IDESourceControlWCCIdentifierKey</key> | ||
| <string>D712610954CA9BFA7A6E793AC8CA9FD9B6557F56</string> | ||
| <key>IDESourceControlWCCName</key> | ||
| <string>Alamofire-ObjectMapper</string> | ||
| </dict> | ||
| </array> | ||
| </dict> | ||
| </plist> |
44 changes: 44 additions & 0 deletions
44
...ectMapper.xcodeproj/project.xcworkspace/xcshareddata/AlamofireObjectMapper.xcscmblueprint
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| { | ||
| "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "D712610954CA9BFA7A6E793AC8CA9FD9B6557F56", | ||
| "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { | ||
|
|
||
| }, | ||
| "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { | ||
| "D712610954CA9BFA7A6E793AC8CA9FD9B6557F56" : 0, | ||
| "58AAB0051E2B4EEDF1845A552012E6D0EBAD9127" : 9223372036854775807, | ||
| "C9532DB34657C9B197EE3CA2A5C379A9162E6DF6" : 9223372036854775807, | ||
| "67620B5EFA902936DF04070AF595B76AB0333747" : 9223372036854775807 | ||
| }, | ||
| "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "E216F167-6BBD-4B09-9721-39268CC4E710", | ||
| "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { | ||
| "D712610954CA9BFA7A6E793AC8CA9FD9B6557F56" : "AlamofireObjectMapper\/", | ||
| "58AAB0051E2B4EEDF1845A552012E6D0EBAD9127" : "AlamofireObjectMapper\/Carthage\/Checkouts\/ObjectMapper\/", | ||
| "C9532DB34657C9B197EE3CA2A5C379A9162E6DF6" : "..\/..", | ||
| "67620B5EFA902936DF04070AF595B76AB0333747" : "AlamofireObjectMapper\/Carthage\/Checkouts\/Alamofire\/" | ||
| }, | ||
| "DVTSourceControlWorkspaceBlueprintNameKey" : "AlamofireObjectMapper", | ||
| "DVTSourceControlWorkspaceBlueprintVersion" : 204, | ||
| "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "AlamofireObjectMapper.xcodeproj", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ | ||
| { | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/github.com\/Hearst-DD\/ObjectMapper.git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "58AAB0051E2B4EEDF1845A552012E6D0EBAD9127" | ||
| }, | ||
| { | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/github.com\/Alamofire\/Alamofire.git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "67620B5EFA902936DF04070AF595B76AB0333747" | ||
| }, | ||
| { | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:5UMU\/sumu_ios.git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C9532DB34657C9B197EE3CA2A5C379A9162E6DF6" | ||
| }, | ||
| { | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/tristanhimmelman\/Alamofire-ObjectMapper.git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D712610954CA9BFA7A6E793AC8CA9FD9B6557F56" | ||
| } | ||
| ] | ||
| } |
2 changes: 1 addition & 1 deletion
2
AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper OSX.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper iOS.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
AlamofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper tvOS.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ofireObjectMapper.xcodeproj/xcshareddata/xcschemes/AlamofireObjectMapper watchOS.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
AlamofireObjectMapper.xcworkspace/xcshareddata/AlamofireObjectMapper.xccheckout
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>IDESourceControlProjectFavoriteDictionaryKey</key> | ||
| <false/> | ||
| <key>IDESourceControlProjectIdentifier</key> | ||
| <string>C7BE09AD-45C0-4DDF-AC80-A6D8717D2DCE</string> | ||
| <key>IDESourceControlProjectName</key> | ||
| <string>AlamofireObjectMapper</string> | ||
| <key>IDESourceControlProjectOriginsDictionary</key> | ||
| <dict> | ||
| <key>D712610954CA9BFA7A6E793AC8CA9FD9B6557F56</key> | ||
| <string>https://github.com/tristanhimmelman/Alamofire-ObjectMapper.git</string> | ||
| </dict> | ||
| <key>IDESourceControlProjectPath</key> | ||
| <string>AlamofireObjectMapper.xcworkspace</string> | ||
| <key>IDESourceControlProjectRelativeInstallPathDictionary</key> | ||
| <dict> | ||
| <key>D712610954CA9BFA7A6E793AC8CA9FD9B6557F56</key> | ||
| <string>..</string> | ||
| </dict> | ||
| <key>IDESourceControlProjectURL</key> | ||
| <string>https://github.com/tristanhimmelman/Alamofire-ObjectMapper.git</string> | ||
| <key>IDESourceControlProjectVersion</key> | ||
| <integer>111</integer> | ||
| <key>IDESourceControlProjectWCCIdentifier</key> | ||
| <string>D712610954CA9BFA7A6E793AC8CA9FD9B6557F56</string> | ||
| <key>IDESourceControlProjectWCConfigurations</key> | ||
| <array> | ||
| <dict> | ||
| <key>IDESourceControlRepositoryExtensionIdentifierKey</key> | ||
| <string>public.vcs.git</string> | ||
| <key>IDESourceControlWCCIdentifierKey</key> | ||
| <string>D712610954CA9BFA7A6E793AC8CA9FD9B6557F56</string> | ||
| <key>IDESourceControlWCCName</key> | ||
| <string>AlamofireObjectMapper</string> | ||
| </dict> | ||
| </array> | ||
| </dict> | ||
| </plist> |
37 changes: 37 additions & 0 deletions
37
AlamofireObjectMapper.xcworkspace/xcshareddata/AlamofireObjectMapper.xcscmblueprint
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| { | ||
| "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "D712610954CA9BFA7A6E793AC8CA9FD9B6557F56", | ||
| "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { | ||
|
|
||
| }, | ||
| "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { | ||
| "D712610954CA9BFA7A6E793AC8CA9FD9B6557F56" : 0, | ||
| "58AAB0051E2B4EEDF1845A552012E6D0EBAD9127" : 0, | ||
| "67620B5EFA902936DF04070AF595B76AB0333747" : 0 | ||
| }, | ||
| "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "C7BE09AD-45C0-4DDF-AC80-A6D8717D2DCE", | ||
| "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { | ||
| "D712610954CA9BFA7A6E793AC8CA9FD9B6557F56" : "AlamofireObjectMapper\/", | ||
| "58AAB0051E2B4EEDF1845A552012E6D0EBAD9127" : "AlamofireObjectMapper\/Carthage\/Checkouts\/ObjectMapper\/", | ||
| "67620B5EFA902936DF04070AF595B76AB0333747" : "AlamofireObjectMapper\/Carthage\/Checkouts\/Alamofire\/" | ||
| }, | ||
| "DVTSourceControlWorkspaceBlueprintNameKey" : "AlamofireObjectMapper", | ||
| "DVTSourceControlWorkspaceBlueprintVersion" : 204, | ||
| "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "AlamofireObjectMapper.xcworkspace", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ | ||
| { | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Hearst-DD\/ObjectMapper.git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "58AAB0051E2B4EEDF1845A552012E6D0EBAD9127" | ||
| }, | ||
| { | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Alamofire\/Alamofire.git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "67620B5EFA902936DF04070AF595B76AB0333747" | ||
| }, | ||
| { | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/tristanhimmelman\/Alamofire-ObjectMapper.git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", | ||
| "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D712610954CA9BFA7A6E793AC8CA9FD9B6557F56" | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.