Skip to content

Commit 73a6aaf

Browse files
committed
Update demo app
Tests build thanks to ReactiveX/RxSwift#2127 (comment)
1 parent 47ac7a5 commit 73a6aaf

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

.swiftpm/xcode/xcshareddata/xcschemes/RxGRDB.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

.swiftpm/xcode/xcshareddata/xcschemes/RxGRDBTests.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Documentation/RxGRDBDemo/RxGRDBDemo.xcodeproj/project.pbxproj

+8-6
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
isa = PBXProject;
253253
attributes = {
254254
LastSwiftUpdateCheck = 1020;
255-
LastUpgradeCheck = 0930;
255+
LastUpgradeCheck = 1230;
256256
ORGANIZATIONNAME = "Gwendal Roué";
257257
TargetAttributes = {
258258
565BD7B522C3F84A00BB9B5A = {
@@ -387,7 +387,7 @@
387387
);
388388
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
389389
MTL_FAST_MATH = YES;
390-
OTHER_SWIFT_FLAGS = "-Xcc -fmodule-map-file=$(PROJECT_TEMP_ROOT)/GeneratedModuleMaps/iphonesimulator/RxCocoaRuntime.modulemap";
390+
OTHER_SWIFT_FLAGS = "-Xcc -fmodule-map-file=$(PROJECT_TEMP_ROOT)/GeneratedModuleMaps-$(PLATFORM_NAME)/RxCocoaRuntime.modulemap";
391391
PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.RxGRDBDemoTests;
392392
PRODUCT_NAME = "$(TARGET_NAME)";
393393
SWIFT_VERSION = 5.0;
@@ -410,7 +410,7 @@
410410
"@loader_path/Frameworks",
411411
);
412412
MTL_FAST_MATH = YES;
413-
OTHER_SWIFT_FLAGS = "-Xcc -fmodule-map-file=$(PROJECT_TEMP_ROOT)/GeneratedModuleMaps/iphonesimulator/RxCocoaRuntime.modulemap";
413+
OTHER_SWIFT_FLAGS = "-Xcc -fmodule-map-file=$(PROJECT_TEMP_ROOT)/GeneratedModuleMaps-$(PLATFORM_NAME)/RxCocoaRuntime.modulemap";
414414
PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.RxGRDBDemoTests;
415415
PRODUCT_NAME = "$(TARGET_NAME)";
416416
SWIFT_VERSION = 5.0;
@@ -444,6 +444,7 @@
444444
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
445445
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
446446
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
447+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
447448
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
448449
CLANG_WARN_STRICT_PROTOTYPES = YES;
449450
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -503,6 +504,7 @@
503504
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
504505
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
505506
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
507+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
506508
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
507509
CLANG_WARN_STRICT_PROTOTYPES = YES;
508510
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -603,15 +605,15 @@
603605
repositoryURL = "https://github.com/ReactiveX/RxSwift.git";
604606
requirement = {
605607
kind = upToNextMajorVersion;
606-
minimumVersion = 5.0.1;
608+
minimumVersion = 6.0.0;
607609
};
608610
};
609611
56D6EA302438ABAE000D55EF /* XCRemoteSwiftPackageReference "RxDataSources" */ = {
610612
isa = XCRemoteSwiftPackageReference;
611613
repositoryURL = "https://github.com/RxSwiftCommunity/RxDataSources.git";
612614
requirement = {
613615
kind = upToNextMajorVersion;
614-
minimumVersion = 4.0.1;
616+
minimumVersion = 5.0.0;
615617
};
616618
};
617619
56D6EA332438ABD7000D55EF /* XCRemoteSwiftPackageReference "Action" */ = {
@@ -627,7 +629,7 @@
627629
repositoryURL = "https://github.com/groue/GRDB.swift.git";
628630
requirement = {
629631
kind = upToNextMajorVersion;
630-
minimumVersion = "5.0.0-beta";
632+
minimumVersion = 5.0.0;
631633
};
632634
};
633635
/* End XCRemoteSwiftPackageReference section */

Documentation/RxGRDBDemo/RxGRDBDemo.xcodeproj/xcshareddata/xcschemes/RxGRDBDemo.xcscheme

+1-1
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"

Documentation/RxGRDBDemo/RxGRDBDemo/UI/PlayersViewController.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ class PlayersViewController: UIViewController {
3030
return
3131
}
3232

33-
var barButtonItem = UIBarButtonItem(title: title, style: .plain, target: nil, action: nil)
33+
let barButtonItem = UIBarButtonItem(title: title, style: .plain, target: nil, action: nil)
3434
barButtonItem.rx.action = viewModel.toggleOrdering
3535
navigationItem.rightBarButtonItem = barButtonItem
3636
}
3737

3838
private func setupToolbar() {
39-
var deleteAllButtonItem = UIBarButtonItem(barButtonSystemItem: .trash, target: nil, action: nil)
39+
let deleteAllButtonItem = UIBarButtonItem(barButtonSystemItem: .trash, target: nil, action: nil)
4040
deleteAllButtonItem.rx.action = viewModel.deleteAll
4141

42-
var refreshButtonItem = UIBarButtonItem(barButtonSystemItem: .refresh, target: nil, action: nil)
42+
let refreshButtonItem = UIBarButtonItem(barButtonSystemItem: .refresh, target: nil, action: nil)
4343
refreshButtonItem.rx.action = viewModel.refresh
4444

45-
var stressTestButtonItem = UIBarButtonItem(title: "💣", style: .plain, target: nil, action: nil)
45+
let stressTestButtonItem = UIBarButtonItem(title: "💣", style: .plain, target: nil, action: nil)
4646
stressTestButtonItem.rx.action = viewModel.stressTest
4747

4848
toolbarItems = [

0 commit comments

Comments
 (0)