Skip to content

Commit 1c2d4e2

Browse files
fasskofreak4pc
fassko
authored and
freak4pc
committed
Update CI to Swift 5
1 parent 0bdc75a commit 1c2d4e2

File tree

9 files changed

+60
-47
lines changed

9 files changed

+60
-47
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
build-and-test:
44
macos:
5-
xcode: "10.2.0"
5+
xcode: "10.3.0"
66

77
steps:
88
- checkout

‎Changelog.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Current master
66

77
- Nothing yet!
88

9+
5.0.1
10+
-----
11+
- Update to Swift 5.0 to build in CI
12+
913
5.0.0
1014
-----
1115
- Update to Swift 5.0 and Xcode 10.2 See [#59](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/67) - [@fassko](https://github.com/fassko)

‎Demo/Demo.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
isa = PBXProject;
179179
attributes = {
180180
LastSwiftUpdateCheck = 0710;
181-
LastUpgradeCheck = 1000;
181+
LastUpgradeCheck = 1030;
182182
ORGANIZATIONNAME = "Ash Furrow";
183183
TargetAttributes = {
184184
5E9E831A1BF79B3000C85B46 = {
@@ -193,7 +193,7 @@
193193
};
194194
buildConfigurationList = 5E9E83161BF79B3000C85B46 /* Build configuration list for PBXProject "Demo" */;
195195
compatibilityVersion = "Xcode 3.2";
196-
developmentRegion = English;
196+
developmentRegion = en;
197197
hasScannedForEncodings = 0;
198198
knownRegions = (
199199
en,
@@ -345,6 +345,7 @@
345345
isa = XCBuildConfiguration;
346346
buildSettings = {
347347
ALWAYS_SEARCH_USER_PATHS = NO;
348+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
348349
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
349350
CLANG_CXX_LIBRARY = "libc++";
350351
CLANG_ENABLE_MODULES = YES;
@@ -392,14 +393,15 @@
392393
ONLY_ACTIVE_ARCH = YES;
393394
SDKROOT = iphoneos;
394395
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
395-
SWIFT_VERSION = 4.2;
396+
SWIFT_VERSION = 5.0;
396397
};
397398
name = Debug;
398399
};
399400
5E9E83371BF79B3000C85B46 /* Release */ = {
400401
isa = XCBuildConfiguration;
401402
buildSettings = {
402403
ALWAYS_SEARCH_USER_PATHS = NO;
404+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
403405
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
404406
CLANG_CXX_LIBRARY = "libc++";
405407
CLANG_ENABLE_MODULES = YES;
@@ -440,7 +442,7 @@
440442
MTL_ENABLE_DEBUG_INFO = NO;
441443
SDKROOT = iphoneos;
442444
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
443-
SWIFT_VERSION = 4.2;
445+
SWIFT_VERSION = 5.0;
444446
VALIDATE_PRODUCT = YES;
445447
};
446448
name = Release;
@@ -455,7 +457,7 @@
455457
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
456458
PRODUCT_BUNDLE_IDENTIFIER = io.reactivex.Demo;
457459
PRODUCT_NAME = "$(TARGET_NAME)";
458-
SWIFT_VERSION = 4.2;
460+
SWIFT_VERSION = 5.0;
459461
};
460462
name = Debug;
461463
};
@@ -469,7 +471,7 @@
469471
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
470472
PRODUCT_BUNDLE_IDENTIFIER = io.reactivex.Demo;
471473
PRODUCT_NAME = "$(TARGET_NAME)";
472-
SWIFT_VERSION = 4.2;
474+
SWIFT_VERSION = 5.0;
473475
};
474476
name = Release;
475477
};
@@ -481,7 +483,7 @@
481483
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
482484
PRODUCT_BUNDLE_IDENTIFIER = io.reactivex.DemoTests;
483485
PRODUCT_NAME = "$(TARGET_NAME)";
484-
SWIFT_VERSION = 4.2;
486+
SWIFT_VERSION = 5.0;
485487
};
486488
name = Debug;
487489
};
@@ -493,7 +495,7 @@
493495
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
494496
PRODUCT_BUNDLE_IDENTIFIER = io.reactivex.DemoTests;
495497
PRODUCT_NAME = "$(TARGET_NAME)";
496-
SWIFT_VERSION = 4.2;
498+
SWIFT_VERSION = 5.0;
497499
};
498500
name = Release;
499501
};

‎Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.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 = "1000"
3+
LastUpgradeVersion = "1030"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Demo/DemoTests/DemoTests.swift‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ import Nimble
33
import RxSwift
44
import NSObject_Rx
55

6-
class DisposeBagTest: HasDisposeBag {}
6+
class DisposeBagTest: HasDisposeBag {
7+
var disposeBag: DisposeBag
8+
9+
init(disposeBag: DisposeBag) {
10+
self.disposeBag = disposeBag
11+
}
12+
}
713

