Skip to content

Commit 5da1818

Browse files
authored
Merge pull request #11 from RxSwiftCommunity/update/rx
Update RxSwift to 6.0+
2 parents dcef763 + 6218c2d commit 5da1818

File tree

6 files changed

+55
-57
lines changed

6 files changed

+55
-57
lines changed

.github/workflows/build_check.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: build_check
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: macOS-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Pod install
17+
run: pod install --project-directory=Example --repo-update
18+
- name: Run test
19+
run: set -o pipefail && xcodebuild -workspace Example/RxAlertViewable.xcworkspace -scheme RxAlertViewable -sdk iphonesimulator build CODE_SIGNING_REQUIRED=NO | xcpretty -c

.travis.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

Example/Podfile.lock

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
PODS:
2-
- Kingfisher (5.15.6):
3-
- Kingfisher/Core (= 5.15.6)
4-
- Kingfisher/Core (5.15.6)
5-
- RxAlertViewable (0.9.3):
6-
- RxCocoa (~> 5)
7-
- RxSwift (~> 5)
8-
- RxCocoa (5.1.1):
9-
- RxRelay (~> 5)
10-
- RxSwift (~> 5)
11-
- RxRelay (5.1.1):
12-
- RxSwift (~> 5)
13-
- RxSwift (5.1.1)
2+
- Kingfisher (6.0.1)
3+
- RxAlertViewable (1.0):
4+
- RxCocoa (~> 6)
5+
- RxSwift (~> 6)
6+
- RxCocoa (6.0.0):
7+
- RxRelay (= 6.0.0)
8+
- RxSwift (= 6.0.0)
9+
- RxRelay (6.0.0):
10+
- RxSwift (= 6.0.0)
11+
- RxSwift (6.0.0)
1412
- SnapKit (5.0.1)
1513

1614
DEPENDENCIES:
@@ -33,13 +31,13 @@ EXTERNAL SOURCES:
3331
:path: "../"
3432

3533
SPEC CHECKSUMS:
36-
Kingfisher: b3554e7bf6106115b44e8795300bad580ef2fdc7
37-
RxAlertViewable: 8bb45319682b7b8ee4c1dc0764ae4f7bb9212c72
38-
RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601
39-
RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9
40-
RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
34+
Kingfisher: adde87a4f74f6a3845395769354efff593581740
35+
RxAlertViewable: 3e571f53b7e73a7b546358f2e17f21f34f7d3301
36+
RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
37+
RxRelay: 8d593be109c06ea850df027351beba614b012ffb
38+
RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
4139
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
4240

4341
PODFILE CHECKSUM: b4605b4abcc2e96e810853dd0c68eb98e91ba151
4442

45-
COCOAPODS: 1.10.0
43+
COCOAPODS: 1.10.1

Example/RxAlertViewable.xcodeproj/project.pbxproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
isa = PBXProject;
213213
attributes = {
214214
LastSwiftUpdateCheck = 0830;
215-
LastUpgradeCheck = 1020;
215+
LastUpgradeCheck = 1230;
216216
ORGANIZATIONNAME = CocoaPods;
217217
TargetAttributes = {
218218
607FACCF1AFB9204008FA782 = {
@@ -228,10 +228,9 @@
228228
};
229229
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "RxAlertViewable" */;
230230
compatibilityVersion = "Xcode 3.2";
231-
developmentRegion = English;
231+
developmentRegion = en;
232232
hasScannedForEncodings = 0;
233233
knownRegions = (
234-
English,
235234
en,
236235
Base,
237236
);
@@ -436,6 +435,7 @@
436435
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
437436
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
438437
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
438+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
439439
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
440440
CLANG_WARN_STRICT_PROTOTYPES = YES;
441441
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -461,7 +461,7 @@
461461
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
462462
GCC_WARN_UNUSED_FUNCTION = YES;
463463
GCC_WARN_UNUSED_VARIABLE = YES;
464-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
464+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
465465
MTL_ENABLE_DEBUG_INFO = YES;
466466
ONLY_ACTIVE_ARCH = YES;
467467
SDKROOT = iphoneos;
@@ -493,6 +493,7 @@
493493
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
494494
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
495495
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
496+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
496497
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
497498
CLANG_WARN_STRICT_PROTOTYPES = YES;
498499
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -511,7 +512,7 @@
511512
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
512513
GCC_WARN_UNUSED_FUNCTION = YES;
513514
GCC_WARN_UNUSED_VARIABLE = YES;
514-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
515+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
515516
MTL_ENABLE_DEBUG_INFO = NO;
516517
SDKROOT = iphoneos;
517518
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Example/RxAlertViewable.xcodeproj/xcshareddata/xcschemes/RxAlertViewable-Example.xcscheme

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
48+
BuildableName = "RxAlertViewable_Example.app"
49+
BlueprintName = "RxAlertViewable_Example"
50+
ReferencedContainer = "container:RxAlertViewable.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4453
<Testables>
4554
<TestableReference
4655
skipped = "NO">
@@ -53,17 +62,6 @@
5362
</BuildableReference>
5463
</TestableReference>
5564
</Testables>
56-
<MacroExpansion>
57-
<BuildableReference
58-
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
60-
BuildableName = "RxAlertViewable_Example.app"
61-
BlueprintName = "RxAlertViewable_Example"
62-
ReferencedContainer = "container:RxAlertViewable.xcodeproj">
63-
</BuildableReference>
64-
</MacroExpansion>
65-
<AdditionalOptions>
66-
</AdditionalOptions>
6765
</TestAction>
6866
<LaunchAction
6967
buildConfiguration = "Debug"
@@ -85,8 +83,6 @@
8583
ReferencedContainer = "container:RxAlertViewable.xcodeproj">
8684
</BuildableReference>
8785
</BuildableProductRunnable>
88-
<AdditionalOptions>
89-
</AdditionalOptions>
9086
</LaunchAction>
9187
<ProfileAction
9288
buildConfiguration = "Release"

RxAlertViewable.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Pod::Spec.new do |s|
99
s.name = 'RxAlertViewable'
10-
s.version = '0.9.3'
10+
s.version = '1.0'
1111
s.summary = 'A simple alert library with RxSwift supported.'
1212

1313
s.description = <<-DESC
@@ -20,9 +20,9 @@ RxAlertViewable is created for developing the MVVM app with RxSwift. It supports
2020
s.source = { :git => 'https://github.com/lm2343635/RxAlertViewable.git', :tag => s.version.to_s }
2121

2222
s.ios.deployment_target = '10.0'
23-
s.swift_version = '5.0'
23+
s.swift_version = '5.1'
2424
s.source_files = 'RxAlertViewable/Classes/**/*'
25-
s.dependency 'RxSwift', '~> 5'
26-
s.dependency 'RxCocoa', '~> 5'
25+
s.dependency 'RxSwift', '~> 6'
26+
s.dependency 'RxCocoa', '~> 6'
2727

2828
end

0 commit comments

Comments
 (0)