Release 4.4.2

kzaher · kzaher · commit 800a79f549de · 2019-03-10T22:15:21.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,15 @@ All notable changes to this project will be documented in this file.
 ---
 ## Master
 
+## [4.4.2](https://github.com/ReactiveX/RxSwift/releases/tag/4.4.2)
+
 * Adds `UIView.rx.backgroundColor` Binder. #1888
-* Bring back the `first` operator to `ObservableType`. #1886
 
 ### Anomalies
 
 * Fix multiple disposes on ScheduledDisposables. #1892
 * Fix `DelegateProxy` main thread validation. #1882
+* Bring back the `first` operator to `ObservableType`. #1886
 
 ## [4.4.1](https://github.com/ReactiveX/RxSwift/releases/tag/4.4.1)
 
diff --git a/RxAtomic.podspec b/RxAtomic.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxAtomic"
-  s.version          = "4.4.1"
+  s.version          = "4.4.2"
   s.summary          = "Atomic primitives for RxSwift"
   s.description      = <<-DESC
 Atomic primitives for RxSwift.
diff --git a/RxAtomic/Info.plist b/RxAtomic/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.1</string>
+	<string>4.4.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
diff --git a/RxBlocking.podspec b/RxBlocking.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxBlocking"
-  s.version          = "4.4.1"
+  s.version          = "4.4.2"
   s.summary          = "RxSwift Blocking operatos"
   s.description      = <<-DESC
 Set of blocking operators for RxSwift. These operators are mostly intended for unit/integration tests
@@ -25,6 +25,6 @@ Waiting for observable sequence to complete before exiting command line applicat
   s.source_files          = 'RxBlocking/**/*.swift', 'Platform/**/*.swift'
   s.exclude_files         = 'RxBlocking/Platform/**/*.swift'
 
-  s.dependency 'RxAtomic', '~> 4.4'
-  s.dependency 'RxSwift', '~> 4.0'
+  s.dependency 'RxAtomic', '~> 4.4', '>= 4.4.2'
+  s.dependency 'RxSwift', '~> 4.4', '>= 4.4.2'
 end
diff --git a/RxBlocking/Info.plist b/RxBlocking/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.1</string>
+	<string>4.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/RxCocoa.podspec b/RxCocoa.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxCocoa"
-  s.version          = "4.4.1"
+  s.version          = "4.4.2"
   s.summary          = "RxSwift Cocoa extensions"
   s.description      = <<-DESC
 * UI extensions
@@ -22,5 +22,5 @@ Pod::Spec.new do |s|
   s.source_files          = 'RxCocoa/**/*.{swift,h,m}', 'Platform/**/*.swift'
   s.exclude_files         = 'RxCocoa/Platform/**/*.swift', 'Platform/AtomicInt.swift'
 
-  s.dependency 'RxSwift', '~> 4.0'
+  s.dependency 'RxSwift', '~> 4.4', '>= 4.4.2'
 end
diff --git a/RxCocoa/Info.plist b/RxCocoa/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.1</string>
+	<string>4.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/RxSwift.podspec b/RxSwift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxSwift"
-  s.version          = "4.4.1"
+  s.version          = "4.4.2"
   s.summary          = "RxSwift is a Swift implementation of Reactive Extensions"
   s.description      = <<-DESC
 This is a Swift port of [ReactiveX.io](https://github.com/ReactiveX)
@@ -35,5 +35,5 @@ gitDiff().grep("bug").less          // sequences of swift objects
   s.source_files          = 'RxSwift/**/*.swift', 'Platform/**/*.swift'
   s.exclude_files         = 'RxSwift/Platform/**/*.swift'
 
-  s.dependency 'RxAtomic', '~> 4.4'
+  s.dependency 'RxAtomic', '~> 4.4', '>= 4.4.2'
 end
diff --git a/RxSwift/Info.plist b/RxSwift/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.1</string>
+	<string>4.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/RxTest.podspec b/RxTest.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxTest"
-  s.version          = "4.4.1"
+  s.version          = "4.4.2"
   s.summary          = "RxSwift Testing extensions"
   s.description      = <<-DESC
 Unit testing extensions for RxSwift. This library contains mock schedulers, observables, and observers
@@ -56,8 +56,8 @@ func testMap() {
 
   s.framework    = 'XCTest'
 
-  s.dependency 'RxAtomic', '~> 4.4'
-  s.dependency 'RxSwift', '~> 4.0'
+  s.dependency 'RxAtomic', '~> 4.4', '>= 4.4.2'
+  s.dependency 'RxSwift', '~> 4.4', '>= 4.4.2'
 
   s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }
 end
diff --git a/RxTest/Info.plist b/RxTest/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.1</string>
+	<string>4.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Tests/RxCocoaTests/SharedSequence+Test.swift b/Tests/RxCocoaTests/SharedSequence+Test.swift
@@ -37,10 +37,10 @@ extension SharedSequenceTest {
         var expectation2: XCTestExpectation!
 
         _ = backgroundScheduler.schedule(()) { _ in
-            var subscribing1 = true
+            var subscribing1 = AtomicInt(1)
             let firstSubscriptionFuture = SingleAssignmentDisposable()
             let firstSubscription = xs.asObservable().subscribe { e in
-                if !subscribing1 {
+                if globalLoad(&subscribing1) == 0 {
                     XCTAssertTrue(DispatchQueue.isMain)
                 }
                 switch e {
@@ -57,12 +57,12 @@ extension SharedSequenceTest {
                 }
             }
             firstSubscriptionFuture.setDisposable(firstSubscription)
-            subscribing1 = false
+            sub(&subscribing1, 1)
 
-            var subscribing = true
+            var subscribing = AtomicInt(1)
             let secondSubscriptionFuture = SingleAssignmentDisposable()
             let secondSubscription = xs.asObservable().subscribe { e in
-                if !subscribing {
+                if globalLoad(&subscribing) == 0 {
                     XCTAssertTrue(DispatchQueue.isMain)
                 }
                 switch e {
@@ -80,7 +80,7 @@ extension SharedSequenceTest {
             }
             secondSubscriptionFuture.setDisposable(secondSubscription)
 
-            subscribing = false
+            sub(&subscribing, 1)
 
             // Subscription should be made on main scheduler
             // so this will make sure execution is continued after
diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
@@ -129,12 +129,8 @@ if [ "${RELEASE_TEST}" -eq 1 ]; then
 	CONFIGURATIONS=(Debug Release Release-Tests)
 fi
 
-if [ "${RELEASE_TEST}" -eq 1 ]; then
-	scripts/validate-markdown.sh
-fi
-
 if [ "${VALIDATE_PODS}" -eq 1 ]; then
-	scripts/validate-podspec.sh
+	SWIFT_VERSION=4.2 scripts/validate-podspec.sh
 fi
 
 if [ "${VALIDATE_IOS_EXAMPLE}" -eq 1 ]; then
diff --git a/scripts/common.sh b/scripts/common.sh
@@ -22,26 +22,32 @@ BOLDWHITE="\033[1m\033[37m"
 # make sure all tests are passing
 
 if [[ `uname` == "Darwin" ]]; then
-    if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.iOS-11-3 | wc -l` -eq 1 ]; then
-    	DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/11.3
+    if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.iOS-12-1 | wc -l` -eq 1 ]; then
+        DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/12.1
     elif [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.iOS-11-4 | wc -l` -eq 1 ]; then
-    	DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/11.4
+        DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/11.4
+    elif [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.iOS-11-3 | wc -l` -eq 1 ]; then
+    	DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/11.3
     else
     	DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/11.0
     fi
 
-    if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.watchOS-4-3 | wc -l` -eq 1 ]; then
-    	DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/4.3
+    if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.watchOS-5-1 | wc -l` -eq 1 ]; then
+        DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/5.1
     elif [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.watchOS-4-4 | wc -l` -eq 1 ]; then
-    	DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/4.4
+        DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/4.4
+    elif [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.watchOS-4-3 | wc -l` -eq 1 ]; then
+    	DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/4.3
     else
     	DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/4.2
     fi
 
-    if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.tvOS-11-3 | wc -l` -eq 1 ]; then
-    	DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/11.3
+    if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.tvOS-12-1 | wc -l` -eq 1 ]; then
+        DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/12.1
     elif [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.tvOS-11-4 | wc -l` -eq 1 ]; then
-    	DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/11.4
+        DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/11.4
+    elif [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.tvOS-11-3 | wc -l` -eq 1 ]; then
+    	DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/11.3
     else
     	DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/11.0
     fi
diff --git a/scripts/test-linux.sh b/scripts/test-linux.sh
@@ -12,7 +12,7 @@ if [[ `uname` == "Darwin" ]]; then
 	trap cleanup EXIT
 	echo "Running linux"
 	eval $(docker-machine env default)
-	docker run -it -v `pwd`:/RxSwift swift bash -c "cd /RxSwift; scripts/test-linux.sh"
+	docker run --rm  -it -v `pwd`:/RxSwift swift bash -c "cd /RxSwift; scripts/test-linux.sh"
 elif [[ `uname` == "Linux" ]]; then
 	CONFIGURATIONS=(debug release)
 
diff --git a/scripts/validate-markdown.sh b/scripts/validate-markdown.sh
@@ -1,5 +1,4 @@
 ROOT=`pwd`
 pushd `npm root -g`
-remark -u remark-slug -u remark-validate-links "${ROOT}/*.md"
-remark -u remark-slug -u remark-validate-links "${ROOT}/**/*.md"
+remark -u remark-slug -u remark-validate-links "${ROOT}/*.md" "${ROOT}/**/*.md" "${ROOT}/.github/ISSUE_TEMPLATE.md" "${ROOT}/RxExample/" "${ROOT}/RxCocoa/Foundation/KVORepresentable+CoreGraphics.swift" "${ROOT}/Rx.playground"
 popd
diff --git a/scripts/validate-podspec.sh b/scripts/validate-podspec.sh
@@ -22,35 +22,25 @@ fi;
 
 VERSION=`cat RxSwift.podspec | grep -E "s.version\s+=" | cut -d '"' -f 2`
 ROOTS=(2/e/c 3/c/1 8/5/5 f/7/9 a/b/1)
-ALL_TARGETS=(RxTest RxCocoa RxBlocking RxAtomic RxSwift)
+TARGETS=(RxTest RxCocoa RxBlocking RxAtomic RxSwift)
 
-if [ ! -z "$TARGET" ]
-then
-    TARGETS=("$TARGET")
-else
-    TARGETS="${ALL_TARGETS}"
-fi
-
-if [ ! -z "$SWIFT_VERSION" ]
-then
-    SWIFT_VERSION="--swift-version=${SWIFT_VERSION}"
-fi
+SWIFT_VERSION="--swift-version=${SWIFT_VERSION}"
 
 SOURCE_DIR=`pwd`
 
 pushd ~/.cocoapods/repos/master/Specs
     for ROOT in ${ROOTS[@]} ; do
-        for TARGET in ${ALL_TARGETS[@]}
+        for TARGET_ITERATOR in ${TARGETS[@]}
         do
-            if [ ! -d "${ROOT}/${TARGET}" ]
+            if [ ! -d "${ROOT}/${TARGET_ITERATOR}" ]
             then
                 continue
             fi
 
-            mkdir -p ${ROOT}/${TARGET}/${VERSION}
-            rm ${ROOT}/${TARGET}/${VERSION}/* || echo
-            cat "${SOURCE_DIR}/$TARGET.podspec" |
-            sed -E "s/s.source [^\}]+\}/s.source           = { :git => 'file:\/\/${ESCAPED_SOURCE}' }/" > ${ROOT}/${TARGET}/${VERSION}/${TARGET}.podspec
+            mkdir -p ${ROOT}/${TARGET_ITERATOR}/${VERSION}
+            rm ${ROOT}/${TARGET_ITERATOR}/${VERSION}/* || echo
+            cat "${SOURCE_DIR}/$TARGET_ITERATOR.podspec" |
+            sed -E "s/s.source [^\}]+\}/s.source           = { :git => 'file:\/\/${ESCAPED_SOURCE}' }/" > ${ROOT}/${TARGET_ITERATOR}/${VERSION}/${TARGET_ITERATOR}.podspec
         done
     done
 popd
@@ -61,7 +51,12 @@ function validate() {
     pod lib lint $PODSPEC --verbose --no-clean --allow-warnings "${SWIFT_VERSION}"
 }
 
-for TARGET in ${TARGETS[@]}
+for TARGET_ITERATOR in ${TARGETS[@]}
 do
-    validate ${TARGET}.podspec
+    if [[ "${TARGET}" != "" ]] && [[ "${TARGET}" != "${TARGET_ITERATOR}" ]]
+    then
+        continue
+    fi
+
+    validate ${TARGET_ITERATOR}.podspec
 done
