From 3fd15897cef5f363a26e36a421fc9a291e259e4d Mon Sep 17 00:00:00 2001
From: Krunoslav Zaher <krunoslav.zaher@gmail.com>
Date: Tue, 31 May 2016 21:27:15 +0200
Subject: [PATCH] Improves version checks.

---
 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 |  40 +++++++++++++++++++++++++++++------
 5 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/RxBlocking/Info.plist b/RxBlocking/Info.plist
index 7e7479f00ef41033715a1052a946b2eeaeb9975a..c9b2b84c1aeef5cf48a23079b19910edb1c7af7a 100644
GIT binary patch
literal 449
zcmYk2TS~(~6ozN&tzJ8A^+B-@LXq|*1VIrIN}Eg}YSWNQRS<@0I*o&A5|XsqUAPc8
z;VJ}o;2wN%tc`kJe&+wr`Oabbk<XJ<mfvA+VR31BCBM41zOlJgK*dsdo1i_V-5Li2
zpIP@|oc36p@G!8_m<Jv~r7YA2EJ*o~vzVY_W?I|}XgZGBUFPU?#0aWnPc0aRDtA*s
zr15mlCTKUyRW@OM7>xwmWS;2yw-G-vcbw9`FM#E2z@Y8}^_V@4gj>kmUog@wLmck%
zi2908lf*fajwP9({c6oHyQ-tuq~+-96(*XBbz5s|*sR+PQ3ChZqc=OaZk<T7$-Ymj
z*6<Bh9J|>PgR{(TcdjqR-&JdhW150Q1pWdGd=HzJ*466<$b$+v16|;P2t0!q@Cx3*
g2l#|JcmNOKDLjV_Xv14L0kg`%9|b#eoeO;Y0vLOL1ONa4

literal 808
zcmaJ<OHYG95I);qfux6eC|f-kV<=65B|%$CV5xd)R@hQf9vj#``1ej9#t7n`HoG(5
zYet<MvsBu%vPz14EZ-|5Sz>uuL`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@tYF<ft91_oK_fnx%WZDNPmmW{n`w0vEd
zU=nQ5vR+=M(FA@}MqO$gn*HJBTgSgfTpDg^%t*~!2-f`VwTsc;6s5Qd_0NGf<vzev
zI|chmoKvwYTbvU(U7Q`c^an=Zd64l648LFqeu+KbUO26|9p8o32op|IBc)Z<l>9@i
NqRY;y=)93y?+eq22Q>fy

diff --git a/RxCocoa/Info.plist b/RxCocoa/Info.plist
index 7e7479f00ef41033715a1052a946b2eeaeb9975a..c9b2b84c1aeef5cf48a23079b19910edb1c7af7a 100644
GIT binary patch
literal 449
zcmYk2TS~(~6ozN&tzJ8A^+B-@LXq|*1VIrIN}Eg}YSWNQRS<@0I*o&A5|XsqUAPc8
z;VJ}o;2wN%tc`kJe&+wr`Oabbk<XJ<mfvA+VR31BCBM41zOlJgK*dsdo1i_V-5Li2
zpIP@|oc36p@G!8_m<Jv~r7YA2EJ*o~vzVY_W?I|}XgZGBUFPU?#0aWnPc0aRDtA*s
zr15mlCTKUyRW@OM7>xwmWS;2yw-G-vcbw9`FM#E2z@Y8}^_V@4gj>kmUog@wLmck%
zi2908lf*fajwP9({c6oHyQ-tuq~+-96(*XBbz5s|*sR+PQ3ChZqc=OaZk<T7$-Ymj
z*6<Bh9J|>PgR{(TcdjqR-&JdhW150Q1pWdGd=HzJ*466<$b$+v16|;P2t0!q@Cx3*
g2l#|JcmNOKDLjV_Xv14L0kg`%9|b#eoeO;Y0vLOL1ONa4

literal 808
zcmaJ<OHYG95I);qfux6eC|f-kV<=65B|%$CV5xd)R@hQf9vj#``1ej9#t7n`HoG(5
zYet<MvsBu%vPz14EZ-|5Sz>uuL`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@tYF<ft91_oK_fnx%WZDNPmmW{n`w0vEd
zU=nQ5vR+=M(FA@}MqO$gn*HJBTgSgfTpDg^%t*~!2-f`VwTsc;6s5Qd_0NGf<vzev
zI|chmoKvwYTbvU(U7Q`c^an=Zd64l648LFqeu+KbUO26|9p8o32op|IBc)Z<l>9@i
NqRY;y=)93y?+eq22Q>fy

