File tree 5 files changed +14
-7
lines changed
5 files changed +14
-7
lines changed Original file line number Diff line number Diff line change 1
1
language : objective-c
2
2
os : osx
3
- osx_image : xcode11
3
+ osx_image : xcode12.2
4
4
env :
5
5
- CI_USE_SWIFTPM=true
6
6
- CI_USE_SWIFTPM=false
7
7
before_install :
8
8
- gem install xcpretty
9
9
- |
10
10
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"
11
18
carthage update --no-use-binaries --platform ios
12
19
fi
13
20
before_script :
Original file line number Diff line number Diff line change 6
6
"repositoryURL" : " https://github.com/ReactiveX/RxSwift.git" ,
7
7
"state" : {
8
8
"branch" : null ,
9
- "revision" : " b3e888b4972d9bc76495dd74d30a8c7fad4b9395 " ,
10
- "version" : " 5 .0.1 "
9
+ "revision" : " c8742ed97fc2f0c015a5ea5eddefb064cd7532d2 " ,
10
+ "version" : " 6 .0.0 "
11
11
}
12
12
}
13
13
]
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ let package = Package(
10
10
targets: [ " Unio " ] ) ,
11
11
] ,
12
12
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" )
14
14
] ,
15
15
targets: [
16
16
. target( name: " Unio " ,
Original file line number Diff line number Diff line change @@ -379,7 +379,7 @@ Simply add the following line to your `Package.swift`:
379
379
- tvOS 10.0 or greater
380
380
- watchOS 3.0 or greater
381
381
- 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
383
383
384
384
## License
385
385
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ Pod::Spec.new do |s|
22
22
s . watchos . deployment_target = '3.0'
23
23
s . source = { :git => "https://github.com/cats-oss/Unio.git" , :tag => "#{ s . version } " }
24
24
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'
27
27
s . swift_version = '5.0'
28
28
end
You can’t perform that action at this time.
0 commit comments