Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Commit 562286c

Browse files
committed
WS echoserver script
1 parent f57b6d3 commit 562286c

File tree

15 files changed

+185
-117
lines changed

15 files changed

+185
-117
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ xcuserdata
2222
*.moved-aside
2323
*.xcuserstate
2424
*.orig
25+
*.pid
2526
venv/
2627
.bundle
2728
vendor

.swiftlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
excluded:
22
- Carthage
3-
- Pods
3+
- Example/Pods
44
- vendor
55

66
disabled_rules:

.travis.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
1-
osx_image: xcode8.2
1+
osx_image: xcode9
22
language: objective-c
33

4-
podfile: Example/Podfile
5-
6-
before_install:
7-
- echo $(which wstest)
8-
- echo $(which pip)
9-
# - echo $(which xcpretty)
10-
- gem install cocoapods -v '1.2.1'
11-
- pod --version
12-
- pod repo update
13-
144
install:
155
- if [[ ! $(which pip) ]]; then easy_install --user pip && export PATH=/Users/travis/Library/Python/2.7/bin:${PATH}; fi;
16-
- pip install -r requirements.txt
6+
# - pip install -r requirements.txt
177
- bundle install
188
# - if [[ ! $(which xcpretty) ]]; then gem install xcpretty --user-install; fi;
199

2010
script:
21-
- wstest -m echoserver -w ws://127.0.0.1:9000 &
11+
# - wstest -m echoserver -w ws://127.0.0.1:9000 &
2212
- bundle exec fastlane ci
File renamed without changes.

Example/Gemfile

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

Example/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ source 'https://github.com/CocoaPods/Specs.git'
55
use_frameworks!
66

77
target 'RxWebSocket_Example' do
8-
pod 'RxWebSocket', :path => '.'
9-
8+
pod 'RxWebSocket', :path => '../'
9+
1010
pod 'SwiftLint', '~> 0.23.1'
1111

1212
target 'RxWebSocket_Tests' do

Example/Podfile.lock

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
PODS:
2-
- RxCocoa (3.1.0):
3-
- RxSwift (~> 3.1)
4-
- RxSwift (3.1.0)
5-
- RxWebSocket (1.0.0):
6-
- RxCocoa (~> 3.0)
7-
- RxSwift (~> 3.0)
8-
- Starscream (~> 2.0.2)
9-
- Starscream (2.0.2)
2+
- RxCocoa (4.0.0):
3+
- RxSwift (~> 4.0)
4+
- RxSwift (4.0.0)
5+
- RxWebSocket (1.0.1):
6+
- RxCocoa (~> 4.0)
7+
- RxSwift (~> 4.0)
8+
- Starscream (~> 3.0)
9+
- Starscream (3.0.2)
10+
- SwiftLint (0.23.1)
1011

1112
DEPENDENCIES:
1213
- RxWebSocket (from `../`)
14+
- SwiftLint (~> 0.23.1)
1315

1416
EXTERNAL SOURCES:
1517
RxWebSocket:
16-
:path: "../"
18+
:path: ../
1719

1820
SPEC CHECKSUMS:
19-
RxCocoa: 50d7564866da9299161e86a263ce12a0873904d8
20-
RxSwift: 83ff553e7593fdfdcb2562933a64c0284dffdadc
21-
RxWebSocket: c7f38f320f43e8efaf4b905a760e0c180d40c277
22-
Starscream: 6c135a34e0a6e60cedaa0b30db67a4c05cf7cd38
21+
RxCocoa: d62846ca96495d862fa4c59ea7d87e5031d7340e
22+
RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
23+
RxWebSocket: a5637bdeda2ae7d3bc49d4693133009c815597b8
24+
Starscream: b512c62f6706421221b5ceb2ba01a9f58aca5bea
25+
SwiftLint: 1b670ce79284c76520f84060e87d645078fd32fa
2326

24-
PODFILE CHECKSUM: 16599732a12f0034f0407a2c26a862c21085bf73
27+
PODFILE CHECKSUM: 456db7708e72ed614ed2493176db7ce5f5302def
2528

26-
COCOAPODS: 1.2.1
29+
COCOAPODS: 1.3.1

Example/RxWebSocket.xcodeproj/project.pbxproj

Lines changed: 74 additions & 56 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)