Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2

defaults: &defaults
macos:
xcode: "9.2.0"
xcode: "10.2.1"
working_directory: /Users/distiller/project
environment:
FL_OUTPUT_DIR: /Users/distiller/project/output
Expand Down
12 changes: 9 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@ DerivedData/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata
*.xcworkspace/*
!*.xcworkspace/xcshareddata
xcuserdata

## Other
*.moved-aside
Expand Down Expand Up @@ -46,13 +51,14 @@ playground.xcworkspace
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.

Carthage/Checkouts
!Carthage/Build
Carthage/Build

# fastlane
#
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" ~> 4.0
github "ReactiveX/RxSwift"
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "4.1.2"
github "ReactiveX/RxSwift" "5.0.1"
21 changes: 0 additions & 21 deletions Carthage/Build/.RxSwift.version

This file was deleted.

483 changes: 0 additions & 483 deletions Carthage/Build/iOS/42BC41CB-FA58-3C83-BE08-9C920C4AA72A.bcsymbolmap

This file was deleted.

6,205 changes: 0 additions & 6,205 deletions Carthage/Build/iOS/7AFF9F77-0659-3628-BBB1-02B9E20B3372.bcsymbolmap

This file was deleted.

7,690 changes: 0 additions & 7,690 deletions Carthage/Build/iOS/A4316A39-E866-3774-9998-23151E3ED292.bcsymbolmap

This file was deleted.

7,827 changes: 0 additions & 7,827 deletions Carthage/Build/iOS/B1EC3E1D-767D-33D7-A46D-668183208B71.bcsymbolmap

This file was deleted.

6,114 changes: 0 additions & 6,114 deletions Carthage/Build/iOS/CAFE46EE-5F65-3E30-BAAF-1C13133D3981.bcsymbolmap

This file was deleted.

404 changes: 0 additions & 404 deletions Carthage/Build/iOS/E1CDECE2-048C-39BB-BBDA-6BAE45886274.bcsymbolmap

This file was deleted.

190 changes: 0 additions & 190 deletions Carthage/Build/iOS/RxBlocking.framework/Headers/RxBlocking-Swift.h

This file was deleted.

Binary file removed Carthage/Build/iOS/RxBlocking.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file removed Carthage/Build/iOS/RxBlocking.framework/RxBlocking
Binary file not shown.
Loading