Skip to content

Commit ed67cdb

Browse files
authored
Merge pull request #20 from reloni/develop
Optimizations of public API
2 parents d5ee8b7 + d9b3281 commit ed67cdb

File tree

133 files changed

+812
-3903
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+812
-3903
lines changed

.travis.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,27 @@ env:
99
- FRAMEWORK_SCHEME=RxHttpClient
1010
- SDK=iphonesimulator9.3
1111
- DESTINATION_PLATFORM='platform=iOS Simulator,name=iPhone 6,OS=9.3'
12-
#github access token (for Carthage)
13-
- secure: "xZg8RlgwDqpFAR9DJwrRid3bqYUoQvN5lfBEkuLauHki+N4lhbgs05kyRwP3E3zl7t4J9ydYoouTDn6gnJHM5kCcNnW3fR26E1VOy6/rGXEL7kCAdsk0K+FrRr99ogj03pUfBPWIadoaUdRyvw39TC8R5ZlYWWwH3Wiyk33+y/ddJcgS/CdjtvDabXxASbEcnHKt94QaiyPxk222DRIuxjOE3v3XAtZrqPc8pDoNkPhpPfrugbubMdMwVxyKAH2k7dkLYLXF0b0YPvTLK8kaEedIL5pQ445KMzi8OIAIHb5vYRKk4AhKfja4gTEv9p7hiNiaZQtY7pZHz+vGpabo+wt7oN0ExWJyl+lvdy4xB5W96UvgDo0P4NoznJhM4o/wf1Mid30Cyx28glgevGqmtaMxWDWxBD9cTCQyaWcU2jjiwwgTGzZ3FzpOi2VbEkqBR2YpSuAwjInTD4nPDncda5kXNfva2W7bfYyT+VjsUA6vVnE0Ba7wwVDJRY6+XtA8PqjToSwmE/s9ngGLNKL9HCSWcxVnTs9Dnp6cFd3qGtlEjpuoknSuq4xaCXEMozuuXqpq9tGilsS7QOOmdPyRv8xvtTXapybnl8fpT+IYmGWfhkCGnnAHyqMIpq8Qdg0CPgxpDzMEF13ndeWOiUYw0W/3M3IUiaFZ5toEuGMwTNU="
1412

1513
before_install:
1614
- SIMULATOR_ID=$(xcrun instruments -s | grep -o "iPhone 6s (9.3) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
1715

1816
before_script:
17+
# inslall punic
18+
- brew install python
19+
- brew install libyaml
20+
- pip install --upgrade git+https://github.com/schwa/punic.git
21+
1922
- carthage version
20-
#- carthage bootstrap --platform ios
2123

22-
script:
24+
# update OHHTTPStubs using carthage
25+
- carthage update OHHTTPStubs --platform iOS
26+
# using punic to build RxSwift framework
27+
- punic build RxSwift --platform iOS --configuration Release
28+
29+
script:
2330
- open -a "simulator" --args -CurrentDeviceUDID $SIMULATOR_ID
2431
#- set -o pipefail && xcodebuild -scheme "$FRAMEWORK_SCHEME" -project "$PROJECT" -sdk "$SDK" -configuration Debug ONLY_ACTIVE_ARCH=YES -destination "$DESTINATION_PLATFORM" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES clean build | xcpretty -c
2532
- set -o pipefail && xcodebuild -scheme "$FRAMEWORK_SCHEME" -project "$PROJECT" -sdk "$SDK" -configuration Debug ONLY_ACTIVE_ARCH=YES -destination "$DESTINATION_PLATFORM" -enableCodeCoverage YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test | xcpretty -c
2633

2734
after_success:
28-
- bash <(curl -s https://codecov.io/bash) -J '^RxHttpClient$'
35+
- bash <(curl -s https://codecov.io/bash) -J '^RxHttpClient$'

Dependencies/iOS/JASON.framework/Headers/JASON-Swift.h

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

Dependencies/iOS/JASON.framework/Headers/JASON.h

Lines changed: 0 additions & 29 deletions
This file was deleted.
-720 Bytes
Binary file not shown.
-1.33 MB
Binary file not shown.
-25.7 KB
Binary file not shown.
-41.8 KB
Binary file not shown.
-25.7 KB
Binary file not shown.
-41.8 KB
Binary file not shown.
-25.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)