Skip to content

Commit

Permalink
Merge pull request #94 from marcelofabri/swift-3.0
Browse files Browse the repository at this point in the history 
Swift 3.0
  • Loading branch information
@ugoArangino
ugoArangino authored Feb 6, 2017
2 parents 5d16b58 + 2131400 commit 5fc552d
Show file tree
Hide file tree
Showing 42 changed files with 476 additions and 555 deletions.
12 changes: 9 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,15 @@
[submodule "Carthage/Checkouts/Result"]
path = Carthage/Checkouts/Result
url = https://github.com/antitypical/Result.git
[submodule "Carthage/Checkouts/ReactiveCocoa"]
path = Carthage/Checkouts/ReactiveCocoa
url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
[submodule "Carthage/Checkouts/xcconfigs"]
path = Carthage/Checkouts/xcconfigs
url = https://github.com/jspahrsummers/xcconfigs.git
[submodule "Carthage/Checkouts/ReactiveSwift"]
path = Carthage/Checkouts/ReactiveSwift
url = https://github.com/ReactiveCocoa/ReactiveSwift.git
[submodule "Carthage/Checkouts/ReactiveObjC"]
path = Carthage/Checkouts/ReactiveObjC
url = https://github.com/ReactiveCocoa/ReactiveObjC.git
[submodule "Carthage/Checkouts/ReactiveObjCBridge"]
path = Carthage/Checkouts/ReactiveObjCBridge
url = https://github.com/ReactiveCocoa/ReactiveObjCBridge.git
5 changes: 3 additions & 2 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Core
github "antitypical/Result" ~> 2.0
github "antitypical/Result" ~> 3.1

# ReactiveCocoa
github "ReactiveCocoa/ReactiveCocoa" ~> 4.0
github "ReactiveCocoa/ReactiveSwift" "1.0.0"
github "ReactiveCocoa/ReactiveObjCBridge" "973aad9bfa730a947a33b182e1e67a6cdbef1ca1"
8 changes: 4 additions & 4 deletions Cartfile.private
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "jspahrsummers/xcconfigs" ~> 0.9
github "Quick/Quick" ~> 0.9
github "Quick/Nimble" ~> 4.1
github "AliSoftware/OHHTTPStubs" ~> 5.2.0
github "jspahrsummers/xcconfigs" ~> 0.10
github "Quick/Quick" ~> 0.10.0
github "Quick/Nimble" ~> 5.1.1
github "AliSoftware/OHHTTPStubs" "5.2.2-swift3"
14 changes: 8 additions & 6 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
github "Quick/Nimble" "v4.1.0"
github "AliSoftware/OHHTTPStubs" "5.2.0"
github "Quick/Quick" "v0.9.3"
github "antitypical/Result" "2.1.3"
github "jspahrsummers/xcconfigs" "0.9"
github "ReactiveCocoa/ReactiveCocoa" "v4.2.2"
github "Quick/Nimble" "v5.1.1"
github "AliSoftware/OHHTTPStubs" "5.2.2-swift3"
github "Quick/Quick" "v0.10.0"
github "ReactiveCocoa/ReactiveObjC" "2.1.2"
github "antitypical/Result" "3.1.0"
github "jspahrsummers/xcconfigs" "0.10"
github "ReactiveCocoa/ReactiveSwift" "1.0.0"
github "ReactiveCocoa/ReactiveObjCBridge" "973aad9bfa730a947a33b182e1e67a6cdbef1ca1"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 159 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/OHHTTPStubs
Submodule OHHTTPStubs updated 33 files
+90 −32 CHANGELOG.md
+6 −1 Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
+9 −9 Examples/ObjC/Podfile.lock
+2 −2 Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+9 −9 Examples/ObjC/Pods/Manifest.lock
+134 −122 Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
+2 −0 Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-acknowledgements.plist
+2 −8 Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-resources.sh
+1 −0 Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.debug.xcconfig
+1 −0 Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.release.xcconfig
+1 −1 Examples/Swift/AppDelegate.swift
+31 −31 Examples/Swift/MainViewController.swift
+15 −2 Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj
+1 −1 Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
+10 −10 Examples/Swift/Podfile.lock
+2 −2 Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+10 −10 Examples/Swift/Pods/Manifest.lock
+106 −92 Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
+1 −1 Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist
+2 −0 Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-umbrella.h
+2 −0 Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-acknowledgements.plist
+2 −8 Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-resources.sh
+2 −0 Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-umbrella.h
+1 −0 Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.debug.xcconfig
+1 −0 Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.release.xcconfig
+1 −1 OHHTTPStubs.podspec
+4 −12 OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
+2 −2 OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.h
+2 −0 OHHTTPStubs/Sources/NSURLSession/NSURLRequest+HTTPBodyTesting.m
+2 −2 OHHTTPStubs/Sources/OHHTTPStubsResponse.h
+38 −0 OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift
+11 −0 OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift
+18 −18 README.md
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 128 files
1 change: 0 additions & 1 deletion Carthage/Checkouts/ReactiveCocoa
Submodule ReactiveCocoa deleted from f214c9
1 change: 1 addition & 0 deletions Carthage/Checkouts/ReactiveObjC
Submodule ReactiveObjC added at 9747a9
1 change: 1 addition & 0 deletions Carthage/Checkouts/ReactiveObjCBridge
Submodule ReactiveObjCBridge added at 973aad
1 change: 1 addition & 0 deletions Carthage/Checkouts/ReactiveSwift
Submodule ReactiveSwift added at 7920f1
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Result
Submodule Result updated 12 files
+1 −1 .swift-version
+11 −19 .travis.yml
+38 −15 README.md
+2 −2 Result.podspec
+53 −25 Result.xcodeproj/project.pbxproj
+1 −1 Result/Info.plist
+97 −127 Result/Result.swift
+182 −0 Result/ResultProtocol.swift
+0 −264 Result/ResultType.swift
+2 −1 Tests/LinuxMain.swift
+1 −1 Tests/ResultTests/Info.plist
+61 −76 Tests/ResultTests/ResultTests.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
Submodule xcconfigs updated from d78854 to cc451b
6 changes: 3 additions & 3 deletions Heimdallr.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ Pod::Spec.new do |spec|
spec.summary = 'Easy to use OAuth 2 library, written in Swift'
spec.description = 'Heimdallr is an OAuth 2.0 client specifically designed for easy usage. It currently supports the resource owner password credentials grant flow, refreshing an access token as well as extension grants.'

