From 633c9cbab472683c4038cdfb7d9b2a3d32b4e9fa Mon Sep 17 00:00:00 2001 From: marty-suzuki Date: Mon, 1 Feb 2021 11:08:56 +0900 Subject: [PATCH 1/5] Update Package.swift --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index e3afef8..c620799 100644 --- a/Package.resolved +++ b/Package.resolved @@ -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" } } ] diff --git a/Package.swift b/Package.swift index 3294ebc..e367ff5 100644 --- a/Package.swift +++ b/Package.swift @@ -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", From 533b15a18d2c2e6e675490d56993ff1f638b6180 Mon Sep 17 00:00:00 2001 From: marty-suzuki Date: Mon, 1 Feb 2021 11:09:30 +0900 Subject: [PATCH 2/5] Update podspec --- Unio.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Unio.podspec b/Unio.podspec index 0b25099..3862901 100644 --- a/Unio.podspec +++ b/Unio.podspec @@ -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 From eb5e5d6e546e8f0f8353756d6e08295045d6abec Mon Sep 17 00:00:00 2001 From: marty-suzuki Date: Mon, 1 Feb 2021 11:36:51 +0900 Subject: [PATCH 3/5] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c9e493..8569adf 100644 --- a/README.md +++ b/README.md @@ -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 From 1721c342227638a304f02f2636ab4fb723e6e3d1 Mon Sep 17 00:00:00 2001 From: marty-suzuki Date: Mon, 1 Feb 2021 14:44:38 +0900 Subject: [PATCH 4/5] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ddd1b54..a3e180e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c os: osx -osx_image: xcode11 +osx_image: xcode12.2 env: - CI_USE_SWIFTPM=true - CI_USE_SWIFTPM=false From beec460ab14df7e223cc801911e30e36ccd2dd99 Mon Sep 17 00:00:00 2001 From: marty-suzuki Date: Tue, 2 Feb 2021 01:35:03 +0900 Subject: [PATCH 5/5] Add carthage workaround to travis.yml --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index a3e180e..5f9418a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,13 @@ 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: