Skip to content

Commit

Permalink
Release 4.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kzaher committed Nov 1, 2018
1 parent 78c500c commit e8aa1d8
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 54 deletions.
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,22 @@ All notable changes to this project will be documented in this file.
---
## Master

## [4.X.X](https://github.com/ReactiveX/RxSwift/releases/tag/4.X.X)
## [4.4.0](https://github.com/ReactiveX/RxSwift/releases/tag/4.4.0)

**This relase introduces new framework `RxAtomic` that enables using C11 atomic primities in RxSwift as a replacement for deprecated `OSAtomic*` functions.**
**Carthage users will probably need to include this framework manually.**

* Updates deprecated `OSAtomic*` primitives to use C11 atomic primitives.
* Adds `Event`, `SingleEvent`, `MaybeEvent` and `Recorded` conditional conformance to `Equatable` where their `Element` is equatable on `RXTest` for clients that are using Swift >= 4.1.
* Replaces `*.count > 0` with `!*.isEmpty`. in `AsyncLock, ObserveOn, Zip+Collection, Zip+arity`.
* Adds `string` to `NSTextView`.
* Consolidates per platform frameworks to multi-platform frameworks.
* Xcode 10.1 compatible.

#### Anomalies

* Fixes problem with canceling events scheduled on serial scheduler through `observeOn` operator. #1778
* Fixes problem with `UISearchBar.text` property not triggering update when cancel button is tapped. #1714
* Updates watchos minimum target to 3.0. #1752

## [4.3.1](https://github.com/ReactiveX/RxSwift/releases/tag/4.3.1)

Expand Down
3 changes: 3 additions & 0 deletions Rx.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions RxAtomic.podspec
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Pod::Spec.new do |s|
s.name = "RxAtomic"
s.version = "0.1"
s.version = "4.4.0"
s.summary = "Atomic primitives for RxSwift"
s.description = <<-DESC
Atomic primitives for RxSwift.
DESC
s.homepage = "https://github.com/ReactiveX/RxSwift"
s.license = 'MIT'
s.author = { "Krunoslav Zaher" => "krunoslav.zaher@gmail.com" }
s.source = { :git => "https://github.com/ReactiveX/RxSwift.git", :tag => 'atomic' }
s.source = { :git => "https://github.com/ReactiveX/RxSwift.git", :tag => s.version.to_s }

s.requires_arc = true

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
s.watchos.deployment_target = '2.0'
s.watchos.deployment_target = '3.0'
s.tvos.deployment_target = '9.0'

s.source_files = 'RxAtomic/**/*.{c,h}'
Expand Down
2 changes: 1 addition & 1 deletion RxAtomic/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>4.4.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
Expand Down
6 changes: 3 additions & 3 deletions RxBlocking.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxBlocking"
s.version = "4.3.1"
s.version = "4.4.0"
s.summary = "RxSwift Blocking operatos"
s.description = <<-DESC
Set of blocking operators for RxSwift. These operators are mostly intended for unit/integration tests
Expand All @@ -19,12 +19,12 @@ Waiting for observable sequence to complete before exiting command line applicat

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
s.watchos.deployment_target = '2.0'
s.watchos.deployment_target = '3.0'
s.tvos.deployment_target = '9.0'

s.source_files = 'RxBlocking/**/*.swift', 'Platform/**/*.swift'
s.exclude_files = 'RxBlocking/Platform/**/*.swift'

s.dependency 'RxAtomic', '~> 0.1'
s.dependency 'RxAtomic', '~> 4.4'
s.dependency 'RxSwift', '~> 4.0'
end
2 changes: 1 addition & 1 deletion RxBlocking/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.3.1</string>
<string>4.4.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions RxCocoa.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxCocoa"
s.version = "4.3.1"
s.version = "4.4.0"
s.summary = "RxSwift Cocoa extensions"
s.description = <<-DESC
* UI extensions
Expand All @@ -16,7 +16,7 @@ Pod::Spec.new do |s|

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
s.watchos.deployment_target = '2.0'
s.watchos.deployment_target = '3.0'
s.tvos.deployment_target = '9.0'

s.source_files = 'RxCocoa/**/*.{swift,h,m}', 'Platform/**/*.swift'
Expand Down
2 changes: 1 addition & 1 deletion RxCocoa/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.3.1</string>
<string>4.4.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
6 changes: 3 additions & 3 deletions RxSwift.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxSwift"
s.version = "4.3.1"
s.version = "4.4.0"
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)
Expand Down Expand Up @@ -29,11 +29,11 @@ gitDiff().grep("bug").less // sequences of swift objects

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
s.watchos.deployment_target = '2.0'
s.watchos.deployment_target = '3.0'
s.tvos.deployment_target = '9.0'

s.source_files = 'RxSwift/**/*.swift', 'Platform/**/*.swift'
s.exclude_files = 'RxSwift/Platform/**/*.swift'

