Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.

Commit 52df0b4

Browse files
thebarndogthebarndog
authored
Merge pull request #2 from startupthekid/hooks
Hooks
2 parents 80d008c + bde73a4 commit 52df0b4

28 files changed

+2110
-623
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ Carthage
3434
# `pod install` in .travis.yml
3535
#
3636
# Pods/
37+
/.env

‎.travis.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
language: objective-c
2+
osx_image: xcode8.3
3+
4+
cache:
5+
directories:
6+
- Carthage
7+
8+
before_install: true
9+
install:
10+
- rvm get stable || true
11+
- brew update || true
12+
- brew install carthage || true
13+
- carthage bootstrap --no-use-binaries --cache-builds || true
14+
before_script:
15+
- chmod +x ./script/build
16+
script:
17+
- script/build
18+
xcode_project: Feathers.xcodeproj
19+
matrix:
20+
include:
21+
- xcode_scheme: Feathers-macOS
22+
env:
23+
- XCODE_SDK=macosx
24+
- XCODE_ACTION="build test"
25+
- XCODE_DESTINATION="arch=x86_64"
26+
- xcode_scheme: Feathers-iOS
27+
env:
28+
- XCODE_SDK=iphonesimulator
29+
- XCODE_ACTION="build-for-testing test-without-building"
30+
- XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 6s"
31+
- xcode_scheme: Feathers-tvOS
32+
env:
33+
- XCODE_SDK=appletvsimulator
34+
- XCODE_ACTION="build-for-testing test-without-building"
35+
- XCODE_DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p"
36+
- script:
37+
- carthage build --no-skip-current --platform mac
38+
env:
39+
- JOB=CARTHAGE-macOS
40+
- script:
41+
- carthage build --no-skip-current --platform iOS
42+
env:
43+
- JOB=CARTHAGE-iOS
44+
- script:
45+
- carthage build --no-skip-current --platform tvOS
46+
env:
47+
- JOB=CARTHAGE-tvOS
48+
- script:
49+
- gem install cocoapods
50+
- pod repo update --silent
51+
- travis_wait 30 pod lib lint Feathers.podspec
52+
env:
53+
- JOB=PODSPEC

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
github "Alamofire/Alamofire"
22
github "ReactiveCocoa/ReactiveSwift"
33
github "ReactiveX/RxSwift"
4-
github "tidwall/SwiftWebSocket"
54
github "marketplacer/keychain-swift"
5+
github "socketio/socket.io-client-swift"

‎Cartfile.resolved‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ github "ReactiveX/RxSwift" "3.4.1"
66
github "antitypical/Result" "3.2.1"
77
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
88
github "marketplacer/keychain-swift" "8.0.3"
9-
github "tidwall/SwiftWebSocket" "2.6.5"
9+
github "socketio/socket.io-client-swift" "v9.0.0"

‎Feathers.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
Pod::Spec.new do |s|
22
s.name = "Feathers"
33
# Version goes here and will be used to access the git tag later on, once we have a first release.
4-
s.version = "1.0.1"
4+
s.version = "2.0.0"
55
s.summary = "Swift framework for interacting with Featherjs apis"
66
s.description = <<-DESC
77
Swift library for connecting to a FeathersJS backend.
88
99
ReactiveSwift and RxSwift extensions are available.
1010
DESC
11-
s.homepage = "https://github.com/startupthekid/feathers-ios"
11+
s.homepage = "https://github.com/startupthekid/feathers-swift"
1212
s.license = { :type => "MIT", :file => "LICENSE" }
1313
s.author = "startupthekid"
1414

1515
s.ios.deployment_target = "8.0"
1616
s.osx.deployment_target = "10.10"
1717
s.tvos.deployment_target = "9.0"
18-
s.source = { :git => "https://github.com/startupthekid/feathers-ios.git", :tag => "#{s.version}" }
18+
s.source = { :git => "https://github.com/startupthekid/feathers-swift.git", :tag => "#{s.version}" }
1919

2020
s.default_subspec = "Core"
2121

