Skip to content

Commit 5451dd4

Browse files
authored
Merge pull request #26 from brentleyjones/carthage-warning
Fix Carthage warning when building by including in workspace
2 parents 0ab3f8d + b399d74 commit 5451dd4

File tree

4 files changed

+22
-20
lines changed

4 files changed

+22
-20
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Carthage/Checkouts/RxSwift"]
2+
path = Carthage/Checkouts/RxSwift
3+
url = https://github.com/ReactiveX/RxSwift.git

Example/Podfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ PODS:
22
- CGFloatLiteral (0.2.0)
33
- ManualLayout (1.3.0)
44
- ReusableKit (1.1.0)
5-
- RxCocoa (3.1.0):
6-
- RxSwift (~> 3.1)
7-
- RxKeyboard (0.4.0):
8-
- RxCocoa (>= 3.0)
9-
- RxSwift (>= 3.0)
10-
- RxSwift (3.1.0)
5+
- RxCocoa (3.5.0):
6+
- RxSwift (~> 3.4)
7+
- RxKeyboard (0.5.0):
8+
- RxCocoa (>= 3.4)
9+
- RxSwift (>= 3.4)
10+
- RxSwift (3.5.0)
1111
- SnapKit (3.1.2)
1212
- SwiftyColor (1.0.0)
1313
- SwiftyImage (1.0.0)
@@ -33,9 +33,9 @@ SPEC CHECKSUMS:
3333
CGFloatLiteral: 5bdcd81cb54b56cd71c4e5e66a33cb86cd51ecbf
3434
ManualLayout: 68ac8cfa6b5f656f7a9fadec3730208b95986880
3535
ReusableKit: 89e743a120bab0d95848bff27e481833c2768905
36-
RxCocoa: 50d7564866da9299161e86a263ce12a0873904d8
37-
RxKeyboard: cf7f4463f27e580a3542127877ef9e3a71183744
38-
RxSwift: 83ff553e7593fdfdcb2562933a64c0284dffdadc
36+
RxCocoa: a0a09f45d0e5b48ecb6a4a7b4b4c89c88d3f633f
37+
RxKeyboard: b360a494f44777cd03f2c09251c50456683ec702
38+
RxSwift: 18ee9d78b45edb3b0b7e79916b47a116e6dbc842
3939
SnapKit: 12b24f569cb7c143acc9c22b9d91b23e7b1c84a2
4040
SwiftyColor: 7fa09db14051bc5d7f539e1c4576665975225992
4141
SwiftyImage: 79090f8b96057b3e91064de172936b97855086e6

RxKeyboard.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,6 @@
284284
DYLIB_COMPATIBILITY_VERSION = 1;
285285
DYLIB_CURRENT_VERSION = 1;
286286
DYLIB_INSTALL_NAME_BASE = "@rpath";
287-
FRAMEWORK_SEARCH_PATHS = (
288-
"$(inherited)",
289-
"$(PROJECT_DIR)/Carthage/Build/iOS",
290-
);
291287
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
292288
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
293289
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -309,10 +305,6 @@
309305
DYLIB_COMPATIBILITY_VERSION = 1;
310306
DYLIB_CURRENT_VERSION = 1;
311307
DYLIB_INSTALL_NAME_BASE = "@rpath";
312-
FRAMEWORK_SEARCH_PATHS = (
313-
"$(inherited)",
314-
"$(PROJECT_DIR)/Carthage/Build/iOS",
315-
);
316308
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
317309
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
318310
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

RxKeyboard.xcworkspace/contents.xcworkspacedata

Lines changed: 10 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)