Skip to content

Commit

Permalink
Merge pull request #244 from microsoft/fix/xcode13-warnings
Browse files Browse the repository at this point in the history 
Fix Xcode 13 incremental builds
  • Loading branch information
@MatkovIvan
MatkovIvan authored Jun 30, 2022
2 parents cb11578 + e9ae32c commit 0c132dd
Show file tree
Hide file tree
Showing 20 changed files with 38 additions and 36 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

* **[Fix]** Config ignored `shouldRegisterUncaughtExceptionHandler` parameter in constructor.
* **[Improvement]** Update `protobuf-c` to version 1.4.0.
* **[Improvement]** Fix Xcode 13 deprecated build settings that might broke incremental builds (it drops workaround for Xcode's 12.0-12.4 bug). It only affects projects that use PLCrashReporter as sources.

___

Expand Down
13 changes: 7 additions & 6 deletions CrashReporter.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 53;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -2673,7 +2673,8 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1140;
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1340;
TargetAttributes = {
052A45CE136353FB00987004 = {
DevelopmentTeam = 5Z97G9NZQ6;
Expand Down Expand Up @@ -4060,6 +4061,7 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_MODULES_AUTOLINK = NO;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
Expand All @@ -4072,6 +4074,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -4125,6 +4128,7 @@
CLANG_ENABLE_CODE_COVERAGE = NO;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_MODULES_AUTOLINK = NO;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
Expand All @@ -4137,6 +4141,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -4350,7 +4355,6 @@
isa = XCBuildConfiguration;
buildSettings = {
EFFECTIVE_PLATFORM_NAME = "-iphoneuniversal";
MODULEMAP_FILE = Resources/CrashReporter.modulemap;
SDKROOT = iphoneos;
};
name = Debug;
Expand All @@ -4359,7 +4363,6 @@
isa = XCBuildConfiguration;
buildSettings = {
EFFECTIVE_PLATFORM_NAME = "-iphoneuniversal";
MODULEMAP_FILE = Resources/CrashReporter.modulemap;
SDKROOT = iphoneos;
};
name = Release;
Expand All @@ -4368,7 +4371,6 @@
isa = XCBuildConfiguration;
buildSettings = {
EFFECTIVE_PLATFORM_NAME = "-appletvuniversal";
MODULEMAP_FILE = Resources/CrashReporter.modulemap;
SDKROOT = appletvos;
};
name = Debug;
Expand All @@ -4377,7 +4379,6 @@
isa = XCBuildConfiguration;
buildSettings = {
EFFECTIVE_PLATFORM_NAME = "-appletvuniversal";
MODULEMAP_FILE = Resources/CrashReporter.modulemap;
SDKROOT = appletvos;
};
name = Release;
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter Archive.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter Documentation.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter XCFramework.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1220"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter iOS Framework.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter iOS Universal.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
2 changes: 1 addition & 1 deletion CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter iOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter macOS Framework.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter macOS Static Framework.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1200"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
2 changes: 1 addition & 1 deletion CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter macOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter tvOS Framework.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter tvOS Universal.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
2 changes: 1 addition & 1 deletion CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter tvOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion CrashReporter.xcodeproj/xcshareddata/xcschemes/CrashReporter.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1220"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/DemoCrash iOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/DemoCrash macOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
4 changes: 2 additions & 2 deletions CrashReporter.xcodeproj/xcshareddata/xcschemes/DemoCrash tvOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
Expand Down
2 changes: 1 addition & 1 deletion CrashReporter.xcodeproj/xcshareddata/xcschemes/Fuzz Testing.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion CrashReporter.xcodeproj/xcshareddata/xcschemes/plcrashutil.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down

0 comments on commit 0c132dd

Please sign in to comment.