Skip to content

Commit 02fe111

Browse files
krzysztofzablockikrzysztofzablocki
authored
Merge pull request #27 from ZevEisenberg/master
Modernize project and package tools version
2 parents b509728 + 474356b commit 02fe111

6 files changed

Lines changed: 63 additions & 60 deletions

File tree

‎Difference.xcodeproj/project.pbxproj‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
isa = PBXProject;
347347
attributes = {
348348
LastSwiftUpdateCheck = 0720;
349-
LastUpgradeCheck = 0810;
349+
LastUpgradeCheck = 1320;
350350
ORGANIZATIONNAME = Difference;
351351
TargetAttributes = {
352352
52D6D97B1BEFF229002C0205 = {
@@ -381,10 +381,11 @@
381381
};
382382
buildConfigurationList = 52D6D9761BEFF229002C0205 /* Build configuration list for PBXProject "Difference" */;
383383
compatibilityVersion = "Xcode 6.3";
384-
developmentRegion = English;
384+
developmentRegion = en;
385385
hasScannedForEncodings = 0;
386386
knownRegions = (
387387
en,
388+
Base,
388389
);
389390
mainGroup = 52D6D9721BEFF229002C0205;
390391
productRefGroup = 52D6D97D1BEFF229002C0205 /* Products */;
@@ -536,18 +537,28 @@
536537
isa = XCBuildConfiguration;
537538
buildSettings = {
538539
ALWAYS_SEARCH_USER_PATHS = NO;
540+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
539541
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
540542
CLANG_CXX_LIBRARY = "libc++";
541543
CLANG_ENABLE_MODULES = YES;
542544
CLANG_ENABLE_OBJC_ARC = YES;
545+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
543546
CLANG_WARN_BOOL_CONVERSION = YES;
547+
CLANG_WARN_COMMA = YES;
544548
CLANG_WARN_CONSTANT_CONVERSION = YES;
549+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
545550
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
546551
CLANG_WARN_EMPTY_BODY = YES;
547552
CLANG_WARN_ENUM_CONVERSION = YES;
548553
CLANG_WARN_INFINITE_RECURSION = YES;
549554
CLANG_WARN_INT_CONVERSION = YES;
555+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
556+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
557+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
550558
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
559+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
560+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
561+
CLANG_WARN_STRICT_PROTOTYPES = YES;
551562
CLANG_WARN_SUSPICIOUS_MOVE = YES;
552563
CLANG_WARN_UNREACHABLE_CODE = YES;
553564
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -571,7 +582,7 @@
571582
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
572583
GCC_WARN_UNUSED_FUNCTION = YES;
573584
GCC_WARN_UNUSED_VARIABLE = YES;
574-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
585+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
575586
MTL_ENABLE_DEBUG_INFO = YES;
576587
ONLY_ACTIVE_ARCH = YES;
577588
SDKROOT = iphoneos;
@@ -587,18 +598,28 @@
587598
isa = XCBuildConfiguration;
588599
buildSettings = {
589600
ALWAYS_SEARCH_USER_PATHS = NO;
601+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
590602
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
591603
CLANG_CXX_LIBRARY = "libc++";
592604
CLANG_ENABLE_MODULES = YES;
593605
CLANG_ENABLE_OBJC_ARC = YES;
606+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
594607
CLANG_WARN_BOOL_CONVERSION = YES;
608+
CLANG_WARN_COMMA = YES;
595609
CLANG_WARN_CONSTANT_CONVERSION = YES;
610+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
596611
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
597612
CLANG_WARN_EMPTY_BODY = YES;
598613
CLANG_WARN_ENUM_CONVERSION = YES;
599614
CLANG_WARN_INFINITE_RECURSION = YES;
600615
CLANG_WARN_INT_CONVERSION = YES;
616+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
617+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
618+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
601619
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
620+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
621+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
622+
CLANG_WARN_STRICT_PROTOTYPES = YES;
602623
CLANG_WARN_SUSPICIOUS_MOVE = YES;
603624
CLANG_WARN_UNREACHABLE_CODE = YES;
604625
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -616,7 +637,7 @@
616637
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
617638
GCC_WARN_UNUSED_FUNCTION = YES;
618639
GCC_WARN_UNUSED_VARIABLE = YES;
619-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
640+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
620641
MTL_ENABLE_DEBUG_INFO = NO;
621642
SDKROOT = iphoneos;
622643
SWIFT_VERSION = 5.0;
@@ -639,7 +660,7 @@
639660
DYLIB_INSTALL_NAME_BASE = "@rpath";
640661
INFOPLIST_FILE = Configs/Difference.plist;
641662
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
642-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
663+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
643664
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
644665
ONLY_ACTIVE_ARCH = NO;
645666
PRODUCT_BUNDLE_IDENTIFIER = "com.Difference.Difference-iOS";
@@ -662,7 +683,7 @@
662683
DYLIB_INSTALL_NAME_BASE = "@rpath";
663684
INFOPLIST_FILE = Configs/Difference.plist;
664685
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
665-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
686+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
666687
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
667688
PRODUCT_BUNDLE_IDENTIFIER = "com.Difference.Difference-iOS";
668689
PRODUCT_NAME = Difference;
@@ -758,7 +779,7 @@
758779
SDKROOT = appletvos;
759780
SKIP_INSTALL = YES;
760781
TARGETED_DEVICE_FAMILY = 3;
761-
TVOS_DEPLOYMENT_TARGET = 9.0;
782+
TVOS_DEPLOYMENT_TARGET = 12.0;
762783
};
763784
name = Debug;
764785
};
@@ -780,7 +801,7 @@
780801
SKIP_INSTALL = YES;
781802
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
782803
TARGETED_DEVICE_FAMILY = 3;
783-
TVOS_DEPLOYMENT_TARGET = 9.0;
804+
TVOS_DEPLOYMENT_TARGET = 12.0;
784805
};
785806
name = Release;
786807
};
@@ -866,7 +887,7 @@
866887
PRODUCT_BUNDLE_IDENTIFIER = "com.Difference.Difference-tvOS-Tests";
867888
PRODUCT_NAME = "$(TARGET_NAME)";
868889
SDKROOT = appletvos;
869-
TVOS_DEPLOYMENT_TARGET = 9.1;
890+
TVOS_DEPLOYMENT_TARGET = 12.0;
870891
};
871892
name = Debug;
872893
};
@@ -879,7 +900,7 @@
879900
PRODUCT_NAME = "$(TARGET_NAME)";
880901
SDKROOT = appletvos;
881902
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
882-
TVOS_DEPLOYMENT_TARGET = 9.1;
903+
TVOS_DEPLOYMENT_TARGET = 12.0;
883904
};
884905
name = Release;
885906
};