‎Feathers.xcodeproj/project.pbxproj‎

Lines changed: 849 additions & 454 deletions
Large diffs are not rendered by default.

‎Feathers.xcodeproj/xcshareddata/xcschemes/Feathers-iOS.xcscheme‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,49 +14,36 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "EA452A661EA2B14300427CEF"
17+
BlueprintIdentifier = "EAC0BCD11EC90FDB0049FB13"
1818
BuildableName = "Feathers.framework"
1919
BlueprintName = "Feathers-iOS"
2020
ReferencedContainer = "container:Feathers.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "NO"
26-
buildForProfiling = "NO"
27-
buildForArchiving = "NO"
28-
buildForAnalyzing = "NO">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "EABBADAE1EBE77C900522603"
32-
BuildableName = "FeathersTests-iOS.xctest"
33-
BlueprintName = "FeathersTests-iOS"
34-
ReferencedContainer = "container:Feathers.xcodeproj">
35-
</BuildableReference>
36-
</BuildActionEntry>
3723
</BuildActionEntries>
3824
</BuildAction>
3925
<TestAction
4026
buildConfiguration = "Debug"
4127
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4228
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
4431
<Testables>
4532
<TestableReference
4633
skipped = "NO">
4734
<BuildableReference
4835
BuildableIdentifier = "primary"
49-
BlueprintIdentifier = "EABBADAE1EBE77C900522603"
50-
BuildableName = "FeathersTests-iOS.xctest"
51-
BlueprintName = "FeathersTests-iOS"
36+
BlueprintIdentifier = "EAC0BCD91EC90FDB0049FB13"
37+
BuildableName = "Feathers-iOSTests.xctest"
38+
BlueprintName = "Feathers-iOSTests"
5239
ReferencedContainer = "container:Feathers.xcodeproj">
5340
</BuildableReference>
5441
</TestableReference>
5542
</Testables>
5643
<MacroExpansion>
5744
<BuildableReference
5845
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "EA452A661EA2B14300427CEF"
46+
BlueprintIdentifier = "EAC0BCD11EC90FDB0049FB13"
6047
BuildableName = "Feathers.framework"
6148
BlueprintName = "Feathers-iOS"
6249
ReferencedContainer = "container:Feathers.xcodeproj">
@@ -78,7 +65,7 @@
7865
<MacroExpansion>
7966
<BuildableReference
8067
BuildableIdentifier = "primary"
81-
BlueprintIdentifier = "EA452A661EA2B14300427CEF"
68+
BlueprintIdentifier = "EAC0BCD11EC90FDB0049FB13"
8269
BuildableName = "Feathers.framework"
8370
BlueprintName = "Feathers-iOS"
8471
ReferencedContainer = "container:Feathers.xcodeproj">
@@ -96,7 +83,7 @@
9683
<MacroExpansion>
9784
<BuildableReference
9885
BuildableIdentifier = "primary"
99-
BlueprintIdentifier = "EA452A661EA2B14300427CEF"
86+
BlueprintIdentifier = "EAC0BCD11EC90FDB0049FB13"
10087
BuildableName = "Feathers.framework"
10188
BlueprintName = "Feathers-iOS"
10289
ReferencedContainer = "container:Feathers.xcodeproj">

