Skip to content

Commit 82df8a7

Browse files
committed
Update project to build with submodules
When this project is built by including it in another workspace, instead of building by command line with `carthage`, using the FRAMWORK_SEARCH_PATH of `$(PROJECT_DIR)/Carthage/Build/iOS` can produce an error, since `$(PROJECT_DIR)/Carthage/Build/iOS` might not exist. To fix this we should use a submodule for our dependencies and include them in the RxKeyboard.xcworkspace. This will allow us to still compile the RxKeyboard library.
1 parent 0ab3f8d commit 82df8a7

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
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

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)