Skip to content

Commit b4aec1c

Browse files
committed
Update gitignore, update package, update RxVersion
1 parent c54d32a commit b4aec1c

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

Diff for: .gitignore

100755100644
+7-14
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
# OS X
2+
.DS_Store
3+
14
# Xcode
2-
#
3-
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
45

56
## Build generated
67
build/
8+
.build
9+
.swiftpm
710
DerivedData
8-
.DS_Store
911

1012
## Various settings
1113
*.pbxuser
@@ -29,16 +31,7 @@ xcuserdata
2931
*.ipa
3032

3133
# CocoaPods
32-
#
33-
# We recommend against adding the Pods directory to your .gitignore. However
34-
# you should judge for yourself, the pros and cons are mentioned at:
35-
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
36-
#
37-
# Pods/
34+
Pods
3835

3936
# Carthage
40-
#
41-
# Add this line if you want to avoid checking in source code from Carthage dependencies.
42-
# Carthage/Checkouts
43-
44-
Carthage/Build
37+
Carthage

Diff for: Package.resolved

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"object": {
3+
"pins": [
4+
{
5+
"package": "RxSwift",
6+
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
7+
"state": {
8+
"branch": null,
9+
"revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa",
10+
"version": "5.1.1"
11+
}
12+
}
13+
]
14+
},
15+
"version": 1
16+
}

Diff for: Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let package = Package(
1313
targets: ["RxExtensions"])
1414
],
1515
dependencies: [
16-
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0")
16+
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.1.1")
1717
],
1818
targets: [
1919
.target(

0 commit comments

Comments
 (0)