Skip to content

Commit 00688d8

Browse files
committed
Improves dependencies.sh
1 parent 8f80de8 commit 00688d8

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "3.4.0"
1+
github "ReactiveX/RxSwift" "3.6.1"

RxDataSources.xcodeproj/project.pbxproj

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@
322322
C81905B21DEA019100AE679C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
323323
C81905B91DEA0BD700AE679C /* ChangeSet+TestExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ChangeSet+TestExtensions.swift"; sourceTree = "<group>"; };
324324
C81905BD1DEA104400AE679C /* Array+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+Extensions.swift"; sourceTree = "<group>"; };
325+
C82541851F363C76009F6C03 /* dependencies.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = dependencies.sh; sourceTree = "<group>"; };
325326
C8477FB81D29DBC90074454A /* IntegerType+IdentifiableType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IntegerType+IdentifiableType.swift"; sourceTree = "<group>"; };
326327
C8477FBC1D29DCE20074454A /* FloatingPointType+IdentifiableType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FloatingPointType+IdentifiableType.swift"; sourceTree = "<group>"; };
327328
C8595DA81DEA3D4800FA20CD /* AlgorithmTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlgorithmTests.swift; sourceTree = "<group>"; };
@@ -567,6 +568,7 @@
567568
C8984C501C36AF35001E4272 = {
568569
isa = PBXGroup;
569570
children = (
571+
C82541851F363C76009F6C03 /* dependencies.sh */,
570572
C861C0F01E153FC400BEDC46 /* RxDataSources.podspec */,
571573
C87C34191F36346A00DB85FE /* Rx.xcodeproj */,
572574
C85EE5461C36F1FC0090614D /* Sources */,
@@ -731,6 +733,7 @@
731733
C8984C981C36B6FA001E4272 /* Frameworks */,
732734
C8984C991C36B6FA001E4272 /* Resources */,
733735
C87C34A11F363B1400DB85FE /* Embed Frameworks */,
736+
C82FDC991F3651D0002FA2B6 /* NormalizeCocoapods */,
734737
);
735738
buildRules = (
736739
);
@@ -1064,6 +1067,20 @@
10641067
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
10651068
showEnvVarsInLog = 0;
10661069
};
1070+
C82FDC991F3651D0002FA2B6 /* NormalizeCocoapods */ = {
1071+
isa = PBXShellScriptBuildPhase;
1072+
buildActionMask = 2147483647;
1073+
files = (
1074+
);
1075+
inputPaths = (
1076+
);
1077+
name = NormalizeCocoapods;
1078+
outputPaths = (
1079+
);
1080+
runOnlyForDeploymentPostprocessing = 0;
1081+
shellPath = /bin/sh;
1082+
shellScript = "pushd \"${DERIVED_FILE_DIR}\"\nif [[ -d \"RxSwift/RxSwift.framework\" ]]; then\n ln -s \"RxSwift/RxSwift.framework\" RxSwift.framework\nfi\nif [[ -d \"RxCocoa/RxCocoa.framework\" ]]; then\n ln -s \"RxCocoa/RxCocoa.framework\" RxSwift.framework\nfi\npopd";
1083+
};
10671084
/* End PBXShellScriptBuildPhase section */
10681085

10691086
/* Begin PBXSourcesBuildPhase section */

dependencies.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
set -e
2-
if [[ ( ! -d "RxSwift" ) && ( ! -d "Carthage" ) && ( ! -d 'Pods' ) ]]; then
2+
if [[ ( ! -d "RxSwift/.git" ) && ( ! -d "Carthage" ) && ( ! -d 'Pods' ) ]]; then
33
git submodule update --init --recursive --force
44
cd RxSwift
55
git reset origin/master --hard
6+
osascript -e 'tell app "Xcode" to display dialog "We have downloaded dependencies. Please restart Xcode"'
67
fi

0 commit comments

Comments
 (0)