Unify version to xcconfig

Author: freak4pc

Dangerfile

@@ -11,12 +11,6 @@ warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]"
 # Warn no CHANGELOG
 warn("No CHANGELOG changes made") if git.lines_of_code > 50 && !git.modified_files.include?("CHANGELOG.md") && !declared_trivial
 
-# Warn pod spec changes
-warn("RxCocoa.podspec changed") if git.modified_files.include?("RxCocoa.podspec")
-warn("RxSwift.podspec changed") if git.modified_files.include?("RxSwift.podspec")
-warn("RxTest.podspec changed") if git.modified_files.include?("RxTest.podspec")
-warn("RxBlocking.podspec changed") if git.modified_files.include?("RxBlocking.podspec")
-
 # Warn summary on pull request
 if github.pr_body.length < 5
   warn "Please provide a summary in the Pull Request description"

Rx.xcworkspace/contents.xcworkspacedata

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.9.0</string>
+	<string>$(RX_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

RxBlocking/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.9.0</string>
+	<string>$(RX_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

RxCocoa/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.9.0</string>
+	<string>$(RX_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

RxRelay/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.9.0</string>
+	<string>$(RX_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

RxSwift/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.9.0</string>
+	<string>$(RX_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

RxTest/Info.plist

@@ -0,0 +1 @@
+RX_VERSION = 6.9.0

Version.xcconfig

@@ -70,12 +70,6 @@ elif [ "$1" == "SPM" ]; then
 	TEST_SPM=1
 fi
 
-if [ "${RELEASE_TEST}" -eq 1 ]; then
-	VALIDATE_PODS=${VALIDATE_PODS:-1}
-else
-	VALIDATE_PODS=${VALIDATE_PODS:-0}
-fi
-
 RUN_DEVICE_TESTS=${RUN_DEVICE_TESTS:-1}
 
 function ensureVersionEqual() {
@@ -93,17 +87,16 @@ function ensureNoGitChanges() {
 }
 
 function checkPlistVersions() {
-	RXSWIFT_VERSION=`cat RxSwift.podspec | grep -E "s.version\s+=" | cut -d '"' -f 2`
+	RXSWIFT_VERSION=`grep "^RX_VERSION" Version.xcconfig | cut -d '=' -f 2 | tr -d ' '`
 	echo "RxSwift version: ${RXSWIFT_VERSION}"
 	PROJECTS=(RxSwift RxCocoa RxRelay RxBlocking RxTest)
 	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"
 		PLIST_VERSION=`defaults read  "\`pwd\`/${project}/Info.plist" CFBundleShortVersionString`
-		if ! ( [[ ${RXSWIFT_VERSION} = *"-"* ]] || [[ "${PLIST_VERSION}" == "${RXSWIFT_VERSION}" ]] ) ; then
-			echo "Invalid version for `pwd`/${project}/Info.plist: ${PLIST_VERSION}"
+		# Check that Info.plist uses the RX_VERSION variable reference
+		if [[ "${PLIST_VERSION}" != '$(RX_VERSION)' ]]; then
+			echo "Invalid version for `pwd`/${project}/Info.plist: ${PLIST_VERSION} (expected \$(RX_VERSION))"
           	exit -1
 		fi
 	done
@@ -129,10 +122,6 @@ if [ "${RELEASE_TEST}" -eq 1 ]; then
 	CONFIGURATIONS=(Debug Release Release-Tests)
 fi
 
-if [ "${VALIDATE_PODS}" -eq 1 ]; then
-	SWIFT_VERSION=5.0 scripts/validate-podspec.sh
-fi
-
 if [ "${VALIDATE_IOS_EXAMPLE}" -eq 1 ]; then
 	if [[ "${UNIX_NAME}" == "${DARWIN}" ]]; then
 		for scheme in "RxExample-iOS"