From e1f72cb5668dd9d64a2a968f2b13307153106d40 Mon Sep 17 00:00:00 2001
From: Krunoslav Zaher <krunoslav.zaher@gmail.com>
Date: Sun, 21 Aug 2016 03:49:56 +0200
Subject: [PATCH] Improves version detection.

---
 RxBlocking/Info.plist | Bin 816 -> 457 bytes
 RxCocoa/Info.plist    | Bin 816 -> 457 bytes
 RxSwift/Info.plist    | Bin 816 -> 457 bytes
 RxTests/Info.plist    | Bin 816 -> 457 bytes
 scripts/all-tests.sh  |   8 +++++---
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/RxBlocking/Info.plist b/RxBlocking/Info.plist
index 8f76d9cd645db5e517509637ac4a1a341319cae3..1a285d1abdf6a5a59ed48cbe78964ac5bd64fec7 100644
GIT binary patch
literal 457
zcmYk2%TB^T6ozN;hInBBU1(&-f^Hg&i3>Lh?O>`>nqJTaW-^qaOe}5F79$&d1s}wh
z@F`4u1K+`gBU1Iu;?Mm5Ip3VjAo6*VHX83Rx3s*nx|UxrY;10A7g4EP*&%3OX}6}q
z&}Y^-jME;A6CMUu8uP#-sGNn`kOe6paTXI)%1n!U0Zped>t~KmCybzKcGZGWsB$+I
zL>kW)Y=ZW(TxIvn52J}-o6Hkk|6aro%$=rm;0s_S8!)JQM?GfGBH<P@_ZN(G%MgpZ
zJfgnh(<He)k{jYsKN?f{kf4KF-7veVqu8Y7=;{?Fnu>K>Yirn)>{C$!``4p4J6N)g
z<%Y?=SF6?W4OSex*%E{E%x-tCFU23$>WX8Uf<y%V0t<W(o0itqB?II^6`X)Ba6tr~
l!3%f=Z{P!b!UB|_49}nn&tV@@_z32egFgy(7rGGm^aau#f$IPO

literal 816
zcmaKqTTg>96vv<4r$Dj?eHh(hVvJ!d14@E!jBuIyv{dLAS%C(+3*X+ei!p-Or=~sU
z_y3=ZIyq)c+S9U1i+n7Pl%XuqJSyTePsVZ>Sc4~dqV?2Ub72G@E|xe;D<Qd|KC=x;
z9w0R3oKb|#z?9sX?FSMt5W<cu$r~Z~GeU>MK_RCoB`UI0V1?YW;ItI=3}6FDP+}3w
zAakMrvIDPi8VRj;qi$)f8J51wV@6H7r>x)^&4ou3Ft4K1H$+vU1oIk&m+Q5WijOqf
z3G&HkGpB!t-?0$}Q+<Y4&UB9NyBKy1!s$AtWt-u83o|r=l^!}KaBLGhfo<8?>!#)F
z!h|BB3{uw1%QTwcM`hUM#v$1swS4>dw-A>^TawVA<}HFXe|zmx^fyH*u15WH!<%*=
zV5&ofFuozms1uVWIT5?Er9FYumDJIn{+$te9`t$zg}-1Jz!H1Dy>MD>cYGICBuY79
V1|wC~wEiQkqRZ~7=)9R)?+Xr33CREe