s.dependency 'RxAtomic', '~> 0.0'
s.dependency 'RxAtomic', '~> 4.4'
end
2 changes: 1 addition & 1 deletion RxSwift/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.3.1</string>
<string>4.4.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions RxTest.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxTest"
s.version = "4.3.1"
s.version = "4.4.0"
s.summary = "RxSwift Testing extensions"
s.description = <<-DESC
Unit testing extensions for RxSwift. This library contains mock schedulers, observables, and observers
Expand Down Expand Up @@ -56,7 +56,7 @@ func testMap() {

s.framework = 'XCTest'

s.dependency 'RxAtomic', '~> 0.0'
s.dependency 'RxAtomic', '~> 4.4'
s.dependency 'RxSwift', '~> 4.0'

s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }
Expand Down
2 changes: 1 addition & 1 deletion RxTest/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.3.1</string>
<string>4.4.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
36 changes: 5 additions & 31 deletions scripts/all-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,12 @@ fi

if [ "${RELEASE_TEST}" -eq 1 ]; then
VALIDATE_PODS=${VALIDATE_PODS:-1}
RUN_AUTOMATION_TESTS=${RUN_AUTOMATION_TESTS:-1}
else
VALIDATE_PODS=${VALIDATE_PODS:-0}
RUN_AUTOMATION_TESTS=${RUN_AUTOMATION_TESTS:-0}
fi

RUN_DEVICE_TESTS=${RUN_DEVICE_TESTS:-1}

if [ "$2" == "s" ]; then
printf "${RED}Skipping automation tests ...${RESET}\n"
RUN_AUTOMATION_TESTS=0
fi

function ensureVersionEqual() {
if [[ "$1" != "$2" ]]; then
echo "Version $1 and $2 are not equal ($3)"
Expand Down Expand Up @@ -146,32 +139,13 @@ fi

if [ "${VALIDATE_IOS_EXAMPLE}" -eq 1 ]; then
if [[ "${UNIX_NAME}" == "${DARWIN}" ]]; then
if [[ "${RUN_AUTOMATION_TESTS}" -eq 1 ]]; then
if [[ "${RUN_DEVICE_TESTS}" -eq 1 ]]; then
for configuration in ${CONFIGURATIONS[@]}
do
rx "RxExample-iOSUITests" ${configuration} "Krunoslav Zaher’s iPhone" test
done
fi

for configuration in ${CONFIGURATIONS[@]}
do
rx "RxExample-iOSUITests" ${configuration} "${DEFAULT_IOS_SIMULATOR}" test
done

for configuration in ${CONFIGURATIONS[@]}
do
rx "RxExample-iOSTests" ${configuration} "${DEFAULT_IOS_SIMULATOR}" test
done
else
for scheme in "RxExample-iOS"
for scheme in "RxExample-iOS"
do
for configuration in "Debug"
do
for configuration in "Debug"
do
rx ${scheme} ${configuration} "${DEFAULT_IOS_SIMULATOR}" build
done
rx ${scheme} ${configuration} "${DEFAULT_IOS_SIMULATOR}" build
done
fi
done
elif [[ "${UNIX_NAME}" == "${LINUX}" ]]; then
unsupported_target
else
Expand Down
6 changes: 3 additions & 3 deletions scripts/validate-podspec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ function cleanup {
trap cleanup EXIT

VERSION=`cat RxSwift.podspec | grep -E "s.version\s+=" | cut -d '"' -f 2`
TARGETS=(RxTest RxCocoa RxBlocking RxSwift)
ROOTS=(2/e/c 3/c/1 8/5/5 a/b/1)
TARGETS=(RxTest RxCocoa RxBlocking RxAtomic RxSwift)
ROOTS=(2/e/c 3/c/1 8/5/5 f/7/9 a/b/1)

pushd ~/.cocoapods/repos/master/Specs
for TARGET in ${TARGETS[@]}
Expand All @@ -34,7 +34,7 @@ do
mkdir -p ~/.cocoapods/repos/master/Specs/${ROOT}/${TARGET}/${VERSION}
rm ~/.cocoapods/repos/master/Specs/${ROOT}/${TARGET}/${VERSION}/* || echo
cat $TARGET.podspec |
sed -E "s/s.source[^\}]+\}/s.source = { :git => '${ESCAPED_SOURCE}', :branch => \'${BRANCH}\' }/" > ~/.cocoapods/repos/master/Specs/${ROOT}/${TARGET}/${VERSION}/${TARGET}.podspec
sed -E "s/s.source [^\}]+\}/s.source = { :git => '${ESCAPED_SOURCE}', :branch => \'${BRANCH}\' }/" > ~/.cocoapods/repos/master/Specs/${ROOT}/${TARGET}/${VERSION}/${TARGET}.podspec
done

done
Expand Down

0 comments on commit e8aa1d8

Please sign in to comment.