Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Another Carthage integration #28

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ playground.xcworkspace
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts
Carthage/Checkouts

Carthage/Build

Expand Down
1 change: 1 addition & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "ReactiveX/RxSwift" ~> 4.0
1 change: 1 addition & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "ReactiveX/RxSwift" "4.4.2"

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 3 additions & 3 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
use_frameworks!

target 'RxAnimated_Example' do
target 'Example' do

pod 'RxSwift', '~> 4.3.0'
pod 'RxCocoa', '~> 4.3.0'
pod 'RxAnimated', :path => '../'

end

target 'RxAnimated-Example-AppleTV' do
target 'Example_tvOS' do

pod 'RxSwift', '~> 4.3.0'
pod 'RxCocoa', '~> 4.3.0'
pod 'RxAnimated', :path => '../'

end
end
34 changes: 34 additions & 0 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
PODS:
- RxAnimated (0.5.0):
- RxAnimated/Core (= 0.5.0)
- RxCocoa (~> 4.3)
- RxSwift (~> 4.3)
- RxAnimated/Core (0.5.0):
- RxCocoa (~> 4.3)
- RxSwift (~> 4.3)
- RxCocoa (4.3.1):
- RxSwift (~> 4.0)
- RxSwift (4.3.1)

DEPENDENCIES:
- RxAnimated (from `../`)
- RxCocoa (~> 4.3.0)
- RxSwift (~> 4.3.0)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- RxCocoa
- RxSwift

EXTERNAL SOURCES:
RxAnimated:
:path: "../"

SPEC CHECKSUMS:
RxAnimated: d934ca1e16efdaf44226e398f229c4419fb0b77b
RxCocoa: 78763c7b07d02455598d9fc3c1ad091a28b73635
RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4

PODFILE CHECKSUM: 019794f831b7134a2ef0a0609d70662dfe9fbd89

COCOAPODS: 1.6.0.beta.1
Loading