Skip to content

Commit d74cd35

Browse files
devxouldevxoul
authored
Merge pull request #2 from RxSwiftCommunity/carthage
Add Carthage support
2 parents da9ac37 + bb9a20b commit d74cd35

File tree

4 files changed

+23
-34
lines changed

4 files changed

+23
-34
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
*.mode1v3
66

77
Pods/
8+
Carthage/
89
vendor/

‎Cartfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "ReactiveX/RxSwift" "3.0.0-beta.2"

‎Cartfile.resolved

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "ReactiveX/RxSwift" "3.0.0-beta.2"

‎RxKeyboard.xcodeproj/project.pbxproj

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
/* Begin PBXBuildFile section */
1010
0310C6741DA9525200BDA512 /* RxKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 0310C6711DA9525200BDA512 /* RxKeyboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
1111
0310C6771DA9535200BDA512 /* RxKeyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0310C6761DA9535200BDA512 /* RxKeyboard.swift */; };
12+
034E7CA71DAD548900CFC398 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 034E7CA31DAD548900CFC398 /* RxCocoa.framework */; };
13+
034E7CA81DAD548900CFC398 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 034E7CA41DAD548900CFC398 /* RxSwift.framework */; };
1214
035BC8301DAADE86006CA9BE /* RxKeyboard.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03A258CB1DA94EC50035A85B /* RxKeyboard.framework */; };
1315
035BC8311DAADE86006CA9BE /* RxKeyboard.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03A258CB1DA94EC50035A85B /* RxKeyboard.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1416
035F28D11DA95C050060CE31 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 035F28C71DA95C050060CE31 /* Assets.xcassets */; };
@@ -17,7 +19,6 @@
1719
035F28D61DA95C580060CE31 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 035F28CB1DA95C050060CE31 /* AppDelegate.swift */; };
1820
035F28D71DA95C5B0060CE31 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 035F28CD1DA95C050060CE31 /* ViewController.swift */; };
1921
198DAF5A87143EF56B410376 /* Pods_RxKeyboard_RxKeyboardDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FD6156651B6B63C23AC292E /* Pods_RxKeyboard_RxKeyboardDemo.framework */; };
20-
A51EC8A43DC72B5150E1DA0D /* Pods_RxKeyboard.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 387849BCC512BDBC37A69346 /* Pods_RxKeyboard.framework */; };
2122
/* End PBXBuildFile section */
2223

