Skip to content
This repository has been archived by the owner on May 26, 2020. It is now read-only.

Update ReactiveSwift to 3.1 and ReactiveCocoa to 7.1 #40

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update ReactiveSwift to 3.1 and ReactiveCocoa to 7.1 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7150ec1
Update ReactiveSwift to 3.1 and ReactiveCocoa to 7.1
james-lukanta-ck Apr 20, 2018
82442a6
Remove `before_install`
james-lukanta-ck Apr 20, 2018
74d26a6
Update `XCODE_DESTINATION` in `/script/build` and ReactiveSwift's `ma…
james-lukanta-ck Apr 20, 2018
281f0c1
Update podspec
james-lukanta-ck Apr 20, 2018
7bd06fe
Remove `toIntMax()` because it's no longer supported in Swift 4
james-lukanta-ck Apr 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1
4.1
5 changes: 1 addition & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
language: objective-c
cache: cocoapods
osx_image: xcode8.3
before_install:
- brew uninstall carthage
- HOMEBREW_NO_AUTO_UPDATE=1 brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/6ae4f69a652fb0ecb102b0c9216378679a4f1b92/Formula/carthage.rb # 0.22.0
osx_image: xcode9.3
branches:
only:
- master
Expand Down
4 changes: 2 additions & 2 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "ReactiveCocoa/ReactiveSwift" ~> 2.0
github "ReactiveCocoa/ReactiveCocoa" ~> 6.0
github "ReactiveCocoa/ReactiveSwift" ~> 3.1
github "ReactiveCocoa/ReactiveCocoa" ~> 7.1
10 changes: 5 additions & 5 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github "Quick/Nimble" "v7.0.1"
github "Quick/Quick" "v1.1.0"
github "ReactiveCocoa/ReactiveCocoa" "6.0.0"
github "ReactiveCocoa/ReactiveSwift" "2.0.0"
github "antitypical/Result" "3.2.3"
github "Quick/Nimble" "v7.1.1"
github "Quick/Quick" "v1.2.0"
github "ReactiveCocoa/ReactiveCocoa" "7.2.0"
github "ReactiveCocoa/ReactiveSwift" "3.1.0"
github "antitypical/Result" "3.2.4"
github "jspahrsummers/xcconfigs" "0.10"
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let package = Package(
name: "ReactiveCollections",
dependencies: {
var deps: [Package.Dependency] = [
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 2),
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 3),
]
if isSwiftPackagerManagerTest {
deps += [
Expand Down
4 changes: 2 additions & 2 deletions ReactiveCollections.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Pod::Spec.new do |s|

# Directory glob for all Swift files
s.source_files = "Sources/*.{swift}"
s.dependency 'ReactiveSwift', '~> 2.0'
s.dependency 'ReactiveCocoa', '~> 6.0'
s.dependency 'ReactiveSwift', '~> 3.1'
s.dependency 'ReactiveCocoa', '~> 7.1'
end
8 changes: 4 additions & 4 deletions ReactiveCollections.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@
PRODUCT_NAME = ReactiveCollections;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -973,7 +973,7 @@
PRODUCT_NAME = ReactiveCollections;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 9.0;
VALIDATE_PRODUCT = YES;
Expand Down Expand Up @@ -1296,7 +1296,7 @@
PRODUCT_NAME = ReactiveCollections;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -1481,7 +1481,7 @@
PRODUCT_NAME = ReactiveCollections;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 9.0;
VALIDATE_PRODUCT = YES;
Expand Down
2 changes: 1 addition & 1 deletion Sources/ReactiveArray.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ extension ReactiveArray {
public mutating func replaceSubrange<C>(_ subrange: Range<Int>, with newElements: C) where C: Collection, C.Iterator.Element == Element {
elements.replaceSubrange(subrange, with: newElements)

let elementsCount = Int(newElements.count.toIntMax())
let elementsCount = newElements.count
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

toIntMax() is deprecated in Swift 4.


if subrange.count > elementsCount {
let deleteCount = subrange.count - elementsCount
Expand Down
2 changes: 1 addition & 1 deletion script/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ fi
if [[ "$TRAVIS_XCODE_SCHEME" == "ReactiveCollections-tvOS" ]]; then
XCODE_SDK=appletvsimulator
XCODE_ACTION="build-for-testing test-without-building"
XCODE_DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p"
XCODE_DESTINATION="platform=tvOS Simulator,name=Apple TV 4K (at 1080p)"
fi

if [[ "$TRAVIS_XCODE_SCHEME" == "ReactiveCollections-watchOS" ]]; then
Expand Down