Skip to content

Commit 2981f10

Browse files
kishikawakatsumikishikawakatsumi
committed
Clean up configration files
1 parent 84590f0 commit 2981f10

5 files changed

Lines changed: 9 additions & 12 deletions

File tree

‎Lib/Configurations/Base.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ VERSIONING_SYSTEM = "apple-generic";
2929
VERSION_INFO_PREFIX = "";
3030

3131
CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer;
32-
CODE_SIGNING_REQUIRED[sdk=macosx] = NO;
32+
CODE_SIGNING_REQUIRED[sdk=macosx*] = NO;
3333

3434
MACOSX_DEPLOYMENT_TARGET = 10.9;
3535
IPHONEOS_DEPLOYMENT_TARGET = 8.0;

‎Lib/Configurations/KeychainAccess.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ENABLE_BITCODE[sdk=iphone*] = YES;
1717
ENABLE_BITCODE[sdk=watch*] = YES;
1818
ENABLE_BITCODE[sdk=appletv*] = YES;
1919

20-
LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;
2120
LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
2221
LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
2322
LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
23+
LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;

‎Lib/Configurations/TestHost.xcconfig‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,21 @@ INFOPLIST_FILE = TestHost/Info.plist;
77
PRODUCT_NAME = $(TARGET_NAME);
88
CLANG_MODULES_AUTOLINK = NO;
99
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
10+
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
1011

1112
PRODUCT_BUNDLE_IDENTIFIER = com.kishikawakatsumi.TestHost;
1213

13-
CODE_SIGNING_REQUIRED[sdk=macosx] = NO;
14+
CODE_SIGNING_REQUIRED[sdk=macosx*] = NO;
1415
CODE_SIGN_ENTITLEMENTS = TestHost/TestHost.entitlements;
15-
OTHER_CODE_SIGN_FLAGS[sdk=macosx*] = --deep;
1616
PROVISIONING_PROFILE[sdk=iphone*] = ;
1717
PROVISIONING_PROFILE[sdk=appletv*] = ;
18+
OTHER_CODE_SIGN_FLAGS[sdk=macosx*] = --deep;
1819

1920
PRINCIPAL_CLASS[sdk=iphone*] = UIApplication;
2021
PRINCIPAL_CLASS[sdk=appletv*] = UIApplication;
2122
PRINCIPAL_CLASS[sdk=macosx*] = NSApplication;
2223

23-
LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;
2424
LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
2525
LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
2626
LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
27+
LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;

‎Lib/Configurations/Tests.xcconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ PRODUCT_NAME = $(TARGET_NAME);
66
APPLICATION_EXTENSION_API_ONLY = NO;
77
INFOPLIST_FILE = KeychainAccessTests/Info.plist;
88

9-
LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;
109
LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
1110
LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
1211
LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
12+
LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;
1313

1414
TEST_HOST[sdk=iphone*] = $(BUILT_PRODUCTS_DIR)/TestHost.app/TestHost;
1515
TEST_HOST[sdk=appletv*] = $(BUILT_PRODUCTS_DIR)/TestHost.app/TestHost;
1616
TEST_HOST[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/TestHost.app/Contents/MacOS/TestHost;
1717

18-
EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = SharedCredentialTests.swift;
1918
EXCLUDED_SOURCE_FILE_NAMES[sdk=watch*] = *;
20-
EXCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = SharedCredentialTests.swift;
19+
EXCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = SharedCredentialTests.swift;
20+
EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = SharedCredentialTests.swift;

‎Lib/KeychainAccess.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,17 +429,13 @@
429429
isa = XCBuildConfiguration;
430430
baseConfigurationReference = 14F0C1981D329832007DCDDB /* TestHost.xcconfig */;
431431
buildSettings = {
432-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
433-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
434432
};
435433
name = Debug;
436434
};
437435
14A630261D3293C700809B3F /* Release */ = {
438436
isa = XCBuildConfiguration;
439437
baseConfigurationReference = 14F0C1981D329832007DCDDB /* TestHost.xcconfig */;
440438
buildSettings = {
441-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
442-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
443439
};
444440
name = Release;
445441
};

0 commit comments

Comments
 (0)