Skip to content

Commit

Permalink
Merge pull request #8 from uber/spm-integration
Browse files Browse the repository at this point in the history
Adding SPM integration - need to fix carthage support
  • Loading branch information
Joe Soultanis committed Nov 12, 2019
2 parents 29fa43b + ab1537a commit c338787
Show file tree
Hide file tree
Showing 45 changed files with 137 additions and 1,137 deletions.
68 changes: 20 additions & 48 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# OS X
.DS_Store
## OSX
*.DS_Store

# Xcode Include to support Carthage for the Foundation project.
*.xcodeproj
*.xcworkspace

# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
Build/
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -18,52 +17,25 @@ DerivedData/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
xcuserdata
*.xccheckout
*.xcscmblueprint

## Obj-C/Swift specific
*.moved-aside
DerivedData
*.hmap
*.ipa
*.dSYM.zip
*.dSYM
*.xcuserstate

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# 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/

# Carthage
#
Pods
Carthage/Checkouts

Carthage/Build
.idea
Podfile.lock

# fastlane
# Swift Package Manager
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
Packages/
Package.pins
Package.resolved
.build/
5 changes: 3 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
github "ReactiveX/RxSwift" ~> 4.5
github "RxSwiftCommunity/RxOptional" ~> 3.1.3
github "ReactiveX/RxSwift" ~> 4.5.0
github "RxSwiftCommunity/RxOptional" ~> 3.1.3
github "uber/RxCBCentral" ~> 1.0
1 change: 1 addition & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
github "ReactiveX/RxSwift" "4.5.0"
github "RxSwiftCommunity/RxOptional" "3.7.0"
github "uber/RxCBCentral" "v1.0.0"
10 changes: 0 additions & 10 deletions ExampleApp.xcworkspace/contents.xcworkspacedata

This file was deleted.

8 changes: 0 additions & 8 deletions ExampleApp.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit c338787

Please sign in to comment.