Skip to content

Commit 2e902bb

Browse files
authored
Merge pull request #24 from cats-oss/rxswfit6
Update Package.swfit and Unio.podspec
2 parents 0a366f3 + beec460 commit 2e902bb

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

.travis.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
language: objective-c
22
os: osx
3-
osx_image: xcode11
3+
osx_image: xcode12.2
44
env:
55
- CI_USE_SWIFTPM=true
66
- CI_USE_SWIFTPM=false
77
before_install:
88
- gem install xcpretty
99
- |
1010
if ! $CI_USE_SWIFTPM ; then
11+
xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
12+
trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
13+
CURRENT_XCODE_VERSION=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3)
14+
echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$CURRENT_XCODE_VERSION = arm64 arm64e armv7 armv7s armv6 armv8" >> $xcconfig
15+
echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig
16+
echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
17+
export XCODE_XCCONFIG_FILE="$xcconfig"
1118
carthage update --no-use-binaries --platform ios
1219
fi
1320
before_script:

Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
77
"state": {
88
"branch": null,
9-
"revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395",
10-
"version": "5.0.1"
9+
"revision": "c8742ed97fc2f0c015a5ea5eddefb064cd7532d2",
10+
"version": "6.0.0"
1111
}
1212
}
1313
]

Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
targets: ["Unio"]),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0")
13+
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.0.0")
1414
],
1515
targets: [
1616
.target(name: "Unio",

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ Simply add the following line to your `Package.swift`:
379379
- tvOS 10.0 or greater
380380
- watchOS 3.0 or greater
381381
- macOS 10.10 or greater
382-
- [RxSwift](https://github.com/ReactiveX/RxSwift) 5.0 or greater
382+
- [RxSwift](https://github.com/ReactiveX/RxSwift) 6.0 or greater
383383

384384
## License
385385

Unio.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
2222
s.watchos.deployment_target = '3.0'
2323
s.source = { :git => "https://github.com/cats-oss/Unio.git", :tag => "#{s.version}" }
2424
s.source_files = "Unio/**/*.{swift}"
25-
s.dependency 'RxSwift', '~> 5.0'
26-
s.dependency 'RxRelay', '~> 5.0'
25+
s.dependency 'RxSwift', '~> 6.0'
26+
s.dependency 'RxRelay', '~> 6.0'
2727
s.swift_version = '5.0'
2828
end

0 commit comments

Comments
 (0)