Skip to content

Commit afb165c

Browse files
nan-linan-li
authored
Merge pull request #1349 from OneSignal/5.0.0/unit_tests_merge_now_builds
Build unit tests based on `main` branch (user model)
2 parents 4253e09 + f7233b4 commit afb165c

35 files changed

+15441
-15349
lines changed

‎iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,14 @@
9999
3C9AD6CF2B228B7800BC1540 /* OSRequestAddAliases.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C9AD6CE2B228B7800BC1540 /* OSRequestAddAliases.swift */; };
100100
3C9AD6D12B228B9200BC1540 /* OSRequestRemoveAlias.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C9AD6D02B228B9200BC1540 /* OSRequestRemoveAlias.swift */; };
101101
3C9AD6D32B228BB000BC1540 /* OSRequestUpdateProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C9AD6D22B228BB000BC1540 /* OSRequestUpdateProperties.swift */; };
102+
3C9AD6D42B22A8C300BC1540 /* OneSignalLiveActivityController.m in Sources */ = {isa = PBXBuildFile; fileRef = 944F7ECE296F890900AEBA54 /* OneSignalLiveActivityController.m */; };
103+
3C9AD6D52B22A8C400BC1540 /* OneSignalLiveActivityController.m in Sources */ = {isa = PBXBuildFile; fileRef = 944F7ECE296F890900AEBA54 /* OneSignalLiveActivityController.m */; };
104+
3C9AD6D62B22A8DF00BC1540 /* OneSignalLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAADF92A420A3700BF2C1C /* OneSignalLocation.framework */; };
105+
3C9AD6D72B22A8DF00BC1540 /* OneSignalLocation.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAADF92A420A3700BF2C1C /* OneSignalLocation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
106+
3C9AD6DB2B22A8E600BC1540 /* OneSignalInAppMessages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; };
107+
3C9AD6DC2B22A8E600BC1540 /* OneSignalInAppMessages.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
108+
3C9AD6DF2B22A8EC00BC1540 /* OneSignalNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEF784292912DEB600A1F3A5 /* OneSignalNotifications.framework */; };
109+
3C9AD6E02B22A8EC00BC1540 /* OneSignalNotifications.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEF784292912DEB600A1F3A5 /* OneSignalNotifications.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
102110
3CA6CE0A28E4F19B00CA0585 /* OSUserRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CA6CE0928E4F19B00CA0585 /* OSUserRequest.swift */; };
103111
3CC9A6342AFA1FDE008F68FD /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3CC9A6332AFA1FDD008F68FD /* PrivacyInfo.xcprivacy */; };
104112
3CC9A6362AFA26E7008F68FD /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3CC9A6352AFA26E7008F68FD /* PrivacyInfo.xcprivacy */; };
@@ -501,6 +509,27 @@
501509
remoteGlobalIDString = 3C115160289A259500565C41;
502510
remoteInfo = OneSignalOSCore;
503511
};
512+
3C9AD6D82B22A8DF00BC1540 /* PBXContainerItemProxy */ = {
513+
isa = PBXContainerItemProxy;
514+
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
515+
proxyType = 1;
516+
remoteGlobalIDString = DEBAADF82A420A3700BF2C1C;
517+
remoteInfo = OneSignalLocation;
518+
};
519+
3C9AD6DD2B22A8E600BC1540 /* PBXContainerItemProxy */ = {
520+
isa = PBXContainerItemProxy;
521+
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
522+
proxyType = 1;
523+
remoteGlobalIDString = DEBAAE272A4211D900BF2C1C;
524+
remoteInfo = OneSignalInAppMessages;
525+
};
526+
3C9AD6E12B22A8ED00BC1540 /* PBXContainerItemProxy */ = {
527+
isa = PBXContainerItemProxy;
528+
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
529+
proxyType = 1;
530+
remoteGlobalIDString = DEF784282912DEB600A1F3A5;
531+
remoteInfo = OneSignalNotifications;
532+
};
504533
DE12F3F4289B28C4002F63AA /* PBXContainerItemProxy */ = {
505534
isa = PBXContainerItemProxy;
506535
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
@@ -696,6 +725,19 @@
696725
);
697726
runOnlyForDeploymentPostprocessing = 0;
698727
};
728+
3C9AD6DA2B22A8DF00BC1540 /* Embed Frameworks */ = {
729+
isa = PBXCopyFilesBuildPhase;
730+
buildActionMask = 2147483647;
731+
dstPath = "";
732+
dstSubfolderSpec = 10;
733+
files = (
734+
3C9AD6E02B22A8EC00BC1540 /* OneSignalNotifications.framework in Embed Frameworks */,
735+
3C9AD6DC2B22A8E600BC1540 /* OneSignalInAppMessages.framework in Embed Frameworks */,
736+
3C9AD6D72B22A8DF00BC1540 /* OneSignalLocation.framework in Embed Frameworks */,
737+
);
738+
name = "Embed Frameworks";
739+
runOnlyForDeploymentPostprocessing = 0;
740+
};
699741
DEA4B45E2888C1D000E9FE12 /* Embed Frameworks */ = {
700742
isa = PBXCopyFilesBuildPhase;
701743
buildActionMask = 2147483647;
@@ -1172,9 +1214,12 @@
11721214
DEA4B4642888C4E200E9FE12 /* OneSignalOutcomes.framework in Frameworks */,
11731215
DEA4B45A2888BFAB00E9FE12 /* OneSignalCore.framework in Frameworks */,
11741216
9D348537233C669E00EB81C9 /* CoreLocation.framework in Frameworks */,
1217+
3C9AD6DF2B22A8EC00BC1540 /* OneSignalNotifications.framework in Frameworks */,
11751218
9D3300FA23149DAE000F0A83 /* CoreGraphics.framework in Frameworks */,
11761219
CACBAAAC218A662B000ACAA5 /* WebKit.framework in Frameworks */,
1220+
3C9AD6D62B22A8DF00BC1540 /* OneSignalLocation.framework in Frameworks */,
11771221
911E2CC81E399834003112A4 /* UserNotifications.framework in Frameworks */,
1222+
3C9AD6DB2B22A8E600BC1540 /* OneSignalInAppMessages.framework in Frameworks */,
11781223
911E2CC61E398B97003112A4 /* UIKit.framework in Frameworks */,
11791224
911E2CC51E398B53003112A4 /* SystemConfiguration.framework in Frameworks */,
11801225
);
@@ -2391,11 +2436,15 @@
23912436
911E2CB61E398AB3003112A4 /* Sources */,
23922437
911E2CB71E398AB3003112A4 /* Frameworks */,
23932438
911E2CB81E398AB3003112A4 /* Resources */,
2439+
3C9AD6DA2B22A8DF00BC1540 /* Embed Frameworks */,
23942440
);
23952441
buildRules = (
23962442
);
23972443
dependencies = (
23982444
DEF5CD12253932260003E9CC /* PBXTargetDependency */,
2445+
3C9AD6D92B22A8DF00BC1540 /* PBXTargetDependency */,
2446+
3C9AD6DE2B22A8E600BC1540 /* PBXTargetDependency */,
2447+
3C9AD6E22B22A8ED00BC1540 /* PBXTargetDependency */,
23992448
);
24002449
name = UnitTests;
24012450
productName = UnitTests;
@@ -2832,6 +2881,7 @@
28322881
DE16C14424D3724700670EFA /* OneSignalLifecycleObserver.m in Sources */,
28332882
9124123E1E73342200E41FD7 /* UIApplicationDelegate+OneSignal.m in Sources */,
28342883
CAB4112920852E48005A70D1 /* DelayedConsentInitializationParameters.m in Sources */,
2884+
3C9AD6D42B22A8C300BC1540 /* OneSignalLiveActivityController.m in Sources */,
28352885
CA1A6E7020DC2E73001C41B9 /* OneSignalDialogRequest.m in Sources */,
28362886
912412321E73342200E41FD7 /* OneSignalTracker.m in Sources */,
28372887
7AFE856B2368DDB80091D6A5 /* OSFocusCallParams.m in Sources */,
@@ -2948,6 +2998,7 @@
29482998
912412401E73342200E41FD7 /* UIApplicationDelegate+OneSignal.m in Sources */,
29492999
CACBAAAA218A65AE000ACAA5 /* InAppMessagingTests.m in Sources */,
29503000
4529DEE71FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.m in Sources */,
3001+
3C9AD6D52B22A8C400BC1540 /* OneSignalLiveActivityController.m in Sources */,
29513002
3C2C7DC6288E00AA0020F9AE /* UserModelObjcTests.m in Sources */,
29523003
4529DEDB1FA8284E00CEAB1D /* NSDataOverrider.m in Sources */,
29533004
A662399326850DDE00D52FD8 /* LanguageTest.m in Sources */,
@@ -3161,6 +3212,21 @@
31613212
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
31623213
targetProxy = 3C115199289AF86C00565C41 /* PBXContainerItemProxy */;
31633214
};
3215+
3C9AD6D92B22A8DF00BC1540 /* PBXTargetDependency */ = {
3216+
isa = PBXTargetDependency;
3217+
target = DEBAADF82A420A3700BF2C1C /* OneSignalLocation */;
3218+
targetProxy = 3C9AD6D82B22A8DF00BC1540 /* PBXContainerItemProxy */;
3219+
};
3220+
3C9AD6DE2B22A8E600BC1540 /* PBXTargetDependency */ = {
3221+
isa = PBXTargetDependency;
3222+
target = DEBAAE272A4211D900BF2C1C /* OneSignalInAppMessages */;
3223+
targetProxy = 3C9AD6DD2B22A8E600BC1540 /* PBXContainerItemProxy */;
3224+
};
3225+
3C9AD6E22B22A8ED00BC1540 /* PBXTargetDependency */ = {
3226+
isa = PBXTargetDependency;
3227+
target = DEF784282912DEB600A1F3A5 /* OneSignalNotifications */;
3228+
targetProxy = 3C9AD6E12B22A8ED00BC1540 /* PBXContainerItemProxy */;
3229+
};
31643230
DE12F3F5289B28C4002F63AA /* PBXTargetDependency */ = {
31653231
isa = PBXTargetDependency;
31663232
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
@@ -5098,13 +5164,25 @@
50985164
buildSettings = {
50995165
APPLICATION_EXTENSION_API_ONLY = YES;
51005166
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
5167+
CLANG_ENABLE_MODULES = YES;
5168+
COPY_PHASE_STRIP = NO;
5169+
DEFINES_MODULE = YES;
5170+
DEVELOPMENT_TEAM = 99SW8E36CT;
5171+
DYLIB_COMPATIBILITY_VERSION = 1;
5172+
DYLIB_CURRENT_VERSION = 1;
5173+
DYLIB_INSTALL_NAME_BASE = "@rpath";
51015174
ENABLE_TESTABILITY = YES;
5175+
GENERATE_INFOPLIST_FILE = YES;
51025176
INFOPLIST_FILE = OneSignalOSCoreFramework/Info.plist;
51035177
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
5178+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
51045179
OTHER_CFLAGS = "";
51055180
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.OneSignalOSCore;
51065181
PRODUCT_NAME = OneSignalOSCore;
5182+
SKIP_INSTALL = YES;
5183+
SWIFT_EMIT_LOC_STRINGS = YES;
51075184
SWIFT_VERSION = 5.0;
5185+
TARGETED_DEVICE_FAMILY = "1,2";
51085186
};
51095187
name = Test;
51105188
};

0 commit comments

Comments
 (0)