spec.ios.deployment_target = '8.0'
spec.ios.deployment_target = '9.0'
spec.osx.deployment_target = '10.9'

spec.default_subspec = 'Core'

spec.subspec 'Core' do |subspec|
subspec.dependency 'Result', '~> 2.0'
subspec.dependency 'Result', '~> 3.0'
subspec.framework = 'Foundation'

subspec.source_files = 'Heimdallr/Core/*.swift'
end

spec.subspec 'ReactiveCocoa' do |subspec|
subspec.dependency 'Heimdallr/Core'
subspec.dependency 'ReactiveCocoa', '~> 4.0'
subspec.dependency 'ReactiveSwift', '~> 1.0'

subspec.source_files = 'Heimdallr/ReactiveCocoa/*.swift'
end
Expand Down
109 changes: 56 additions & 53 deletions Heimdallr.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

16 changes: 1 addition & 15 deletions Heimdallr.xcodeproj/xcshareddata/xcschemes/Heimdallr-iOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0700"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
Expand All @@ -15,20 +15,6 @@
</ExecutionAction>
</PreActions>
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EAD9FACE19D0EAB50031E006"
BuildableName = "Argo.framework"
BlueprintName = "Argo-iOS"
ReferencedContainer = "container:Carthage/Checkouts/Argo/Argo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
Expand Down
20 changes: 3 additions & 17 deletions Heimdallr.xcodeproj/xcshareddata/xcschemes/Heimdallr-macOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F89335531A4CE83000B88685"
BuildableName = "Argo.framework"
BlueprintName = "Argo-Mac"
ReferencedContainer = "container:Carthage/Checkouts/Argo/Argo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
Expand Down Expand Up @@ -58,7 +44,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "1F925EAC195C0D6300ED456B"
BuildableName = "Nimble.framework"
BlueprintName = "Nimble-OSX"
BlueprintName = "Nimble-macOS"
ReferencedContainer = "container:Carthage/Checkouts/Nimble/Nimble.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -86,7 +72,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DAEB6B8D1943873100289F44"
BuildableName = "Quick.framework"
BlueprintName = "Quick-OSX"
BlueprintName = "Quick-macOS"
ReferencedContainer = "container:Carthage/Checkouts/Quick/Quick.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down
38 changes: 26 additions & 12 deletions Heimdallr.xcodeproj/xcshareddata/xcschemes/ReactiveHeimdallr-iOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
Expand All @@ -14,10 +14,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EAD9FACE19D0EAB50031E006"
BuildableName = "Argo.framework"
BlueprintName = "Argo-iOS"
ReferencedContainer = "container:Carthage/Checkouts/Argo/Argo.xcodeproj">
BlueprintIdentifier = "D454807C1A957361009D7229"
BuildableName = "Result.framework"
BlueprintName = "Result-iOS"
ReferencedContainer = "container:Carthage/Checkouts/Result/Result.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -28,10 +28,24 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D454807C1A957361009D7229"
BuildableName = "Result.framework"
BlueprintName = "Result-iOS"
ReferencedContainer = "container:Carthage/Checkouts/Result/Result.xcodeproj">
BlueprintIdentifier = "D047260B19E49F82006002AA"
BuildableName = "ReactiveObjC.framework"
BlueprintName = "ReactiveObjC-iOS"
ReferencedContainer = "container:Carthage/Checkouts/ReactiveObjC/ReactiveObjC.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D047260B19E49F82006002AA"
BuildableName = "ReactiveSwift.framework"
BlueprintName = "ReactiveSwift-iOS"
ReferencedContainer = "container:Carthage/Checkouts/ReactiveSwift/ReactiveSwift.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -43,9 +57,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D047260B19E49F82006002AA"
BuildableName = "ReactiveCocoa.framework"
BlueprintName = "ReactiveCocoa-iOS"
ReferencedContainer = "container:Carthage/Checkouts/ReactiveCocoa/ReactiveCocoa.xcodeproj">
BuildableName = "ReactiveObjCBridge.framework"
BlueprintName = "ReactiveObjCBridge-iOS"
ReferencedContainer = "container:Carthage/Checkouts/ReactiveObjCBridge/ReactiveObjCBridge.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand Down
42 changes: 28 additions & 14 deletions Heimdallr.xcodeproj/xcshareddata/xcschemes/ReactiveHeimdallr-macOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
Expand All @@ -14,10 +14,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F89335531A4CE83000B88685"
BuildableName = "Argo.framework"
BlueprintName = "Argo-Mac"
ReferencedContainer = "container:Carthage/Checkouts/Argo/Argo.xcodeproj">
BlueprintIdentifier = "D45480561A9572F5009D7229"
BuildableName = "Result.framework"
BlueprintName = "Result-Mac"
ReferencedContainer = "container:Carthage/Checkouts/Result/Result.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -28,10 +28,24 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D45480561A9572F5009D7229"
BuildableName = "Result.framework"
BlueprintName = "Result-Mac"
ReferencedContainer = "container:Carthage/Checkouts/Result/Result.xcodeproj">
BlueprintIdentifier = "D04725E919E49ED7006002AA"
BuildableName = "ReactiveObjC.framework"
BlueprintName = "ReactiveObjC-macOS"
ReferencedContainer = "container:Carthage/Checkouts/ReactiveObjC/ReactiveObjC.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D04725E919E49ED7006002AA"
BuildableName = "ReactiveSwift.framework"
BlueprintName = "ReactiveSwift-macOS"
ReferencedContainer = "container:Carthage/Checkouts/ReactiveSwift/ReactiveSwift.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -43,9 +57,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D04725E919E49ED7006002AA"
BuildableName = "ReactiveCocoa.framework"
BlueprintName = "ReactiveCocoa-Mac"
ReferencedContainer = "container:Carthage/Checkouts/ReactiveCocoa/ReactiveCocoa.xcodeproj">
BuildableName = "ReactiveObjCBridge.framework"
BlueprintName = "ReactiveObjCBridge-macOS"
ReferencedContainer = "container:Carthage/Checkouts/ReactiveObjCBridge/ReactiveObjCBridge.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -72,7 +86,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "1F925EAC195C0D6300ED456B"
BuildableName = "Nimble.framework"
BlueprintName = "Nimble-OSX"
BlueprintName = "Nimble-macOS"
ReferencedContainer = "container:Carthage/Checkouts/Nimble/Nimble.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -100,7 +114,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DAEB6B8D1943873100289F44"
BuildableName = "Quick.framework"
BlueprintName = "Quick-OSX"
BlueprintName = "Quick-macOS"
ReferencedContainer = "container:Carthage/Checkouts/Quick/Quick.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down
12 changes: 9 additions & 3 deletions Heimdallr.xcworkspace/contents.xcworkspacedata
View file

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

Loading

0 comments on commit 5fc552d

Please sign in to comment.