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

Commit 329bd44

Browse files
author
Thibault Wittemberg
committed
project: bump to swift 5.0.1 / RxSwift 4.5.0
1 parent 5a51b9a commit 329bd44

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5.0.1

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: swift
2-
osx_image: xcode9.4
2+
osx_image: xcode10.2
33

44
cache:
55
directories:
@@ -11,4 +11,4 @@ before_install:
1111
- brew outdated swiftlint || brew upgrade swiftlint
1212
- carthage bootstrap --verbose --platform iOS --cache-builds
1313
script:
14-
- xcodebuild clean test -project RxReduce.xcodeproj -scheme RxReduce -destination "platform=iOS Simulator,name=iPhone X,OS=11.4" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet | xcpretty -c
14+
- xcodebuild clean test -project RxReduce.xcodeproj -scheme RxReduce -destination "platform=iOS Simulator,name=iPhone X,OS=12.2" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet | xcpretty -c

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" ~> 4.3
1+
github "ReactiveX/RxSwift" == 4.5.0

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "4.3.0"
1+
github "ReactiveX/RxSwift" "4.5.0"

RxReduce.xcodeproj/project.pbxproj

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,11 @@
223223
TargetAttributes = {
224224
1A2A7566208D474F009883BF = {
225225
CreatedOnToolsVersion = 9.3;
226-
LastSwiftMigration = 1000;
226+
LastSwiftMigration = 1020;
227227
};
228228
1A2A756F208D4750009883BF = {
229229
CreatedOnToolsVersion = 9.3;
230-
LastSwiftMigration = 1000;
230+
LastSwiftMigration = 1020;
231231
};
232232
};
233233
};
@@ -237,6 +237,7 @@
237237
hasScannedForEncodings = 0;
238238
knownRegions = (
239239
en,
240+
Base,
240241
);
241242
mainGroup = 1A2A755D208D474F009883BF;
242243
productRefGroup = 1A2A7568208D474F009883BF /* Products */;
@@ -467,7 +468,7 @@
467468
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
468469
SKIP_INSTALL = YES;
469470
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
470-
SWIFT_VERSION = 4.2;
471+
SWIFT_VERSION = 5.0;
471472
TARGETED_DEVICE_FAMILY = "1,2";
472473
};
473474
name = Debug;
@@ -498,7 +499,7 @@
498499
PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxReduce;
499500
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
500501
SKIP_INSTALL = YES;
501-
SWIFT_VERSION = 4.2;
502+
SWIFT_VERSION = 5.0;
502503
TARGETED_DEVICE_FAMILY = "1,2";
503504
};
504505
name = Release;
@@ -521,7 +522,7 @@
521522
);
522523
PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxReduceTests;
523524
PRODUCT_NAME = "$(TARGET_NAME)";
524-
SWIFT_VERSION = 4.2;
525+
SWIFT_VERSION = 5.0;
525526
TARGETED_DEVICE_FAMILY = "1,2";
526527
};
527528
name = Debug;
@@ -544,7 +545,7 @@
544545
);
545546
PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxReduceTests;
546547
PRODUCT_NAME = "$(TARGET_NAME)";
547-
SWIFT_VERSION = 4.2;
548+
SWIFT_VERSION = 5.0;
548549
TARGETED_DEVICE_FAMILY = "1,2";
549550
};
550551
name = Release;

0 commit comments

Comments
 (0)