Merge branch 'master' into dependabot/bundler/rubyzip-1.3.0

Qase · Dec 11, 2019 · 34c55fc · 34c55fc
2 parents 520ed69 + ab726eb
commit 34c55fc
Show file tree

Hide file tree

Showing 173 changed files with 338 additions and 1,071 deletions.
diff --git a/.idea/$PRODUCT_WORKSPACE_FILE$ b/.idea/$PRODUCT_WORKSPACE_FILE$
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/QuantiLogger.iml b/.idea/QuantiLogger.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10.1
+osx_image: xcode11.2
 env:
   global: 
 before_install:

diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
 # RxSwift
-github "ReactiveX/RxSwift" ~> 5.0
+github "ReactiveX/RxSwift" ~> 5.0
diff --git a/Carthage/Build/.RxSwift.version b/Carthage/Build/.RxSwift.version
diff --git a/Carthage/Build/Mac/RxBlocking.framework.dSYM/Contents/Resources/DWARF/RxBlocking b/Carthage/Build/Mac/RxBlocking.framework.dSYM/Contents/Resources/DWARF/RxBlocking
diff --git a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Headers/RxBlocking-Swift.h b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Headers/RxBlocking-Swift.h
diff --git a/.../Build/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftdoc b/.../Build/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftdoc
diff --git a/...ild/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftmodule b/...ild/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftmodule
diff --git a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Resources/Info.plist b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Resources/Info.plist
diff --git a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/RxBlocking b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/RxBlocking
diff --git a/Carthage/Build/Mac/RxCocoa.framework.dSYM/Contents/Resources/DWARF/RxCocoa b/Carthage/Build/Mac/RxCocoa.framework.dSYM/Contents/Resources/DWARF/RxCocoa
diff --git a/Carthage/Build/Mac/RxCocoa.framework/Headers b/Carthage/Build/Mac/RxCocoa.framework/Headers
diff --git a/Carthage/Build/Mac/RxCocoa.framework/Modules b/Carthage/Build/Mac/RxCocoa.framework/Modules
diff --git a/Carthage/Build/Mac/RxCocoa.framework/Resources b/Carthage/Build/Mac/RxCocoa.framework/Resources
diff --git a/Carthage/Build/Mac/RxCocoa.framework/RxCocoa b/Carthage/Build/Mac/RxCocoa.framework/RxCocoa