diff --git a/RxCocoa/Info.plist b/RxCocoa/Info.plist
index 8f76d9cd645db5e517509637ac4a1a341319cae3..1a285d1abdf6a5a59ed48cbe78964ac5bd64fec7 100644
GIT binary patch
literal 457
zcmYk2%TB^T6ozN;hInBBU1(&-f^Hg&i3>Lh?O>`>nqJTaW-^qaOe}5F79$&d1s}wh
z@F`4u1K+`gBU1Iu;?Mm5Ip3VjAo6*VHX83Rx3s*nx|UxrY;10A7g4EP*&%3OX}6}q
z&}Y^-jME;A6CMUu8uP#-sGNn`kOe6paTXI)%1n!U0Zped>t~KmCybzKcGZGWsB$+I
zL>kW)Y=ZW(TxIvn52J}-o6Hkk|6aro%$=rm;0s_S8!)JQM?GfGBH<P@_ZN(G%MgpZ
zJfgnh(<He)k{jYsKN?f{kf4KF-7veVqu8Y7=;{?Fnu>K>Yirn)>{C$!``4p4J6N)g
z<%Y?=SF6?W4OSex*%E{E%x-tCFU23$>WX8Uf<y%V0t<W(o0itqB?II^6`X)Ba6tr~
l!3%f=Z{P!b!UB|_49}nn&tV@@_z32egFgy(7rGGm^aau#f$IPO

literal 816
zcmaKqTTg>96vv<4r$Dj?eHh(hVvJ!d14@E!jBuIyv{dLAS%C(+3*X+ei!p-Or=~sU
z_y3=ZIyq)c+S9U1i+n7Pl%XuqJSyTePsVZ>Sc4~dqV?2Ub72G@E|xe;D<Qd|KC=x;
z9w0R3oKb|#z?9sX?FSMt5W<cu$r~Z~GeU>MK_RCoB`UI0V1?YW;ItI=3}6FDP+}3w
zAakMrvIDPi8VRj;qi$)f8J51wV@6H7r>x)^&4ou3Ft4K1H$+vU1oIk&m+Q5WijOqf
z3G&HkGpB!t-?0$}Q+<Y4&UB9NyBKy1!s$AtWt-u83o|r=l^!}KaBLGhfo<8?>!#)F
z!h|BB3{uw1%QTwcM`hUM#v$1swS4>dw-A>^TawVA<}HFXe|zmx^fyH*u15WH!<%*=
zV5&ofFuozms1uVWIT5?Er9FYumDJIn{+$te9`t$zg}-1Jz!H1Dy>MD>cYGICBuY79
V1|wC~wEiQkqRZ~7=)9R)?+Xr33CREe

diff --git a/RxSwift/Info.plist b/RxSwift/Info.plist
index 8f76d9cd645db5e517509637ac4a1a341319cae3..1a285d1abdf6a5a59ed48cbe78964ac5bd64fec7 100644
GIT binary patch
literal 457
zcmYk2%TB^T6ozN;hInBBU1(&-f^Hg&i3>Lh?O>`>nqJTaW-^qaOe}5F79$&d1s}wh
z@F`4u1K+`gBU1Iu;?Mm5Ip3VjAo6*VHX83Rx3s*nx|UxrY;10A7g4EP*&%3OX}6}q
z&}Y^-jME;A6CMUu8uP#-sGNn`kOe6paTXI)%1n!U0Zped>t~KmCybzKcGZGWsB$+I
zL>kW)Y=ZW(TxIvn52J}-o6Hkk|6aro%$=rm;0s_S8!)JQM?GfGBH<P@_ZN(G%MgpZ
zJfgnh(<He)k{jYsKN?f{kf4KF-7veVqu8Y7=;{?Fnu>K>Yirn)>{C$!``4p4J6N)g
z<%Y?=SF6?W4OSex*%E{E%x-tCFU23$>WX8Uf<y%V0t<W(o0itqB?II^6`X)Ba6tr~
l!3%f=Z{P!b!UB|_49}nn&tV@@_z32egFgy(7rGGm^aau#f$IPO

literal 816
zcmaKqTTg>96vv<4r$Dj?eHh(hVvJ!d14@E!jBuIyv{dLAS%C(+3*X+ei!p-Or=~sU
z_y3=ZIyq)c+S9U1i+n7Pl%XuqJSyTePsVZ>Sc4~dqV?2Ub72G@E|xe;D<Qd|KC=x;
z9w0R3oKb|#z?9sX?FSMt5W<cu$r~Z~GeU>MK_RCoB`UI0V1?YW;ItI=3}6FDP+}3w
zAakMrvIDPi8VRj;qi$)f8J51wV@6H7r>x)^&4ou3Ft4K1H$+vU1oIk&m+Q5WijOqf
z3G&HkGpB!t-?0$}Q+<Y4&UB9NyBKy1!s$AtWt-u83o|r=l^!}KaBLGhfo<8?>!#)F
z!h|BB3{uw1%QTwcM`hUM#v$1swS4>dw-A>^TawVA<}HFXe|zmx^fyH*u15WH!<%*=
zV5&ofFuozms1uVWIT5?Er9FYumDJIn{+$te9`t$zg}-1Jz!H1Dy>MD>cYGICBuY79
V1|wC~wEiQkqRZ~7=)9R)?+Xr33CREe

