Skip to content

Commit

Permalink
Fix carthage cache build script
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeMatt committed Jul 20, 2018
1 parent 932bbf5 commit 9127e4a
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cartfile.resolved
@@ -1,7 +1,7 @@
github "bitstadium/HockeySDK-iOS" "5.1.2"
github "bitstadium/HockeySDK-tvOS" "5.1.0"
github "cbpowell/MarqueeLabel" "3.1.6"
github "realm/realm-cocoa" "v3.7.3"
github "realm/realm-cocoa" "v3.7.4"
github "stephencelis/SQLite.swift" "0.11.5"
github "weichsel/ZIPFoundation" "0.9.6"
github "xmartlabs/XLActionController" "4.0.1"
8 changes: 8 additions & 0 deletions Carthage/Checkouts/realm-cocoa/CHANGELOG.md
@@ -1,3 +1,11 @@
3.7.4 Release notes (2018-06-19)
=============================================================

### Bugfixes

* Fix a bug which could potentially flood Realm Object Server with PING
messages after a client device comes back online.

3.7.3 Release notes (2018-06-18)
=============================================================

Expand Down
4 changes: 2 additions & 2 deletions Carthage/Checkouts/realm-cocoa/Realm/Realm-Info.plist
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.7.3</string>
<string>3.7.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>3.7.3</string>
<string>3.7.4</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Realm. All rights reserved.</string>
<key>NSPrincipalClass</key>
Expand Down
4 changes: 2 additions & 2 deletions Carthage/Checkouts/realm-cocoa/dependencies.list
@@ -1,4 +1,4 @@
VERSION=3.7.3
VERSION=3.7.4
REALM_CORE_VERSION=5.6.1
REALM_SYNC_VERSION=3.5.5
REALM_SYNC_VERSION=3.5.6
REALM_OBJECT_SERVER_VERSION=3.4.2
21 changes: 19 additions & 2 deletions Carthage/xcode.sh
Expand Up @@ -44,10 +44,27 @@ command -v carthage >/dev/null 2>&1 || {
exit 1;
}

function carthageBuildPathNotExist {
echo "checkCarthageBuildPath $1"
for i in $(echo $1 | tr "," "\n")
do
local path="$SRCROOT/Carthage/Build/$i"
echo "Testing for $path"
if [ ! -d $path ]; then
echo "Fail: No path found for $i"
return 0
else
echo "Success: Path found for $i"
fi
done
echo "Success: Build paths exist for all targets $1"
return 1
}

# Checks if Carthage/Build directory doesn't exist and if not it'll run Carthage
# After, it checks if the Cartfile.resolved file differs from the one in Carthage. If so, Carthage runs
if [ ! -d "$SRCROOT/Carthage/Build" ]; then
echo "No Carthage/Build directory found."
if carthageBuildPathNotExist $1; then
echo "Carthage build required for $1"
runCarthageAndCopyResolved $1
elif [ -f $SRCROOT/Carthage/.Cartfile.resolved ] && \
diff $SRCROOT/Carthage/.Cartfile.resolved \
Expand Down

0 comments on commit 9127e4a

Please sign in to comment.