Skip to content

Commit ca86db4

Browse files
soyersoyersoyersoyer
committed
fix tests on new xcode
1 parent c001e3a commit ca86db4

File tree

3 files changed

+67
-22
lines changed

3 files changed

+67
-22
lines changed

‎SwCrypt.xcodeproj/project.pbxproj

Lines changed: 61 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
/* Begin PBXBuildFile section */
1010
2C6840A91F8C3A6E00BF8DD7 /* SwCrypt.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A71E921CBC7DB4002C5C88 /* SwCrypt.swift */; };
11-
2C6840AA1F8C3B1D00BF8DD7 /* SwCrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A0A71E781CBC7D74002C5C88 /* SwCrypt.framework */; };
1211
A0086F222172C48D0052F457 /* SwCrypt.podspec in Resources */ = {isa = PBXBuildFile; fileRef = A0086F212172C48D0052F457 /* SwCrypt.podspec */; };
12+
A01057F821C03ADD008392E0 /* SwCrypt.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A0A71E781CBC7D74002C5C88 /* SwCrypt.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1313
A051E37E1DBA5DA4004293E9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A051E37D1DBA5DA4004293E9 /* AppDelegate.swift */; };
1414
A051E3801DBA5DA4004293E9 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A051E37F1DBA5DA4004293E9 /* ViewController.swift */; };
1515
A051E3831DBA5DA4004293E9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A051E3811DBA5DA4004293E9 /* Main.storyboard */; };
@@ -20,7 +20,7 @@
2020
/* End PBXBuildFile section */
2121

