Skip to content

Commit a24e414

Browse files
RafaelPlantardRafaelPlantard
committed
Upgrade to Swift 5
1 parent 54846b8 commit a24e414

8 files changed

Lines changed: 89 additions & 10 deletions

File tree

‎.swift-version‎

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

‎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

‎Cartfile.resolved‎

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

‎Gemfile.lock‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,61 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
CFPropertyList (3.0.0)
5+
activesupport (4.2.11.1)
6+
i18n (~> 0.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
510
addressable (2.5.2)
611
public_suffix (>= 2.0.2, < 4.0)
712
atomos (0.1.3)
813
babosa (1.0.2)
914
claide (1.0.2)
15+
cocoapods (1.5.3)
16+
activesupport (>= 4.0.2, < 5)
17+
claide (>= 1.0.2, < 2.0)
18+
cocoapods-core (= 1.5.3)
19+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
20+
cocoapods-downloader (>= 1.2.0, < 2.0)
21+
cocoapods-plugins (>= 1.0.0, < 2.0)
22+
cocoapods-search (>= 1.0.0, < 2.0)
23+
cocoapods-stats (>= 1.0.0, < 2.0)
24+
cocoapods-trunk (>= 1.3.0, < 2.0)
25+
cocoapods-try (>= 1.1.0, < 2.0)
26+
colored2 (~> 3.1)
27+
escape (~> 0.0.4)
28+
fourflusher (~> 2.0.1)
29+
gh_inspector (~> 1.0)
30+
molinillo (~> 0.6.5)
31+
nap (~> 1.0)
32+
ruby-macho (~> 1.1)
33+
xcodeproj (>= 1.5.7, < 2.0)
34+
cocoapods-core (1.5.3)
35+
activesupport (>= 4.0.2, < 6)
36+
fuzzy_match (~> 2.0.4)
37+
nap (~> 1.0)
38+
cocoapods-deintegrate (1.0.4)
39+
cocoapods-downloader (1.2.2)
40+
cocoapods-plugins (1.0.0)
41+
nap
42+
cocoapods-search (1.0.0)
43+
cocoapods-stats (1.1.0)
44+
cocoapods-trunk (1.3.1)
45+
nap (>= 0.8, < 2.0)
46+
netrc (~> 0.11)
47+
cocoapods-try (1.1.0)
1048
colored (1.2)
1149
colored2 (3.1.2)
1250
commander-fastlane (4.4.6)
1351
highline (~> 1.7.2)
52+
concurrent-ruby (1.1.5)
1453
declarative (0.0.10)
1554
declarative-option (0.1.0)
1655
domain_name (0.5.20180417)
1756
unf (>= 0.0.5, < 1.0.0)
1857
dotenv (2.5.0)
1958
emoji_regex (0.1.1)
59+
escape (0.0.4)
2060
excon (0.62.0)
2161
faraday (0.15.3)
2262
multipart-post (>= 1.2, < 3)
@@ -62,6 +102,8 @@ GEM
62102
xcodeproj (>= 1.6.0, < 2.0.0)
63103
xcpretty (~> 0.3.0)
64104
xcpretty-travis-formatter (>= 0.0.3)
105+
fourflusher (2.0.1)
106+
fuzzy_match (2.0.4)
65107
gh_inspector (1.1.3)
66108
google-api-client (0.23.9)
67109
addressable (~> 2.5, >= 2.5.1)
@@ -82,18 +124,24 @@ GEM
82124
http-cookie (1.0.3)
83125
domain_name (~> 0.5)
84126
httpclient (2.8.3)
127+
i18n (0.9.5)
128+
concurrent-ruby (~> 1.0)
85129
json (2.1.0)
86130
jwt (2.1.0)
87131
memoist (0.16.0)
88132
mime-types (3.2.2)
89133
mime-types-data (~> 3.2015)
90134
mime-types-data (3.2018.0812)
91135
mini_magick (4.5.1)
136+
minitest (5.11.3)
137+
molinillo (0.6.6)
92138
multi_json (1.13.1)
93139
multi_xml (0.6.0)
94140
multipart-post (2.0.0)
95141
nanaimo (0.2.6)
142+
nap (1.1.0)
96143
naturally (2.2.0)
144+
netrc (0.11.0)
97145
os (1.0.0)
98146
plist (3.4.0)
99147
public_suffix (2.0.5)
@@ -103,6 +151,7 @@ GEM
103151
uber (< 0.2.0)
104152
retriable (3.1.2)
105153
rouge (2.0.7)
154+
ruby-macho (1.4.0)
106155
rubyzip (1.2.2)
107156
security (0.1.3)
108157
signet (0.10.0)
@@ -117,10 +166,13 @@ GEM
117166
terminal-notifier (1.8.0)
118167
terminal-table (1.8.0)
119168
unicode-display_width (~> 1.1, >= 1.1.1)
169+
thread_safe (0.3.6)
120170
tty-cursor (0.6.0)
121171
tty-screen (0.6.5)
122172
tty-spinner (0.8.0)
123173
tty-cursor (>= 0.5.0)
174+
tzinfo (1.2.5)
175+
thread_safe (~> 0.1)
124176
uber (0.1.0)
125177
unf (0.1.4)
126178
unf_ext
@@ -142,7 +194,8 @@ PLATFORMS
142194
ruby
143195

144196
DEPENDENCIES
197+
cocoapods
145198
fastlane
146199

147200
BUNDLED WITH
148-
1.16.4
201+
1.17.1

‎NSObject+Rx.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extension Reactive where Base: AnyObject {
1616
public extension Reactive where Base: AnyObject {
1717

1818
/// a unique DisposeBag that is related to the Reactive.Base instance only for Reference type
19-
public var disposeBag: DisposeBag {
19+
var disposeBag: DisposeBag {
2020
get {
2121
return synchronizedBag {
2222
if let disposeObject = objc_getAssociatedObject(base, &disposeBagContext) as? DisposeBag {

‎NSObject-Rx.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
isa = PBXProject;
100100
attributes = {
101101
LastSwiftUpdateCheck = 0830;
102-
LastUpgradeCheck = 0830;
102+
LastUpgradeCheck = 1020;
103103
ORGANIZATIONNAME = RxSwiftCommunity;
104104
TargetAttributes = {
105105
188C6D901C47B2B20092101A = {
@@ -110,7 +110,7 @@
110110
};
111111
buildConfigurationList = 18EE7A131C47B12F00C7256C /* Build configuration list for PBXProject "NSObject-Rx" */;
112112
compatibilityVersion = "Xcode 3.2";
113-
developmentRegion = English;
113+
developmentRegion = en;
114114
hasScannedForEncodings = 0;
115115
knownRegions = (
116116
en,
@@ -172,7 +172,6 @@
172172
PRODUCT_NAME = "$(TARGET_NAME)";
173173
SKIP_INSTALL = YES;
174174
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
175-
SWIFT_VERSION = 3.0;
176175
TARGETED_DEVICE_FAMILY = "1,2";
177176
VERSIONING_SYSTEM = "apple-generic";
178177
VERSION_INFO_PREFIX = "";
@@ -201,7 +200,6 @@
201200
PRODUCT_BUNDLE_IDENTIFIER = "RxSwiftCommunity.NSObject-Rx";
202201
PRODUCT_NAME = "$(TARGET_NAME)";
203202
SKIP_INSTALL = YES;
204-
SWIFT_VERSION = 3.0;
205203
TARGETED_DEVICE_FAMILY = "1,2";
206204
VERSIONING_SYSTEM = "apple-generic";
207205
VERSION_INFO_PREFIX = "";
@@ -212,18 +210,27 @@
212210
isa = XCBuildConfiguration;
213211
buildSettings = {
214212
ALWAYS_SEARCH_USER_PATHS = NO;
213+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
215214
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
216215
CLANG_CXX_LIBRARY = "libc++";
217216
CLANG_ENABLE_MODULES = YES;
218217
CLANG_ENABLE_OBJC_ARC = YES;
218+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
219219
CLANG_WARN_BOOL_CONVERSION = YES;
220+
CLANG_WARN_COMMA = YES;
220221
CLANG_WARN_CONSTANT_CONVERSION = YES;
222+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
221223
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
222224
CLANG_WARN_EMPTY_BODY = YES;
223225
CLANG_WARN_ENUM_CONVERSION = YES;
224226
CLANG_WARN_INFINITE_RECURSION = YES;
225227
CLANG_WARN_INT_CONVERSION = YES;
228+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
229+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
230+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
226231
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
232+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
233+
CLANG_WARN_STRICT_PROTOTYPES = YES;
227234
CLANG_WARN_SUSPICIOUS_MOVE = YES;
228235
CLANG_WARN_UNREACHABLE_CODE = YES;
229236
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -251,25 +258,35 @@
251258
ONLY_ACTIVE_ARCH = YES;
252259
SDKROOT = iphoneos;
253260
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
261+
SWIFT_VERSION = 5.0;
254262
};
255263
name = Debug;
256264
};
257265
18EE7A291C47B12F00C7256C /* Release */ = {
258266
isa = XCBuildConfiguration;
259267
buildSettings = {
260268
ALWAYS_SEARCH_USER_PATHS = NO;
269+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
261270
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
262271
CLANG_CXX_LIBRARY = "libc++";
263272
CLANG_ENABLE_MODULES = YES;
264273
CLANG_ENABLE_OBJC_ARC = YES;
274+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
265275
CLANG_WARN_BOOL_CONVERSION = YES;
276+
CLANG_WARN_COMMA = YES;
266277
CLANG_WARN_CONSTANT_CONVERSION = YES;
278+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
267279
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
268280
CLANG_WARN_EMPTY_BODY = YES;
269281
CLANG_WARN_ENUM_CONVERSION = YES;
270282
CLANG_WARN_INFINITE_RECURSION = YES;
271283
CLANG_WARN_INT_CONVERSION = YES;
284+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
285+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
286+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
272287
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
288+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
289+
CLANG_WARN_STRICT_PROTOTYPES = YES;
273290
CLANG_WARN_SUSPICIOUS_MOVE = YES;
274291
CLANG_WARN_UNREACHABLE_CODE = YES;
275292
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -290,6 +307,7 @@
290307
MTL_ENABLE_DEBUG_INFO = NO;
291308
SDKROOT = iphoneos;
292309
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
310+
SWIFT_VERSION = 5.0;
293311
VALIDATE_PRODUCT = YES;
294312
};
295313
name = Release;

‎NSObject-Rx.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎NSObject-Rx.xcodeproj/xcshareddata/xcschemes/NSObject_Rx.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)