2324
/* Begin PBXContainerItemProxy section */
@@ -49,6 +50,10 @@
4950
0310C6731DA9525200BDA512 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5051
0310C6761DA9535200BDA512 /* RxKeyboard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxKeyboard.swift; sourceTree = "<group>"; };
5152
0310C67C1DA9572500BDA512 /* RxKeyboardDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RxKeyboardDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
53+
034E7CA21DAD548900CFC398 /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/iOS/RxBlocking.framework; sourceTree = "<group>"; };
54+
034E7CA31DAD548900CFC398 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = "<group>"; };
55+
034E7CA41DAD548900CFC398 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
56+
034E7CA51DAD548900CFC398 /* RxTests.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTests.framework; path = Carthage/Build/iOS/RxTests.framework; sourceTree = "<group>"; };
5257
035F28C71DA95C050060CE31 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5358
035F28C91DA95C050060CE31 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5459
035F28CB1DA95C050060CE31 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -83,7 +88,8 @@
8388
isa = PBXFrameworksBuildPhase;
8489
buildActionMask = 2147483647;
8590
files = (
86-
A51EC8A43DC72B5150E1DA0D /* Pods_RxKeyboard.framework in Frameworks */,
91+
034E7CA71DAD548900CFC398 /* RxCocoa.framework in Frameworks */,
92+
034E7CA81DAD548900CFC398 /* RxSwift.framework in Frameworks */,
8793
);
8894
runOnlyForDeploymentPostprocessing = 0;
8995
};
@@ -183,6 +189,10 @@
183189
221051FE9374C6EEB61B3418 /* Frameworks */ = {
184190
isa = PBXGroup;
185191
children = (
192+
034E7CA21DAD548900CFC398 /* RxBlocking.framework */,
193+
034E7CA31DAD548900CFC398 /* RxCocoa.framework */,
194+
034E7CA41DAD548900CFC398 /* RxSwift.framework */,
195+
034E7CA51DAD548900CFC398 /* RxTests.framework */,
186196
387849BCC512BDBC37A69346 /* Pods_RxKeyboard.framework */,
187197
ED2E539A89FFC53BA70B139C /* Pods_Demo.framework */,
188198
B1763C0DE08C3E15BD71C29F /* Pods_RxKeyboard_Demo.framework */,
@@ -246,12 +256,10 @@
246256
isa = PBXNativeTarget;
247257
buildConfigurationList = 03A258D31DA94EC50035A85B /* Build configuration list for PBXNativeTarget "RxKeyboard" */;
248258
buildPhases = (
249-
E1B117AD07E9F1CD1EB57A47 /* [CP] Check Pods Manifest.lock */,
250259
03A258C61DA94EC50035A85B /* Sources */,
251260
03A258C71DA94EC50035A85B /* Frameworks */,
252261
03A258C81DA94EC50035A85B /* Headers */,
253262
03A258C91DA94EC50035A85B /* Resources */,
254-
4896D7AF381BA8888BCE1918 /* [CP] Copy Pods Resources */,
255263
);
256264
buildRules = (
257265
);
@@ -325,21 +333,6 @@
325333
/* End PBXResourcesBuildPhase section */
326334

327335
/* Begin PBXShellScriptBuildPhase section */
328-
4896D7AF381BA8888BCE1918 /* [CP] Copy Pods Resources */ = {
329-
isa = PBXShellScriptBuildPhase;
330-
buildActionMask = 2147483647;
331-
files = (
332-
);
333-
inputPaths = (
334-
);
335-
name = "[CP] Copy Pods Resources";
336-
outputPaths = (
337-
);
338-
runOnlyForDeploymentPostprocessing = 0;
339-
shellPath = /bin/sh;
340-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboard/Pods-RxKeyboard-resources.sh\"\n";
341-
showEnvVarsInLog = 0;
342-
};
343336
4FFBB804D69572B8C7099324 /* [CP] Copy Pods Resources */ = {
344337
isa = PBXShellScriptBuildPhase;
345338
buildActionMask = 2147483647;
@@ -385,21 +378,6 @@
385378
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboard-RxKeyboardDemo/Pods-RxKeyboard-RxKeyboardDemo-frameworks.sh\"\n";
386379
showEnvVarsInLog = 0;
387380
};
388-
E1B117AD07E9F1CD1EB57A47 /* [CP] Check Pods Manifest.lock */ = {
389-
isa = PBXShellScriptBuildPhase;
390-
buildActionMask = 2147483647;
391-
files = (
392-
);
393-
inputPaths = (
394-
);
395-
name = "[CP] Check Pods Manifest.lock";
396-
outputPaths = (
397-
);
398-
runOnlyForDeploymentPostprocessing = 0;
399-
shellPath = /bin/sh;
400-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
401-
showEnvVarsInLog = 0;
402-
};
403381
/* End PBXShellScriptBuildPhase section */
404382

405383
/* Begin PBXSourcesBuildPhase section */
@@ -582,6 +560,10 @@
582560
DYLIB_COMPATIBILITY_VERSION = 1;
583561
DYLIB_CURRENT_VERSION = 1;
584562
DYLIB_INSTALL_NAME_BASE = "@rpath";
563+
FRAMEWORK_SEARCH_PATHS = (
564+
"$(inherited)",
565+
"$(PROJECT_DIR)/Carthage/Build/iOS",
566+
);
585567
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
586568
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
587569
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -604,6 +586,10 @@
604586
DYLIB_COMPATIBILITY_VERSION = 1;
605587
DYLIB_CURRENT_VERSION = 1;
606588
DYLIB_INSTALL_NAME_BASE = "@rpath";
589+
FRAMEWORK_SEARCH_PATHS = (
590+
"$(inherited)",
591+
"$(PROJECT_DIR)/Carthage/Build/iOS",
592+
);
607593
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
608594
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
609595
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

0 commit comments

Comments
 (0)