Skip to content

Commit

Permalink
Merge pull request #2 from OhKanghoon/feature/lets-swift-5
Browse files Browse the repository at this point in the history
Let's Swift 5
  • Loading branch information
OhKanghoon authored May 15, 2019
2 parents 40f01ba + f1ae58c commit 429d359
Show file tree
Hide file tree
Showing 251 changed files with 75 additions and 25,315 deletions.
3 changes: 1 addition & 2 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
4.2

5
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
osx_image: xcode10.1
osx_image: xcode10.2
language: objective-c

cache: cocoapods
podfile: Example/Podfile

before_install:
- gem install cocoapods
- pod install --repo-update --project-directory=Example
- gem install cocoapods
- pod install --repo-update --project-directory=Example

before_script:
- set -o pipefail

script:
- xcodebuild clean build test
-workspace Example/RxApolloClient.xcworkspace
-scheme RxApolloClient-Example
-sdk iphonesimulator
-destination 'platform=iOS Simulator,name=iPhone 8,OS=12.0'
-configuration Debug
-enableCodeCoverage YES
CODE_SIGNING_REQUIRED=NO | xcpretty
- xcodebuild clean build test
-workspace Example/RxApolloClient.xcworkspace
-scheme RxApolloClient-Example
-sdk iphonesimulator
-destination 'platform=iOS Simulator,name=iPhone 8,OS=12.2'
-configuration Debug
-enableCodeCoverage YES
CODE_SIGNING_REQUIRED=NO | xcpretty
4 changes: 2 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use_frameworks!

target 'RxApolloClient_Example' do
pod 'RxApolloClient', :path => '../'
pod 'RxCocoa', '~> 4.4.0'
pod 'RxOptional' , '~> 3.6.2'
pod 'RxCocoa', '~> 5.0.0'
pod 'RxOptional' , '~> 4.0.0'

target 'RxApolloClient_Tests' do
inherit! :search_paths
Expand Down
51 changes: 26 additions & 25 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,44 +1,45 @@
PODS:
- Apollo (0.9.4):
- Apollo/Core (= 0.9.4)
- Apollo/Core (0.9.4)
- RxApolloClient (0.1.0):
- Apollo (~> 0.9.4)
- RxSwift (~> 4.0)
- RxAtomic (4.4.0)
- RxCocoa (4.4.0):
- RxSwift (~> 4.0)
- RxOptional (3.6.2):
- RxCocoa (~> 4.0)
- RxSwift (~> 4.0)
- RxSwift (4.4.0):
- RxAtomic (~> 4.4)
- Apollo (0.10.1):
- Apollo/Core (= 0.10.1)
- Apollo/Core (0.10.1)
- RxApolloClient (1.0.0):
- Apollo (>= 0.10.1)
- RxSwift (>= 5.0)
- RxCocoa (5.0.0):
- RxRelay (~> 5)
- RxSwift (~> 5)
- RxOptional (4.0.0):
- RxCocoa (~> 5)
- RxSwift (~> 5)
- RxRelay (5.0.0):
- RxSwift (~> 5)
- RxSwift (5.0.0)

DEPENDENCIES:
- RxApolloClient (from `../`)
- RxCocoa (~> 4.4.0)
- RxOptional (~> 3.6.2)
- RxCocoa (~> 5.0.0)
- RxOptional (~> 4.0.0)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Apollo
- RxAtomic
- RxCocoa
- RxOptional
- RxRelay
- RxSwift

EXTERNAL SOURCES:
RxApolloClient:
:path: "../"

SPEC CHECKSUMS:
Apollo: 450856adbdebcdf28c3c671f81732ac3f9944065
RxApolloClient: 3d1d720f79e9ff67e70cb422822676eba5ccdd5d
RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f
RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749
RxOptional: 80426a0ddbd092573e4c482d8cc13302078c4d5e
RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973
Apollo: 4d690a9b2e48e8820182df4b988d7a253e1ee589
RxApolloClient: 7ec673da7862e17d350067c78795921440381b42
RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
RxOptional: 9904e2219d59260c3c171273d475b2126de187e8
RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f

PODFILE CHECKSUM: e254b1f5e2e816d0ef517467ca5360c13646d7d4
PODFILE CHECKSUM: 10bf8cb1abba3d607c1c8fb49a0de38bbf36ea5a

COCOAPODS: 1.5.3
COCOAPODS: 1.6.1
21 changes: 0 additions & 21 deletions Example/Pods/Apollo/LICENSE

This file was deleted.

29 changes: 0 additions & 29 deletions Example/Pods/Apollo/README.md

This file was deleted.

Loading

0 comments on commit 429d359

Please sign in to comment.