浏览代码

Fix updated project settings

* move appropriate changes to xcconfig file
* remove duplicate settings: `ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES` was already set  in respective config file
Sebastian Hagedorn 7 年之前
父节点
当前提交
deb768e009
共有 2 个文件被更改,包括 2 次插入6 次删除
  1. 2 0
      Lib/Configurations/Base.xcconfig
  2. 0 6
      Lib/KeychainAccess.xcodeproj/project.pbxproj

+ 2 - 0
Lib/Configurations/Base.xcconfig

@@ -8,12 +8,14 @@ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 CLANG_WARN_BOOL_CONVERSION = YES;
 CLANG_WARN_BOOL_CONVERSION = YES;
 CLANG_WARN_COMMA = YES;
 CLANG_WARN_COMMA = YES;
 CLANG_WARN_CONSTANT_CONVERSION = YES;
 CLANG_WARN_CONSTANT_CONVERSION = YES;
+CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 CLANG_WARN_EMPTY_BODY = YES;
 CLANG_WARN_EMPTY_BODY = YES;
 CLANG_WARN_ENUM_CONVERSION = YES;
 CLANG_WARN_ENUM_CONVERSION = YES;
 CLANG_WARN_INFINITE_RECURSION = YES;
 CLANG_WARN_INFINITE_RECURSION = YES;
 CLANG_WARN_INT_CONVERSION = YES;
 CLANG_WARN_INT_CONVERSION = YES;
 CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

+ 0 - 6
Lib/KeychainAccess.xcodeproj/project.pbxproj

@@ -391,8 +391,6 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 148E44E61BF9EDCB004FFEC1 /* Debug.xcconfig */;
 			baseConfigurationReference = 148E44E61BF9EDCB004FFEC1 /* Debug.xcconfig */;
 			buildSettings = {
 			buildSettings = {
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 			};
 			};
 			name = Debug;
 			name = Debug;
 		};
 		};
@@ -400,8 +398,6 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 148E44E71BF9EDCB004FFEC1 /* Release.xcconfig */;
 			baseConfigurationReference = 148E44E71BF9EDCB004FFEC1 /* Release.xcconfig */;
 			buildSettings = {
 			buildSettings = {
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 			};
 			};
 			name = Release;
 			name = Release;
 		};
 		};
@@ -437,7 +433,6 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 14F0C1981D329832007DCDDB /* TestHost.xcconfig */;
 			baseConfigurationReference = 14F0C1981D329832007DCDDB /* TestHost.xcconfig */;
 			buildSettings = {
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 			};
 			};
 			name = Debug;
 			name = Debug;
 		};
 		};
@@ -445,7 +440,6 @@
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 14F0C1981D329832007DCDDB /* TestHost.xcconfig */;
 			baseConfigurationReference = 14F0C1981D329832007DCDDB /* TestHost.xcconfig */;
 			buildSettings = {
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 			};
 			};
 			name = Release;
 			name = Release;
 		};
 		};