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

Commit cbb19a1

Browse files
fjcaetanofjcaetano
committed
Carthage compatible
1 parent 562286c commit cbb19a1

31 files changed

+2355
-83
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ osx_image: xcode9
22
language: objective-c
33

44
install:
5-
- if [[ ! $(which pip) ]]; then easy_install --user pip && export PATH=/Users/travis/Library/Python/2.7/bin:${PATH}; fi;
6-
# - pip install -r requirements.txt
7-
- bundle install
8-
# - if [[ ! $(which xcpretty) ]]; then gem install xcpretty --user-install; fi;
5+
- ./install_dependencies.sh
96

107
script:
11-
# - wstest -m echoserver -w ws://127.0.0.1:9000 &
128
- bundle exec fastlane ci

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "daltoniam/Starscream" ~> 3.0
1+
github "daltoniam/Starscream" "8f2af31bd3e87246d302d92d00b75b8ab6e9b512"
22
github "ReactiveX/RxSwift" ~> 4.0

‎Cartfile.resolved‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github "ReactiveX/RxSwift" "4.0.0"
2-
github "daltoniam/Starscream" "3.0.2"
2+
github "daltoniam/Starscream" "8f2af31bd3e87246d302d92d00b75b8ab6e9b512"
33
github "daltoniam/common-crypto-spm" "1.1.0"
44
github "daltoniam/zlib-spm" "1.1.0"

‎Classes/.gitkeep‎

Whitespace-only changes.

‎Example/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ EXTERNAL SOURCES:
2020
SPEC CHECKSUMS:
2121
RxCocoa: d62846ca96495d862fa4c59ea7d87e5031d7340e
2222
RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
23-
RxWebSocket: a5637bdeda2ae7d3bc49d4693133009c815597b8
23+
RxWebSocket: 92e3b508c1edc110ae99db695c64c83326e2cf70
2424
Starscream: b512c62f6706421221b5ceb2ba01a9f58aca5bea
2525
SwiftLint: 1b670ce79284c76520f84060e87d645078fd32fa
2626

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source "https://rubygems.org"
22

3-
gem 'fastlane', '~> 2.62.1'
3+
gem 'fastlane', '~> 2.64'
44
gem 'cocoapods', '~> 1.3.1'

‎Gemfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ GEM
6464
faraday_middleware (0.12.2)
6565
faraday (>= 0.7.4, < 1.0)
6666
fastimage (2.1.0)
67-
fastlane (2.62.1)
67+
fastlane (2.64.0)
6868
CFPropertyList (>= 2.3, < 3.0.0)
6969
addressable (>= 2.3, < 3.0.0)
7070
babosa (>= 1.0.2, < 2.0.0)
@@ -186,7 +186,7 @@ PLATFORMS
186186

187187
DEPENDENCIES
188188
cocoapods (~> 1.3.1)
189-
fastlane (~> 2.62.1)
189+
fastlane (~> 2.64)
190190

191191
BUNDLED WITH
192192
1.15.4

‎README.md‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# RxWebSocket
22

3-
[![CI Status](http://img.shields.io/travis/fjcaetano/RxWebSocket.svg?style=flat)](https://travis-ci.org/fjcaetano/RxWebSocket)
3+
[![Build Status](https://travis-ci.org/fjcaetano/RxWebSocket.svg?branch=master)](https://travis-ci.org/fjcaetano/RxWebSocket)
44
[![Version](https://img.shields.io/cocoapods/v/RxWebSocket.svg?style=flat)](http://cocoapods.org/pods/RxWebSocket)
55
[![License](https://img.shields.io/cocoapods/l/RxWebSocket.svg?style=flat)](http://cocoapods.org/pods/RxWebSocket)
66
[![Platform](https://img.shields.io/cocoapods/p/RxWebSocket.svg?style=flat)](http://cocoapods.org/pods/RxWebSocket)
77
[![codecov](https://codecov.io/gh/fjcaetano/RxWebSocket/branch/master/graph/badge.svg)](https://codecov.io/gh/fjcaetano/RxWebSocket)
8+
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
89

910
------
1011

@@ -19,7 +20,7 @@ it, simply add the following line to your Podfile:
1920

2021
``` ruby
2122
pod "RxWebSocket"
22-
```
23+
```
2324

2425
## Usage
2526

@@ -50,6 +51,43 @@ sendButton.rx.tap
5051

5152
For further details, check the Example project.
5253

54+
## Contributing
55+
56+
After cloning the project, pull all submodules with
57+
58+
``` sh
59+
git submodule update --init --recursive
60+
```
61+
62+
### Requirements
63+
64+
RxWebSocket relies on the following for development:
65+
66+
- [Fastlane](https://github.com/fastlane/fastlane)
67+
- [Autobahn TestSuite](https://github.com/crossbario/autobahn-testsuite)
68+
- [Swiftlint](https://github.com/realm/SwiftLint)
69+
70+
To install all dependencies without hassles just run:
71+
72+
``` sh
73+
./install_dependencies.sh
74+
```
75+
76+
Which will install all the dependencies and virtual envs if necessary.
77+
78+
### Running Tests
79+
80+
Xcode and Fastlane will take care of starting and stopping websocket echoservers
81+
for testing, however if you find that tests are timing out, this is usually a
82+
sign that the server is not running. If so, you can manage it running
83+
84+
``` sh
85+
./server.sh [start|stop]
86+
```
87+
88+
This will tell wstests to launch an echo server on 127.0.0.1:9000. If this port
89+
is unusable for you by any reason, you may change it in the `server.sh` file.
90+
5391
## License
5492

5593
RxWebSocket is available under the MIT license. See the LICENSE file for more info.

‎RxWebSocket-macOS/Info-Tests.plist‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>BNDL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>1</string>
21+
</dict>
22+
</plist>

‎RxWebSocket-macOS/Info.plist‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>RxWebSocket</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>$(CURRENT_PROJECT_VERSION)</string>
21+
<key>NSHumanReadableCopyright</key>
22+
<string>Copyright © 2017 RxWebSocket. All rights reserved.</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
</dict>
26+
</plist>

0 commit comments

Comments
 (0)