814
class Test: QuickSpec {
915
override func spec() {
@@ -12,7 +18,7 @@ class Test: QuickSpec {
1218
var subject = NSObject()
1319
let disposeBag = DisposeBag()
1420
subject.rx.disposeBag = disposeBag
15-
let subjectProtocol = DisposeBagTest()
21+
let subjectProtocol = DisposeBagTest(disposeBag: disposeBag)
1622
subjectProtocol.disposeBag = disposeBag
1723
expect(subject.rx.disposeBag) === disposeBag
1824
expect(subjectProtocol.disposeBag) === disposeBag
@@ -28,7 +34,8 @@ class Test: QuickSpec {
2834
// Force the bag to deinit (and dispose itself).
2935
do {
3036
let subject = NSObject()
31-
let subjectProtocol = DisposeBagTest()
37+
let disposeBag = DisposeBag()
38+
let subjectProtocol = DisposeBagTest(disposeBag: disposeBag)
3239

3340
variable.subscribe(onNext: { _ in executed = true })
3441
.disposed(by: subject.rx.disposeBag)

‎Demo/Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PODS:
2-
- Nimble (8.0.1)
3-
- "NSObject+Rx (5.0.0)":
2+
- Nimble (8.0.2)
3+
- "NSObject+Rx (5.0.1)":
44
- RxSwift (~> 5.0)
55
- Quick (2.1.0)
66
- RxSwift (5.0.0)
@@ -22,11 +22,11 @@ EXTERNAL SOURCES:
2222
:path: "../"
2323

2424
SPEC CHECKSUMS:
25-
Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
26-
"NSObject+Rx": 8ecb1e4714f3d35ac91485d2a769b7ab4b62e697
25+
Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
26+
"NSObject+Rx": 1cc531f17bdb4e3aaac37874f1136c81091d2f6a
2727
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
2828
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
2929

3030
PODFILE CHECKSUM: 4f420ecd33a82075e360098bbed0ccaadfeb1728
3131

32-
COCOAPODS: 1.6.1
32+
COCOAPODS: 1.7.5

‎Gemfile.lock‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.0)
4+
CFPropertyList (3.0.1)
55
activesupport (4.2.11.1)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
@@ -11,12 +11,12 @@ GEM
1111
public_suffix (>= 2.0.2, < 4.0)
1212
atomos (0.1.3)
1313
babosa (1.0.2)
14-
claide (1.0.2)
15-
cocoapods (1.6.1)
14+
claide (1.0.3)
15+
cocoapods (1.7.5)
1616
activesupport (>= 4.0.2, < 5)
1717
claide (>= 1.0.2, < 2.0)
18-
cocoapods-core (= 1.6.1)
19-
cocoapods-deintegrate (>= 1.0.2, < 2.0)
18+
cocoapods-core (= 1.7.5)
19+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2020
cocoapods-downloader (>= 1.2.2, < 2.0)
2121
cocoapods-plugins (>= 1.0.0, < 2.0)
2222
cocoapods-search (>= 1.0.0, < 2.0)
@@ -25,13 +25,13 @@ GEM
2525
cocoapods-try (>= 1.1.0, < 2.0)
2626
colored2 (~> 3.1)
2727
escape (~> 0.0.4)
28-
fourflusher (>= 2.2.0, < 3.0)
28+
fourflusher (>= 2.3.0, < 3.0)
2929
gh_inspector (~> 1.0)
3030
molinillo (~> 0.6.6)
3131
nap (~> 1.0)
3232
ruby-macho (~> 1.4)
33-
xcodeproj (>= 1.8.1, < 2.0)
34-
cocoapods-core (1.6.1)
33+
xcodeproj (>= 1.10.0, < 2.0)
34+
cocoapods-core (1.7.5)
3535
activesupport (>= 4.0.2, < 6)
3636
fuzzy_match (~> 2.0.4)
3737
nap (~> 1.0)
@@ -41,7 +41,7 @@ GEM
4141
nap
4242
cocoapods-search (1.0.0)
4343
cocoapods-stats (1.1.0)
44-
cocoapods-trunk (1.3.1)
44+
cocoapods-trunk (1.4.0)
4545
nap (>= 0.8, < 2.0)
4646
netrc (~> 0.11)
4747
cocoapods-try (1.1.0)
@@ -53,12 +53,12 @@ GEM
5353
declarative (0.0.10)
5454
declarative-option (0.1.0)
5555
digest-crc (0.4.1)
56-
domain_name (0.5.20180417)
56+
domain_name (0.5.20190701)
5757
unf (>= 0.0.5, < 1.0.0)
58-
dotenv (2.7.2)
58+
dotenv (2.7.5)
5959
emoji_regex (1.0.1)
6060
escape (0.0.4)
61-
excon (0.64.0)
61+
excon (0.66.0)
6262
faraday (0.15.4)
6363
multipart-post (>= 1.2, < 3)
6464
faraday-cookie_jar (0.0.6)
@@ -67,7 +67,7 @@ GEM
6767
faraday_middleware (0.13.1)
6868
faraday (>= 0.7.4, < 1.0)
6969
fastimage (2.1.5)
70-
fastlane (2.122.0)
70+
fastlane (2.129.0)
7171
CFPropertyList (>= 2.3, < 4.0.0)
7272
addressable (>= 2.3, < 3.0.0)
7373
babosa (>= 1.0.2, < 2.0.0)
@@ -86,8 +86,8 @@ GEM
8686
google-cloud-storage (>= 1.15.0, < 2.0.0)
8787
highline (>= 1.7.2, < 2.0.0)
8888
json (< 3.0.0)
89-
mini_magick (~> 4.5.1)
90-
multi_json
89+
jwt (~> 2.1.0)
90+
mini_magick (>= 4.9.4, < 5.0.0)
9191
multi_xml (~> 0.5)
9292
multipart-post (~> 2.0.0)
9393
plist (>= 3.1.0, < 4.0.0)
@@ -104,7 +104,7 @@ GEM
104104
xcodeproj (>= 1.8.1, < 2.0.0)
105105
xcpretty (~> 0.3.0)
106106
xcpretty-travis-formatter (>= 0.0.3)
107-
fourflusher (2.2.0)
107+
fourflusher (2.3.1)
108108
fuzzy_match (2.0.4)
109109
gh_inspector (1.1.3)
110110
google-api-client (0.23.9)
@@ -115,9 +115,9 @@ GEM
115115
representable (~> 3.0)
116116
retriable (>= 2.0, < 4.0)
117117
signet (~> 0.9)
118-
google-cloud-core (1.3.0)
118+
google-cloud-core (1.3.1)
119119
google-cloud-env (~> 1.0)
120-
google-cloud-env (1.0.5)
120+
google-cloud-env (1.2.1)
121121
faraday (~> 0.11)
122122
google-cloud-storage (1.16.0)
123123
digest-crc (~> 0.4)
@@ -143,7 +143,7 @@ GEM
143143
mime-types (3.2.2)
144144
mime-types-data (~> 3.2015)
145145
mime-types-data (3.2019.0331)
146-
mini_magick (4.5.1)
146+
mini_magick (4.9.5)
147147
minitest (5.11.3)
148148
molinillo (0.6.6)
149149
multi_json (1.13.1)
@@ -163,7 +163,7 @@ GEM
163163
retriable (3.1.2)
164164
rouge (2.0.7)
165165
ruby-macho (1.4.0)
166-
rubyzip (1.2.2)
166+
rubyzip (1.2.3)
167167
security (0.1.3)
168168
signet (0.11.0)
169169
addressable (~> 2.3)
@@ -178,19 +178,19 @@ GEM
178178
terminal-table (1.8.0)
179179
unicode-display_width (~> 1.1, >= 1.1.1)
180180
thread_safe (0.3.6)
181-
tty-cursor (0.6.1)
182-
tty-screen (0.6.5)
183-
tty-spinner (0.9.0)
184-
tty-cursor (~> 0.6.0)
181+
tty-cursor (0.7.0)
182+
tty-screen (0.7.0)
183+
tty-spinner (0.9.1)
184+
tty-cursor (~> 0.7)
185185
tzinfo (1.2.5)
186186
thread_safe (~> 0.1)
187187
uber (0.1.0)
188188
unf (0.1.4)
189189
unf_ext
190190
unf_ext (0.0.7.6)
191-
unicode-display_width (1.5.0)
191+
unicode-display_width (1.6.0)
192192
word_wrap (1.0.0)
193-
xcodeproj (1.9.0)
193+
xcodeproj (1.12.0)
194194
CFPropertyList (>= 2.3.3, < 4.0)
195195
atomos (~> 0.1.3)
196196
claide (>= 1.0.2, < 2.0)
@@ -209,4 +209,4 @@ DEPENDENCIES
209209
fastlane
210210

211211
BUNDLED WITH
212-
1.17.2
212+
1.17.3

‎HasDisposeBag.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extension HasDisposeBag {
2020
return result
2121
}
2222

23-
public var disposeBag: DisposeBag {
23+
var disposeBag: DisposeBag {
2424
get {
2525
return synchronizedBag {
2626
if let disposeObject = objc_getAssociatedObject(self, &disposeBagContext) as? DisposeBag {

‎NSObject+Rx.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "NSObject+Rx"
3-
s.version = "5.0.0"
3+
s.version = "5.0.1"
44
s.summary = "Handy RxSwift extensions on NSObject."
55
s.description = <<-DESC
66
Right now, we just have a `rx_disposeBag` property, but we're open to PRs!

0 commit comments

Comments
 (0)