Skip to content

Commit 2f4d2e9

Browse files
committed
Fixes logic that ensures plist version matches cocoapods version.
1 parent ecb9ba5 commit 2f4d2e9

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

scripts/all-tests.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,10 @@ function checkPlistVersions() {
109109
PODSPEC_VERSION=`cat $project.podspec | grep -E "s.version\s+=" | cut -d '"' -f 2`
110110
ensureVersionEqual "$RXSWIFT_VERSION" "$PODSPEC_VERSION" "${project} version not equal"
111111
PLIST_VERSION=`defaults read "\`pwd\`/${project}/Info.plist" CFBundleShortVersionString`
112-
if [[ "${PLIST_VERSION}" != "${RXSWIFT_VERSION}" ]]; then
112+
if [[ ${RXSWIFT_VERSION} = *"-"* && "${PLIST_VERSION}-"* == "${RXSWIFT_VERSION}" ]] || [[ ! ${RXSWIFT_VERSION} == *"-"* && "${PLIST_VERSION}" == "${RXSWIFT_VERSION}" ]]; then
113113
echo "Invalid version for `pwd`/${project}/Info.plist: ${PLIST_VERSION}"
114-
defaults write "`pwd`/${project}/Info.plist" CFBundleShortVersionString $RXSWIFT_VERSION
115114
fi
116115
done
117-
118-
ensureNoGitChanges "Plist versions aren't correct"
119116
}
120117

121118
ensureNoGitChanges "Please make sure the working tree is clean. Use \`git status\` to check."

0 commit comments

Comments
 (0)