From 52c6e6dc31a66d2b2c7b0bb9c11fa31424d38af3 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Tue, 31 May 2016 21:33:38 +0200 Subject: [PATCH] Improves version checking logic. #707 --- RxBlocking/Info.plist | Bin 808 -> 449 bytes RxCocoa/Info.plist | Bin 808 -> 449 bytes RxSwift/Info.plist | Bin 808 -> 449 bytes RxTests/Info.plist | Bin 808 -> 449 bytes scripts/pre-release-tests.sh | 42 ++++++++++++++++++++++++++++++----- 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/RxBlocking/Info.plist b/RxBlocking/Info.plist index 7e7479f00ef41033715a1052a946b2eeaeb9975a..21cb8bc3ed32f79f17161e4c7c144163b796508f 100644 GIT binary patch literal 449 zcmYk2T~5M46oqH-4}U434;pze;Q?MqgV7jcLZBUzs+4Bhq9!Dhp$v6mX`8m7?81e( z30Gm_4%~wejzZP@ax&-K``w!vgdUF*S$>C^rR9~?we0%F=GOL3PRbXGyF@xr+O3H{ z^q6@cL`jcDF%Nt*iMa0)sgQ=+kogH8aTfJcOQ&N-qN0B<3OAR!zhFr>4RN@` zL+U9WjbpoBJE_S;IxJTV+*NJGA}w22uMyEyq+42BL%1qPf3e=|psLjnWuDe#%)U=5 zSI{j|Y^&K4gY$-V=jKZMUAdyz7z+{+_)8@4J%mlIt5*$>1to9}x}Xn2@C;tSD|iDR f;1g!x5j=)x@B%iV1@GV#{8R?c73?i^A@K1F8!&$g literal 808 zcmaJuuL`fcx<$zejCwZdv)LV05kPjD2JWVPgxq&{j4M`p% zH03;H2${r`+?nkY2`~`Cjx5O=A^0;whr>akrz#~ZvQuG&+_K=T6!i?ihR~oyB9ejT zg8oYmyhceVwBC)nWwmBl`Yw-BX0km?3!brDcq|6-Dmr~bRV7LguQ7PJUK_3W$ikhV zpDAnh^auDI8v&W>GrV%9b9~o@VMjomtP@tYF9@i NqRY;y=)93y?+eq22Q>fy diff --git a/RxCocoa/Info.plist b/RxCocoa/Info.plist index 7e7479f00ef41033715a1052a946b2eeaeb9975a..21cb8bc3ed32f79f17161e4c7c144163b796508f 100644 GIT binary patch literal 449 zcmYk2T~5M46oqH-4}U434;pze;Q?MqgV7jcLZBUzs+4Bhq9!Dhp$v6mX`8m7?81e( z30Gm_4%~wejzZP@ax&-K``w!vgdUF*S$>C^rR9~?we0%F=GOL3PRbXGyF@xr+O3H{ z^q6@cL`jcDF%Nt*iMa0)sgQ=+kogH8aTfJcOQ&N-qN0B<3OAR!zhFr>4RN@` zL+U9WjbpoBJE_S;IxJTV+*NJGA}w22uMyEyq+42BL%1qPf3e=|psLjnWuDe#%)U=5 zSI{j|Y^&K4gY$-V=jKZMUAdyz7z+{+_)8@4J%mlIt5*$>1to9}x}Xn2@C;tSD|iDR f;1g!x5j=)x@B%iV1@GV#{8R?c73?i^A@K1F8!&$g literal 808 zcmaJuuL`fcx<$zejCwZdv)LV05kPjD2JWVPgxq&{j4M`p% zH03;H2${r`+?nkY2`~`Cjx5O=A^0;whr>akrz#~ZvQuG&+_K=T6!i?ihR~oyB9ejT zg8oYmyhceVwBC)nWwmBl`Yw-BX0km?3!brDcq|6-Dmr~bRV7LguQ7PJUK_3W$ikhV zpDAnh^auDI8v&W>GrV%9b9~o@VMjomtP@tYF9@i NqRY;y=)93y?+eq22Q>fy diff --git a/RxSwift/Info.plist b/RxSwift/Info.plist index 7e7479f00ef41033715a1052a946b2eeaeb9975a..21cb8bc3ed32f79f17161e4c7c144163b796508f 100644 GIT binary patch literal 449 zcmYk2T~5M46oqH-4}U434;pze;Q?MqgV7jcLZBUzs+4Bhq9!Dhp$v6mX`8m7?81e( z30Gm_4%~wejzZP@ax&-K``w!vgdUF*S$>C^rR9~?we0%F=GOL3PRbXGyF@xr+O3H{ z^q6@cL`jcDF%Nt*iMa0)sgQ=+kogH8aTfJcOQ&N-qN0B<3OAR!zhFr>4RN@` zL+U9WjbpoBJE_S;IxJTV+*NJGA}w22uMyEyq+42BL%1qPf3e=|psLjnWuDe#%)U=5 zSI{j|Y^&K4gY$-V=jKZMUAdyz7z+{+_)8@4J%mlIt5*$>1to9}x}Xn2@C;tSD|iDR f;1g!x5j=)x@B%iV1@GV#{8R?c73?i^A@K1F8!&$g literal 808 zcmaJuuL`fcx<$zejCwZdv)LV05kPjD2JWVPgxq&{j4M`p% zH03;H2${r`+?nkY2`~`Cjx5O=A^0;whr>akrz#~ZvQuG&+_K=T6!i?ihR~oyB9ejT zg8oYmyhceVwBC)nWwmBl`Yw-BX0km?3!brDcq|6-Dmr~bRV7LguQ7PJUK_3W$ikhV zpDAnh^auDI8v&W>GrV%9b9~o@VMjomtP@tYF9@i NqRY;y=)93y?+eq22Q>fy diff --git a/RxTests/Info.plist b/RxTests/Info.plist index 7e7479f00ef41033715a1052a946b2eeaeb9975a..21cb8bc3ed32f79f17161e4c7c144163b796508f 100644 GIT binary patch literal 449 zcmYk2T~5M46oqH-4}U434;pze;Q?MqgV7jcLZBUzs+4Bhq9!Dhp$v6mX`8m7?81e( z30Gm_4%~wejzZP@ax&-K``w!vgdUF*S$>C^rR9~?we0%F=GOL3PRbXGyF@xr+O3H{ z^q6@cL`jcDF%Nt*iMa0)sgQ=+kogH8aTfJcOQ&N-qN0B<3OAR!zhFr>4RN@` zL+U9WjbpoBJE_S;IxJTV+*NJGA}w22uMyEyq+42BL%1qPf3e=|psLjnWuDe#%)U=5 zSI{j|Y^&K4gY$-V=jKZMUAdyz7z+{+_)8@4J%mlIt5*$>1to9}x}Xn2@C;tSD|iDR f;1g!x5j=)x@B%iV1@GV#{8R?c73?i^A@K1F8!&$g literal 808 zcmaJuuL`fcx<$zejCwZdv)LV05kPjD2JWVPgxq&{j4M`p% zH03;H2${r`+?nkY2`~`Cjx5O=A^0;whr>akrz#~ZvQuG&+_K=T6!i?ihR~oyB9ejT zg8oYmyhceVwBC)nWwmBl`Yw-BX0km?3!brDcq|6-Dmr~bRV7LguQ7PJUK_3W$ikhV zpDAnh^auDI8v&W>GrV%9b9~o@VMjomtP@tYF9@i NqRY;y=)93y?+eq22Q>fy diff --git a/scripts/pre-release-tests.sh b/scripts/pre-release-tests.sh index cb24d05d..e2fbe208 100755 --- a/scripts/pre-release-tests.sh +++ b/scripts/pre-release-tests.sh @@ -13,13 +13,43 @@ if [ "$1" == "r" ]; then RELEASE_TEST=1 fi -./scripts/validate-headers.swift -./scripts/package-spm.swift > /dev/null +function ensureVersionEqual() { + if [[ "$1" != "$2" ]]; then + echo "Version $1 and $2 are not equal ($3)" + exit -1 + fi +} -if [ `git ls-files -o -d --exclude-standard | wc -l` -gt 0 ]; then - echo "Package for Swift package manager isn't updated, please run ./scripts/package-spm.swift and commit the changes" - exit -1 -fi +function ensureNoGitChanges() { + if [ `git diff HEAD | wc -l` -gt 0 ]; then + echo $1 + exit -1 + fi +} + +function checkPlistVersions() { + RXSWIFT_VERSION=`cat RxSwift.podspec | grep -E "s.version\s+=" | cut -d '"' -f 2` + + PROJECTS=(RxSwift RxCocoa RxBlocking RxTests) + for project in ${PROJECTS[@]} + do + echo "Checking version for ${project}" + PODSPEC_VERSION=`cat $project.podspec | grep -E "s.version\s+=" | cut -d '"' -f 2` + ensureVersionEqual "$RXSWIFT_VERSION" "$PODSPEC_VERSION" "${project} version not equal" + if [[ `defaults write "\`pwd\`/${project}/Info.plist" CFBundleShortVersionString $RXSWIFT_VERSION` != $RXSWIFT_VERSION ]]; then + defaults write "`pwd`/${project}/Info.plist" CFBundleShortVersionString $RXSWIFT_VERSION + fi + done + + ensureNoGitChanges "Plist versions aren't correct" +} + +checkPlistVersions + +./scripts/validate-headers.swift + +./scripts/package-spm.swift > /dev/null +ensureNoGitChanges "Package for Swift package manager isn't updated, please run ./scripts/package-spm.swift and commit the changes" # ios 7 sim #if [ `xcrun simctl list | grep "${DEFAULT_IOS7_SIMULATOR}" | wc -l` == 0 ]; then