2222
/* Begin PBXContainerItemProxy section */
23-
A051E38D1DBA5DAA004293E9 /* PBXContainerItemProxy */ = {
23+
A01057F521C03AC8008392E0 /* PBXContainerItemProxy */ = {
2424
isa = PBXContainerItemProxy;
2525
containerPortal = A0A71E6F1CBC7D74002C5C88 /* Project object */;
2626
proxyType = 1;
@@ -34,8 +34,29 @@
3434
remoteGlobalIDString = A0A71E771CBC7D74002C5C88;
3535
remoteInfo = SwCrypt;
3636
};
37+
A0C5816C21C02C60003BF9B8 /* PBXContainerItemProxy */ = {
38+
isa = PBXContainerItemProxy;
39+
containerPortal = A0A71E6F1CBC7D74002C5C88 /* Project object */;
40+
proxyType = 1;
41+
remoteGlobalIDString = A0A71E771CBC7D74002C5C88;
42+
remoteInfo = SwCrypt;
43+
};
3744
/* End PBXContainerItemProxy section */
3845

46+
/* Begin PBXCopyFilesBuildPhase section */
47+
A01057F921C03ADD008392E0 /* Embed Frameworks */ = {
48+
isa = PBXCopyFilesBuildPhase;
49+
buildActionMask = 2147483647;
50+
dstPath = "";
51+
dstSubfolderSpec = 10;
52+
files = (
53+
A01057F821C03ADD008392E0 /* SwCrypt.framework in Embed Frameworks */,
54+
);
55+
name = "Embed Frameworks";
56+
runOnlyForDeploymentPostprocessing = 0;
57+
};
58+
/* End PBXCopyFilesBuildPhase section */
59+
3960
/* Begin PBXFileReference section */
4061
A0086F212172C48D0052F457 /* SwCrypt.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SwCrypt.podspec; sourceTree = "<group>"; };
4162
A03DFA252173C0F600A9D5DD /* SwCrypt_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwCrypt_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -99,7 +120,6 @@
99120
isa = PBXFrameworksBuildPhase;
100121
buildActionMask = 2147483647;
101122
files = (
102-
2C6840AA1F8C3B1D00BF8DD7 /* SwCrypt.framework in Frameworks */,
103123
);
104124
runOnlyForDeploymentPostprocessing = 0;
105125
};
@@ -268,10 +288,12 @@
268288
A051E3771DBA5DA3004293E9 /* Sources */,
269289
A051E3781DBA5DA3004293E9 /* Frameworks */,
270290
A051E3791DBA5DA3004293E9 /* Resources */,
291+
A01057F921C03ADD008392E0 /* Embed Frameworks */,
271292
);
272293
buildRules = (
273294
);
274295
dependencies = (
296+
A0C5816D21C02C60003BF9B8 /* PBXTargetDependency */,
275297
);
276298
name = dummyTestApp;
277299
productName = dummyTestApp;
@@ -308,7 +330,7 @@
308330
);
309331
dependencies = (
310332
A0A71E851CBC7D74002C5C88 /* PBXTargetDependency */,
311-
A051E38E1DBA5DAA004293E9 /* PBXTargetDependency */,
333+
A01057F621C03AC8008392E0 /* PBXTargetDependency */,
312334
);
313335
name = SwCryptTests;
314336
productName = SwCryptTests;
@@ -339,8 +361,9 @@
339361
};
340362
A051E37A1DBA5DA3004293E9 = {
341363
CreatedOnToolsVersion = 8.0;
364+
DevelopmentTeam = X5L4X5ZF45;
342365
LastSwiftMigration = 0900;
343-
ProvisioningStyle = Manual;
366+
ProvisioningStyle = Automatic;
344367
SystemCapabilities = {
345368
com.apple.Keychain = {
346369
enabled = 1;
@@ -350,11 +373,13 @@
350373
A0A71E771CBC7D74002C5C88 = {
351374
CreatedOnToolsVersion = 7.3;
352375
LastSwiftMigration = 0900;
376+
ProvisioningStyle = Manual;
353377
};
354378
A0A71E811CBC7D74002C5C88 = {
355379
CreatedOnToolsVersion = 7.3;
380+
DevelopmentTeam = X5L4X5ZF45;
356381
LastSwiftMigration = 0900;
357-
ProvisioningStyle = Automatic;
382+
ProvisioningStyle = Manual;
358383
TestTargetID = A051E37A1DBA5DA3004293E9;
359384
};
360385
};
@@ -481,16 +506,21 @@
481506
/* End PBXSourcesBuildPhase section */
482507

483508
/* Begin PBXTargetDependency section */
484-
A051E38E1DBA5DAA004293E9 /* PBXTargetDependency */ = {
509+
A01057F621C03AC8008392E0 /* PBXTargetDependency */ = {
485510
isa = PBXTargetDependency;
486511
target = A051E37A1DBA5DA3004293E9 /* dummyTestApp */;
487-
targetProxy = A051E38D1DBA5DAA004293E9 /* PBXContainerItemProxy */;
512+
targetProxy = A01057F521C03AC8008392E0 /* PBXContainerItemProxy */;
488513
};
489514
A0A71E851CBC7D74002C5C88 /* PBXTargetDependency */ = {
490515
isa = PBXTargetDependency;
491516
target = A0A71E771CBC7D74002C5C88 /* SwCrypt */;
492517
targetProxy = A0A71E841CBC7D74002C5C88 /* PBXContainerItemProxy */;
493518
};
519+
A0C5816D21C02C60003BF9B8 /* PBXTargetDependency */ = {
520+
isa = PBXTargetDependency;
521+
target = A0A71E771CBC7D74002C5C88 /* SwCrypt */;
522+
targetProxy = A0C5816C21C02C60003BF9B8 /* PBXContainerItemProxy */;
523+
};
494524
/* End PBXTargetDependency section */
495525

496526
/* Begin PBXVariantGroup section */
@@ -712,22 +742,23 @@
712742
A051E38A1DBA5DA4004293E9 /* Debug */ = {
713743
isa = XCBuildConfiguration;
714744
buildSettings = {
715-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
745+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
716746
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
717747
CLANG_WARN_INFINITE_RECURSION = YES;
718748
CLANG_WARN_SUSPICIOUS_MOVES = YES;
719749
CODE_SIGN_ENTITLEMENTS = dummyTestApp/dummyTestApp.entitlements;
750+
CODE_SIGN_IDENTITY = "iPhone Developer";
720751
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
721-
CODE_SIGN_STYLE = Manual;
722-
DEVELOPMENT_TEAM = "";
752+
CODE_SIGN_STYLE = Automatic;
753+
DEVELOPMENT_TEAM = X5L4X5ZF45;
723754
FRAMEWORK_SEARCH_PATHS = (
724755
"$(inherited)",
725756
"$(PROJECT_DIR)",
726757
);
727758
INFOPLIST_FILE = dummyTestApp/Info.plist;
728759
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
729760
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
730-
PRODUCT_BUNDLE_IDENTIFIER = hu.irl.dummyTestApp;
761+
PRODUCT_BUNDLE_IDENTIFIER = hu.irl.dummyTestAppa;
731762
PRODUCT_NAME = "$(TARGET_NAME)";
732763
PROVISIONING_PROFILE_SPECIFIER = "";
733764
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -739,22 +770,23 @@
739770
A051E38B1DBA5DA4004293E9 /* Release */ = {
740771
isa = XCBuildConfiguration;
741772
buildSettings = {
742-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
773+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
743774
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
744775
CLANG_WARN_INFINITE_RECURSION = YES;
745776
CLANG_WARN_SUSPICIOUS_MOVES = YES;
746777
CODE_SIGN_ENTITLEMENTS = dummyTestApp/dummyTestApp.entitlements;
778+
CODE_SIGN_IDENTITY = "iPhone Developer";
747779
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
748-
CODE_SIGN_STYLE = Manual;
749-
DEVELOPMENT_TEAM = "";
780+
CODE_SIGN_STYLE = Automatic;
781+
DEVELOPMENT_TEAM = X5L4X5ZF45;
750782
FRAMEWORK_SEARCH_PATHS = (
751783
"$(inherited)",
752784
"$(PROJECT_DIR)",
753785
);
754786
INFOPLIST_FILE = dummyTestApp/Info.plist;
755787
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
756788
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
757-
PRODUCT_BUNDLE_IDENTIFIER = hu.irl.dummyTestApp;
789+
PRODUCT_BUNDLE_IDENTIFIER = hu.irl.dummyTestAppa;
758790
PRODUCT_NAME = "$(TARGET_NAME)";
759791
PROVISIONING_PROFILE_SPECIFIER = "";
760792
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -879,7 +911,9 @@
879911
isa = XCBuildConfiguration;
880912
buildSettings = {
881913
CLANG_ENABLE_MODULES = YES;
882-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
914+
CODE_SIGN_IDENTITY = "iPhone Developer";
915+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
916+
CODE_SIGN_STYLE = Manual;
883917
DEFINES_MODULE = YES;
884918
DEVELOPMENT_TEAM = "";
885919
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -890,6 +924,7 @@
890924
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
891925
PRODUCT_BUNDLE_IDENTIFIER = hu.irl.SwCrypt;
892926
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
927+
PROVISIONING_PROFILE_SPECIFIER = "";
893928
SKIP_INSTALL = YES;
894929
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
895930
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
@@ -901,7 +936,9 @@
901936
isa = XCBuildConfiguration;
902937
buildSettings = {
903938
CLANG_ENABLE_MODULES = YES;
904-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
939+
CODE_SIGN_IDENTITY = "iPhone Developer";
940+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
941+
CODE_SIGN_STYLE = Manual;
905942
DEFINES_MODULE = YES;
906943
DEVELOPMENT_TEAM = "";
907944
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -912,6 +949,7 @@
912949
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
913950
PRODUCT_BUNDLE_IDENTIFIER = hu.irl.SwCrypt;
914951
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
952+
PROVISIONING_PROFILE_SPECIFIER = "";
915953
SKIP_INSTALL = YES;
916954
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
917955
SWIFT_VERSION = 4.2;
@@ -922,9 +960,10 @@
922960
isa = XCBuildConfiguration;
923961
buildSettings = {
924962
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
963+
CODE_SIGN_IDENTITY = "iPhone Developer";
925964
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
926-
CODE_SIGN_STYLE = Automatic;
927-
DEVELOPMENT_TEAM = "";
965+
CODE_SIGN_STYLE = Manual;
966+
DEVELOPMENT_TEAM = X5L4X5ZF45;
928967
INFOPLIST_FILE = SwCryptTests/Info.plist;
929968
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
930969
PRODUCT_BUNDLE_IDENTIFIER = hu.irl.SwCryptTests;
@@ -940,8 +979,9 @@
940979
isa = XCBuildConfiguration;
941980
buildSettings = {
942981
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
982+
CODE_SIGN_IDENTITY = "iPhone Developer";
943983
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
944-
CODE_SIGN_STYLE = Automatic;
984+
CODE_SIGN_STYLE = Manual;
945985
DEVELOPMENT_TEAM = "";
946986
INFOPLIST_FILE = SwCryptTests/Info.plist;
947987
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

‎dummyTestApp/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
"idiom" : "ipad",
8585
"size" : "83.5x83.5",
8686
"scale" : "2x"
87+
},
88+
{
89+
"idiom" : "ios-marketing",
90+
"size" : "1024x1024",
91+
"scale" : "1x"
8792
}
8893
],
8994
"info" : {

‎dummyTestApp/dummyTestApp.entitlements

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dict>
55
<key>keychain-access-groups</key>
66
<array>
7-
<string>$(AppIdentifierPrefix)hu.irl.dummyTestApp</string>
7+
<string>$(AppIdentifierPrefix)hu.irl.dummyTestAppa</string>
88
</array>
99
</dict>
1010
</plist>

0 commit comments

Comments
 (0)