Skip to content

Commit

Permalink
Merge pull request #24 from cats-oss/rxswfit6
Browse files Browse the repository at this point in the history
Update Package.swfit and Unio.podspec
  • Loading branch information
marty-suzuki authored Feb 1, 2021
2 parents 0a366f3 + beec460 commit 2e902bb
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
language: objective-c
os: osx
osx_image: xcode11
osx_image: xcode12.2
env:
- CI_USE_SWIFTPM=true
- CI_USE_SWIFTPM=false
before_install:
- gem install xcpretty
- |
if ! $CI_USE_SWIFTPM ; then
xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
CURRENT_XCODE_VERSION=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3)
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
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
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
export XCODE_XCCONFIG_FILE="$xcconfig"
carthage update --no-use-binaries --platform ios
fi
before_script:
Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395",
"version": "5.0.1"
"revision": "c8742ed97fc2f0c015a5ea5eddefb064cd7532d2",
"version": "6.0.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let package = Package(
targets: ["Unio"]),
],
dependencies: [
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0")
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.0.0")
],
targets: [
.target(name: "Unio",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ Simply add the following line to your `Package.swift`:
- tvOS 10.0 or greater
- watchOS 3.0 or greater
- macOS 10.10 or greater
- [RxSwift](https://github.com/ReactiveX/RxSwift) 5.0 or greater
- [RxSwift](https://github.com/ReactiveX/RxSwift) 6.0 or greater

## License

Expand Down
4 changes: 2 additions & 2 deletions Unio.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Pod::Spec.new do |s|
s.watchos.deployment_target = '3.0'
s.source = { :git => "https://github.com/cats-oss/Unio.git", :tag => "#{s.version}" }
s.source_files = "Unio/**/*.{swift}"
s.dependency 'RxSwift', '~> 5.0'
s.dependency 'RxRelay', '~> 5.0'
s.dependency 'RxSwift', '~> 6.0'
s.dependency 'RxRelay', '~> 6.0'
s.swift_version = '5.0'
end

0 comments on commit 2e902bb

Please sign in to comment.