diff --git a/RxTests/Info.plist b/RxTests/Info.plist
index 8f76d9cd645db5e517509637ac4a1a341319cae3..1a285d1abdf6a5a59ed48cbe78964ac5bd64fec7 100644
GIT binary patch
literal 457
zcmYk2%TB^T6ozN;hInBBU1(&-f^Hg&i3>Lh?O>`>nqJTaW-^qaOe}5F79$&d1s}wh
z@F`4u1K+`gBU1Iu;?Mm5Ip3VjAo6*VHX83Rx3s*nx|UxrY;10A7g4EP*&%3OX}6}q
z&}Y^-jME;A6CMUu8uP#-sGNn`kOe6paTXI)%1n!U0Zped>t~KmCybzKcGZGWsB$+I
zL>kW)Y=ZW(TxIvn52J}-o6Hkk|6aro%$=rm;0s_S8!)JQM?GfGBH<P@_ZN(G%MgpZ
zJfgnh(<He)k{jYsKN?f{kf4KF-7veVqu8Y7=;{?Fnu>K>Yirn)>{C$!``4p4J6N)g
z<%Y?=SF6?W4OSex*%E{E%x-tCFU23$>WX8Uf<y%V0t<W(o0itqB?II^6`X)Ba6tr~
l!3%f=Z{P!b!UB|_49}nn&tV@@_z32egFgy(7rGGm^aau#f$IPO

literal 816
zcmaKqTTg>96vv<4r$Dj?eHh(hVvJ!d14@E!jBuIyv{dLAS%C(+3*X+ei!p-Or=~sU
z_y3=ZIyq)c+S9U1i+n7Pl%XuqJSyTePsVZ>Sc4~dqV?2Ub72G@E|xe;D<Qd|KC=x;
z9w0R3oKb|#z?9sX?FSMt5W<cu$r~Z~GeU>MK_RCoB`UI0V1?YW;ItI=3}6FDP+}3w
zAakMrvIDPi8VRj;qi$)f8J51wV@6H7r>x)^&4ou3Ft4K1H$+vU1oIk&m+Q5WijOqf
z3G&HkGpB!t-?0$}Q+<Y4&UB9NyBKy1!s$AtWt-u83o|r=l^!}KaBLGhfo<8?>!#)F
z!h|BB3{uw1%QTwcM`hUM#v$1swS4>dw-A>^TawVA<}HFXe|zmx^fyH*u15WH!<%*=
zV5&ofFuozms1uVWIT5?Er9FYumDJIn{+$te9`t$zg}-1Jz!H1Dy>MD>cYGICBuY79
V1|wC~wEiQkqRZ~7=)9R)?+Xr33CREe

diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
index 7af35063..5af24cff 100755
--- a/scripts/all-tests.sh
+++ b/scripts/all-tests.sh
@@ -35,15 +35,17 @@ function ensureNoGitChanges() {
 
 function checkPlistVersions() {
 	RXSWIFT_VERSION=`cat RxSwift.podspec | grep -E "s.version\s+=" | cut -d '"' -f 2`
-	
+	echo "RxSwift version: ${RXSWIFT_VERSION}"
 	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
+        PLIST_VERSION=`defaults read  "\`pwd\`/${project}/Info.plist" CFBundleShortVersionString`
+		if [[ "${PLIST_VERSION}" != "${RXSWIFT_VERSION}" ]]; then
+            echo "Invalid version for `pwd`/${project}/Info.plist: ${PLIST_VERSION}"
+            defaults write  "`pwd`/${project}/Info.plist" CFBundleShortVersionString $RXSWIFT_VERSION
 		fi
 	done