‎Difference.xcodeproj/xcshareddata/xcschemes/Difference-iOS.xcscheme‎

Lines changed: 10 additions & 16 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 = "0800"
3+
LastUpgradeVersion = "1320"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES"
3130
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
35+
BuildableName = "Difference.framework"
36+
BlueprintName = "Difference-iOS"
37+
ReferencedContainer = "container:Difference.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3240
<Testables>
3341
<TestableReference
3442
skipped = "NO">
@@ -41,23 +49,11 @@
4149
</BuildableReference>
4250
</TestableReference>
4351
</Testables>
44-
<MacroExpansion>
45-
<BuildableReference
46-
BuildableIdentifier = "primary"
47-
BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
48-
BuildableName = "Difference.framework"
49-
BlueprintName = "Difference-iOS"
50-
ReferencedContainer = "container:Difference.xcodeproj">
51-
</BuildableReference>
52-
</MacroExpansion>
53-
<AdditionalOptions>
54-
</AdditionalOptions>
5552
</TestAction>
5653
<LaunchAction
5754
buildConfiguration = "Debug"
5855
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5956
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60-
language = ""
6157
launchStyle = "0"
6258
useCustomWorkingDirectory = "NO"
6359
ignoresPersistentStateOnLaunch = "NO"
@@ -73,8 +69,6 @@
7369
ReferencedContainer = "container:Difference.xcodeproj">
7470
</BuildableReference>
7571
</MacroExpansion>
76-
<AdditionalOptions>
77-
</AdditionalOptions>
7872
</LaunchAction>
7973
<ProfileAction
8074
buildConfiguration = "Release"

‎Difference.xcodeproj/xcshareddata/xcschemes/Difference-macOS.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 = "0800"
3+
LastUpgradeVersion = "1320"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -28,6 +28,15 @@
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES"
3030
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "52D6DA0E1BF000BD002C0205"
35+
BuildableName = "Difference.framework"
36+
BlueprintName = "Difference-macOS"
37+
ReferencedContainer = "container:Difference.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "52D6DA0E1BF000BD002C0205"
47-
BuildableName = "Difference.framework"
48-
BlueprintName = "Difference-macOS"
49-
ReferencedContainer = "container:Difference.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:Difference.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎Difference.xcodeproj/xcshareddata/xcschemes/Difference-tvOS.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 = "0800"
3+
LastUpgradeVersion = "1320"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -28,6 +28,15 @@
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES"
3030
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "52D6D9EF1BEFFFBE002C0205"
35+
BuildableName = "Difference.framework"
36+
BlueprintName = "Difference-tvOS"
37+
ReferencedContainer = "container:Difference.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "52D6D9EF1BEFFFBE002C0205"
47-
BuildableName = "Difference.framework"
48-
BlueprintName = "Difference-tvOS"
49-
ReferencedContainer = "container:Difference.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:Difference.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎Difference.xcodeproj/xcshareddata/xcschemes/Difference-watchOS.xcscheme‎

Lines changed: 1 addition & 5 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 = "0800"
3+
LastUpgradeVersion = "1320"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -30,8 +30,6 @@
3030
codeCoverageEnabled = "YES">
3131
<Testables>
3232
</Testables>
33-
<AdditionalOptions>
34-
</AdditionalOptions>
3533
</TestAction>
3634
<LaunchAction
3735
buildConfiguration = "Debug"
@@ -52,8 +50,6 @@
5250
ReferencedContainer = "container:Difference.xcodeproj">
5351
</BuildableReference>
5452
</MacroExpansion>
55-
<AdditionalOptions>
56-
</AdditionalOptions>
5753
</LaunchAction>
5854
<ProfileAction
5955
buildConfiguration = "Release"

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.2
1+
// swift-tools-version:5.3
22
import PackageDescription
33

44
let package = Package(

0 commit comments

Comments
 (0)