‎Feathers.xcodeproj/xcshareddata/xcschemes/Feathers-macOS.xcscheme‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,12 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "EA2ABD391EA2BA6F0099A091"
17+
BlueprintIdentifier = "EAC0BD0B1EC952A40049FB13"
1818
BuildableName = "Feathers.framework"
1919
BlueprintName = "Feathers-macOS"
2020
ReferencedContainer = "container:Feathers.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "NO"
26-
buildForProfiling = "NO"
27-
buildForArchiving = "NO"
28-
buildForAnalyzing = "NO">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "EABBAD781EBE73F800522603"
32-
BuildableName = "FeathersTests-macOS.xctest"
33-
BlueprintName = "FeathersTests-macOS"
34-
ReferencedContainer = "container:Feathers.xcodeproj">
35-
</BuildableReference>
36-
</BuildActionEntry>
3723
</BuildActionEntries>
3824
</BuildAction>
3925
<TestAction
@@ -42,11 +28,21 @@
4228
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4329
shouldUseLaunchSchemeArgsEnv = "YES">
4430
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "EAC0BD131EC952A40049FB13"
36+
BuildableName = "Feathers-macOSTests.xctest"
37+
BlueprintName = "Feathers-macOSTests"
38+
ReferencedContainer = "container:Feathers.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
4541
</Testables>
4642
<MacroExpansion>
4743
<BuildableReference
4844
BuildableIdentifier = "primary"
49-
BlueprintIdentifier = "EA2ABD391EA2BA6F0099A091"
45+
BlueprintIdentifier = "EAC0BD0B1EC952A40049FB13"
5046
BuildableName = "Feathers.framework"
5147
BlueprintName = "Feathers-macOS"
5248
ReferencedContainer = "container:Feathers.xcodeproj">
@@ -68,7 +64,7 @@
6864
<MacroExpansion>
6965
<BuildableReference
7066
BuildableIdentifier = "primary"
71-
BlueprintIdentifier = "EA2ABD391EA2BA6F0099A091"
67+
BlueprintIdentifier = "EAC0BD0B1EC952A40049FB13"
7268
BuildableName = "Feathers.framework"
7369
BlueprintName = "Feathers-macOS"
7470
ReferencedContainer = "container:Feathers.xcodeproj">
@@ -86,7 +82,7 @@
8682
<MacroExpansion>
8783
<BuildableReference
8884
BuildableIdentifier = "primary"
89-
BlueprintIdentifier = "EA2ABD391EA2BA6F0099A091"
85+
BlueprintIdentifier = "EAC0BD0B1EC952A40049FB13"
9086
BuildableName = "Feathers.framework"
9187
BlueprintName = "Feathers-macOS"
9288
ReferencedContainer = "container:Feathers.xcodeproj">

‎Feathers.xcodeproj/xcshareddata/xcschemes/Feathers-tvOS.xcscheme‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "EA2ABD551EA2BA8A0099A091"
17+
BlueprintIdentifier = "EAC0BD611EC9686E0049FB13"
1818
BuildableName = "Feathers.framework"
1919
BlueprintName = "Feathers-tvOS"
2020
ReferencedContainer = "container:Feathers.xcodeproj">
@@ -28,7 +28,26 @@
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "EAC0BD691EC9686E0049FB13"
36+
BuildableName = "Feathers-tvOSTests.xctest"
37+
BlueprintName = "Feathers-tvOSTests"
38+
ReferencedContainer = "container:Feathers.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
3141
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "EAC0BD611EC9686E0049FB13"
46+
BuildableName = "Feathers.framework"
47+
BlueprintName = "Feathers-tvOS"
48+
ReferencedContainer = "container:Feathers.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
3251
<AdditionalOptions>
3352
</AdditionalOptions>
3453
</TestAction>
@@ -45,7 +64,7 @@
4564
<MacroExpansion>
4665
<BuildableReference
4766
BuildableIdentifier = "primary"
48-
BlueprintIdentifier = "EA2ABD551EA2BA8A0099A091"
67+
BlueprintIdentifier = "EAC0BD611EC9686E0049FB13"
4968
BuildableName = "Feathers.framework"
5069
BlueprintName = "Feathers-tvOS"
5170
ReferencedContainer = "container:Feathers.xcodeproj">
@@ -63,7 +82,7 @@
6382
<MacroExpansion>
6483
<BuildableReference
6584
BuildableIdentifier = "primary"
66-
BlueprintIdentifier = "EA2ABD551EA2BA8A0099A091"
85+
BlueprintIdentifier = "EAC0BD611EC9686E0049FB13"
6786
BuildableName = "Feathers.framework"
6887
BlueprintName = "Feathers-tvOS"
6988
ReferencedContainer = "container:Feathers.xcodeproj">

‎Feathers.xcodeproj/xcshareddata/xcschemes/Feathers-watchOS.xcscheme‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)