diff --git a/RxSwift/Info.plist b/RxSwift/Info.plist
index 7e7479f00ef41033715a1052a946b2eeaeb9975a..c9b2b84c1aeef5cf48a23079b19910edb1c7af7a 100644
GIT binary patch
literal 449
zcmYk2TS~(~6ozN&tzJ8A^+B-@LXq|*1VIrIN}Eg}YSWNQRS<@0I*o&A5|XsqUAPc8
z;VJ}o;2wN%tc`kJe&+wr`Oabbk<XJ<mfvA+VR31BCBM41zOlJgK*dsdo1i_V-5Li2
zpIP@|oc36p@G!8_m<Jv~r7YA2EJ*o~vzVY_W?I|}XgZGBUFPU?#0aWnPc0aRDtA*s
zr15mlCTKUyRW@OM7>xwmWS;2yw-G-vcbw9`FM#E2z@Y8}^_V@4gj>kmUog@wLmck%
zi2908lf*fajwP9({c6oHyQ-tuq~+-96(*XBbz5s|*sR+PQ3ChZqc=OaZk<T7$-Ymj
z*6<Bh9J|>PgR{(TcdjqR-&JdhW150Q1pWdGd=HzJ*466<$b$+v16|;P2t0!q@Cx3*
g2l#|JcmNOKDLjV_Xv14L0kg`%9|b#eoeO;Y0vLOL1ONa4

literal 808
zcmaJ<OHYG95I);qfux6eC|f-kV<=65B|%$CV5xd)R@hQf9vj#``1ej9#t7n`HoG(5
zYet<MvsBu%vPz14EZ-|5Sz>uuL`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@tYF<ft91_oK_fnx%WZDNPmmW{n`w0vEd
zU=nQ5vR+=M(FA@}MqO$gn*HJBTgSgfTpDg^%t*~!2-f`VwTsc;6s5Qd_0NGf<vzev
zI|chmoKvwYTbvU(U7Q`c^an=Zd64l648LFqeu+KbUO26|9p8o32op|IBc)Z<l>9@i
NqRY;y=)93y?+eq22Q>fy

diff --git a/RxTests/Info.plist b/RxTests/Info.plist
index 7e7479f00ef41033715a1052a946b2eeaeb9975a..c9b2b84c1aeef5cf48a23079b19910edb1c7af7a 100644
GIT binary patch
literal 449
zcmYk2TS~(~6ozN&tzJ8A^+B-@LXq|*1VIrIN}Eg}YSWNQRS<@0I*o&A5|XsqUAPc8
z;VJ}o;2wN%tc`kJe&+wr`Oabbk<XJ<mfvA+VR31BCBM41zOlJgK*dsdo1i_V-5Li2
zpIP@|oc36p@G!8_m<Jv~r7YA2EJ*o~vzVY_W?I|}XgZGBUFPU?#0aWnPc0aRDtA*s
zr15mlCTKUyRW@OM7>xwmWS;2yw-G-vcbw9`FM#E2z@Y8}^_V@4gj>kmUog@wLmck%
zi2908lf*fajwP9({c6oHyQ-tuq~+-96(*XBbz5s|*sR+PQ3ChZqc=OaZk<T7$-Ymj
z*6<Bh9J|>PgR{(TcdjqR-&JdhW150Q1pWdGd=HzJ*466<$b$+v16|;P2t0!q@Cx3*
g2l#|JcmNOKDLjV_Xv14L0kg`%9|b#eoeO;Y0vLOL1ONa4

literal 808
zcmaJ<OHYG95I);qfux6eC|f-kV<=65B|%$CV5xd)R@hQf9vj#``1ej9#t7n`HoG(5
zYet<MvsBu%vPz14EZ-|5Sz>uuL`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@tYF<ft91_oK_fnx%WZDNPmmW{n`w0vEd
zU=nQ5vR+=M(FA@}MqO$gn*HJBTgSgfTpDg^%t*~!2-f`VwTsc;6s5Qd_0NGf<vzev
zI|chmoKvwYTbvU(U7Q`c^an=Zd64l648LFqeu+KbUO26|9p8o32op|IBc)Z<l>9@i
NqRY;y=)93y?+eq22Q>fy

diff --git a/scripts/pre-release-tests.sh b/scripts/pre-release-tests.sh
index cb24d05d..f6c7b194 100755
--- a/scripts/pre-release-tests.sh
+++ b/scripts/pre-release-tests.sh
@@ -13,13 +13,41 @@ 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"
+		defaults write  "`pwd`/${project}/Info.plist" CFBundleShortVersionString $RXSWIFT_VERSION
+	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