Skip to content
This repository was archived by the owner on Sep 19, 2024. It is now read-only.

Commit 8241aab

Browse files
mac-cain13mac-cain13
authored
Merge pull request #23 from kylejm/swift4
Swift 4 compatibility
2 parents aa6e48e + 64cf11c commit 8241aab

File tree

3 files changed

+27
-15
lines changed

3 files changed

+27
-15
lines changed

‎R.swift.Library.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -359,24 +359,24 @@
359359
isa = PBXProject;
360360
attributes = {
361361
LastSwiftUpdateCheck = 0720;
362-
LastUpgradeCheck = 0800;
362+
LastUpgradeCheck = 0900;
363363
ORGANIZATIONNAME = "Mathijs Kadijk";
364364
TargetAttributes = {
365365
806E69911C42BD9C00DE3A8B = {
366366
CreatedOnToolsVersion = 7.2;
367-
LastSwiftMigration = 0810;
367+
LastSwiftMigration = 0900;
368368
};
369369
806E699A1C42BD9C00DE3A8B = {
370370
CreatedOnToolsVersion = 7.2;
371-
LastSwiftMigration = 0810;
371+
LastSwiftMigration = 0900;
372372
};
373373
D592464D1C117A55007F94C7 = {
374374
CreatedOnToolsVersion = 7.1.1;
375-
LastSwiftMigration = 0810;
375+
LastSwiftMigration = 0900;
376376
};
377377
D59246571C117A55007F94C7 = {
378378
CreatedOnToolsVersion = 7.1.1;
379-
LastSwiftMigration = 0810;
379+
LastSwiftMigration = 0900;
380380
};
381381
};
382382
};
@@ -552,7 +552,7 @@
552552
PRODUCT_NAME = Rswift;
553553
SDKROOT = appletvos;
554554
SKIP_INSTALL = YES;
555-
SWIFT_VERSION = 3.0;
555+
SWIFT_VERSION = 4.0;
556556
TARGETED_DEVICE_FAMILY = 3;
557557
TVOS_DEPLOYMENT_TARGET = 9.0;
558558
};
@@ -574,7 +574,7 @@
574574
PRODUCT_NAME = Rswift;
575575
SDKROOT = appletvos;
576576
SKIP_INSTALL = YES;
577-
SWIFT_VERSION = 3.0;
577+
SWIFT_VERSION = 4.0;
578578
TARGETED_DEVICE_FAMILY = 3;
579579
TVOS_DEPLOYMENT_TARGET = 9.0;
580580
};
@@ -588,7 +588,7 @@
588588
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.RswiftTests;
589589
PRODUCT_NAME = "$(TARGET_NAME)";
590590
SDKROOT = appletvos;
591-
SWIFT_VERSION = 3.0;
591+
SWIFT_VERSION = 4.0;
592592
TVOS_DEPLOYMENT_TARGET = 9.1;
593593
};
594594
name = Debug;
@@ -601,7 +601,7 @@
601601
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.RswiftTests;
602602
PRODUCT_NAME = "$(TARGET_NAME)";
603603
SDKROOT = appletvos;
604-
SWIFT_VERSION = 3.0;
604+
SWIFT_VERSION = 4.0;
605605
TVOS_DEPLOYMENT_TARGET = 9.1;
606606
};
607607
name = Release;
@@ -614,14 +614,20 @@
614614
CLANG_CXX_LIBRARY = "libc++";
615615
CLANG_ENABLE_MODULES = YES;
616616
CLANG_ENABLE_OBJC_ARC = YES;
617+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
617618
CLANG_WARN_BOOL_CONVERSION = YES;
619+
CLANG_WARN_COMMA = YES;
618620
CLANG_WARN_CONSTANT_CONVERSION = YES;
619621
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
620622
CLANG_WARN_EMPTY_BODY = YES;
621623
CLANG_WARN_ENUM_CONVERSION = YES;
622624
CLANG_WARN_INFINITE_RECURSION = YES;
623625
CLANG_WARN_INT_CONVERSION = YES;
626+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
627+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
624628
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
629+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
630+
CLANG_WARN_STRICT_PROTOTYPES = YES;
625631
CLANG_WARN_SUSPICIOUS_MOVE = YES;
626632
CLANG_WARN_UNREACHABLE_CODE = YES;
627633
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -664,14 +670,20 @@
664670
CLANG_CXX_LIBRARY = "libc++";
665671
CLANG_ENABLE_MODULES = YES;
666672
CLANG_ENABLE_OBJC_ARC = YES;
673+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
667674
CLANG_WARN_BOOL_CONVERSION = YES;
675+
CLANG_WARN_COMMA = YES;
668676
CLANG_WARN_CONSTANT_CONVERSION = YES;
669677
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
670678
CLANG_WARN_EMPTY_BODY = YES;
671679
CLANG_WARN_ENUM_CONVERSION = YES;
672680
CLANG_WARN_INFINITE_RECURSION = YES;
673681
CLANG_WARN_INT_CONVERSION = YES;
682+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
683+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
674684
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
685+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
686+
CLANG_WARN_STRICT_PROTOTYPES = YES;
675687
CLANG_WARN_SUSPICIOUS_MOVE = YES;
676688
CLANG_WARN_UNREACHABLE_CODE = YES;
677689
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -718,7 +730,7 @@
718730
PRODUCT_NAME = Rswift;
719731
SKIP_INSTALL = YES;
720732
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
721-
SWIFT_VERSION = 3.0;
733+
SWIFT_VERSION = 4.0;
722734
};
723735
name = Debug;
724736
};
@@ -739,7 +751,7 @@
739751
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.rswift.library;
740752
PRODUCT_NAME = Rswift;
741753
SKIP_INSTALL = YES;
742-
SWIFT_VERSION = 3.0;
754+
SWIFT_VERSION = 4.0;
743755
};
744756
name = Release;
745757
};
@@ -750,7 +762,7 @@
750762
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
751763
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.RswiftTests;
752764
PRODUCT_NAME = "$(TARGET_NAME)";
753-
SWIFT_VERSION = 3.0;
765+
SWIFT_VERSION = 4.0;
754766
};
755767
name = Debug;
756768
};
@@ -761,7 +773,7 @@
761773
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
762774
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.RswiftTests;
763775
PRODUCT_NAME = "$(TARGET_NAME)";
764-
SWIFT_VERSION = 3.0;
776+
SWIFT_VERSION = 4.0;
765777
};
766778
name = Release;
767779
};

‎R.swift.Library.xcodeproj/xcshareddata/xcschemes/Rswift-iOS.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 = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎R.swift.Library.xcodeproj/xcshareddata/xcschemes/Rswift-tvOS.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 = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)