Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for advertising identifier and adId consent collection #55

Merged
merged 66 commits into from
Jun 2, 2022
Merged
Show file tree
Hide file tree
Changes from 65 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
1ea5966
WIP merge with current dev branch
timkimadobe Jan 24, 2022
efef862
update enum usage to reflect updated naming scheme
timkimadobe Jan 25, 2022
a2ee5f5
migrate tests from old feature branch, add new files to test targets
timkimadobe Jan 26, 2022
0006471
Update TestableExtensionRuntime to include new method required by Ext…
timkimadobe Jan 26, 2022
dfdcc16
Migrate remaining test cases from original adID feature branch, and u…
timkimadobe Jan 27, 2022
d8a3c42
Migrate IdentityTest cases
timkimadobe Jan 27, 2022
7d06d83
Merge pull request #1 from adobe/feature-merge-advertising-id
timkimadobe Jan 27, 2022
2b979e9
Remove commented code and extra spaces
timkimadobe Jan 27, 2022
1bd7efc
Update build script for SwiftLint to use PODS_ROOT path to check for …
timkimadobe Jan 28, 2022
07a1632
Update test cases to handle existing AdID and no AdID with new AdID e…
timkimadobe Jan 28, 2022
65d47ad
Add isAdIdEvent to Event+Identity extension and build in check to adI…
timkimadobe Feb 4, 2022
835a594
Update Event+Identity extension with rationale for String type check …
timkimadobe Feb 4, 2022
d73748f
Update test case to improve readability and preserve event order veri…
timkimadobe Feb 5, 2022
2864ec8
Remove outdated test for nil adID using direct state.updateAdvertisin…
timkimadobe Feb 5, 2022
9cd040b
Removing public access status for Event+Identity extension property
timkimadobe Feb 7, 2022
77393dc
Update naming conventions for test cases
timkimadobe Feb 8, 2022
8e7dda0
Simplify logical flow for detecting ad ID change
timkimadobe Feb 8, 2022
8d6854c
Remove outdated test case with all-zeros start
timkimadobe Feb 8, 2022
a34f6ae
Move consent event dispatch to before resetting ECID; should send con…
timkimadobe Feb 8, 2022
9fb04f0
Update adId type in Event extension to non-optional String
timkimadobe Feb 9, 2022
1c5ea28
Remove nil coalescing operator for adId after its update to non-optio…
timkimadobe Feb 9, 2022
43c7f0d
Remove consent event dispatch from resetIdentifiers flow; the flows s…
timkimadobe Feb 10, 2022
a164026
Remove consent event check from resetIdentity test; consent is not lo…
timkimadobe Feb 10, 2022
f2d1821
Update test comments and remove commented case
timkimadobe Feb 10, 2022
8c8ffb1
Migrating adID feature branch to current dev branch (#52)
timkimadobe Feb 10, 2022
b33c132
Merge branch 'adobe:feature/adIdConsent' into feature/adIdConsent
timkimadobe Feb 10, 2022
e471ed4
Update IdentityAdIDTests with helper functions to reduce boilerplate
timkimadobe Feb 11, 2022
a42e86b
Update test app to use real IDFA flow to update consent and ad ID
timkimadobe Feb 16, 2022
ca93d89
Removing launch file ID
timkimadobe Feb 16, 2022
c5f7062
Update consent to be for ad ID consent instead of "collect"
timkimadobe Mar 4, 2022
1767cee
Add AppTrackingTransparency.framework to build phases for Swift TestA…
timkimadobe Mar 4, 2022
0ffcde8
Remove manual consent update flow as it is handled by the ad ID event…
timkimadobe Mar 4, 2022
d2a7743
Update to align with swiftlint
timkimadobe Mar 4, 2022
d7c8f3c
Update test helper access level and logic
timkimadobe Mar 7, 2022
d4ba29c
Add test cases to cover ad ID event extension
timkimadobe Mar 7, 2022
93e29e3
Add test coverage cases
timkimadobe Mar 8, 2022
e1d6192
Merge pull request #54 from timkimadobe/feature/adIdConsent
timkimadobe Mar 8, 2022
ff3b664
Add log for modifying identifiers in protected ad ID namespaces (IDFA…
timkimadobe Mar 11, 2022
0892ed9
Merge branch 'adobe:feature/adIdConsent' into feature/adIdConsent
timkimadobe Mar 11, 2022
819254a
Update log for ad ID API violation to warning level; update string to…
timkimadobe Mar 14, 2022
ab5890d
Update quote type to be regular single quote
timkimadobe Mar 14, 2022
ba229ee
Update log message string construction so final log is on single line
timkimadobe Mar 14, 2022
80f8bea
Update log string to be more concise
timkimadobe Mar 14, 2022
9634424
Merge pull request #56 from timkimadobe/feature/adIdConsent
timkimadobe Mar 14, 2022
77489be
Merge branch 'dev' into feature/adIdConsent
emdobrin May 9, 2022
61c84c8
Resolve merge conflicts
emdobrin May 9, 2022
1e14fe7
Merge pull request #66 from emdobrin/feature/adIdConsent
emdobrin May 11, 2022
b7a7939
Updated test dependencies (#67)
emdobrin May 12, 2022
fe0ba26
Update ad ID view to use ad ID utils and better align with sample app…
timkimadobe May 19, 2022
696b0d7
Update requestTrackingAuthorization function to be pure request track…
timkimadobe May 19, 2022
8d0c556
Merge branch 'feature/adIdConsent' into feature/ad-id-consent
timkimadobe May 19, 2022
6e26763
Remove get ad ID in request flow; use get ad ID flow instead to fetch…
timkimadobe May 19, 2022
7501681
Update documentation wording to defer to apple docs
timkimadobe May 19, 2022
98ba529
Update documentation to reflect iOS version verbiage
timkimadobe May 19, 2022
a6d77f6
Updating podfile.lock to use staging
timkimadobe May 20, 2022
ed0731d
Update logical flow for setting ad ID to check for tracking authoriza…
timkimadobe May 20, 2022
93968fc
Update ad ID consent to align with sample app implementation (#69)
timkimadobe May 20, 2022
e52d874
Update Swift test app to use app + scene delegate initialization for …
timkimadobe May 23, 2022
007ade7
Merge branch 'feature/adIdConsent' into feature/ad-id-consent
timkimadobe May 23, 2022
c2cad4f
Update test app to include storyboard which is required to use full s…
timkimadobe May 23, 2022
5145e01
Remove TestApp App SwiftUI initialization file (replaced with app + s…
timkimadobe May 23, 2022
2a2d323
Update UIWindowScene cast to guard statement
timkimadobe May 23, 2022
aedef05
Update modifier positions for consistency, remove unnecessary whitespace
timkimadobe May 23, 2022
1e9c5a2
Merge pull request #70 from timkimadobe/feature/ad-id-consent
timkimadobe May 24, 2022
9247e6e
Select test scheme from xcodeproj (#71)
emdobrin Jun 1, 2022
7f6820e
Merge branch 'dev' into feature/adIdConsent
emdobrin Jun 2, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

build-and-test:
macos:
xcode: 11.6.0 # Specify the Xcode version to use
xcode: 12.0.1 # Specify the Xcode version to use

steps:
- checkout
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
# pre-start the simulator to prevent timeouts
- run:
name: Pre-start Simulator
command: xcrun instruments -w "iPhone 8 (13.6) [" || true
command: xcrun instruments -w "iPhone 8 (13.5) [" || true

- run:
name: Run Tests
Expand Down
40 changes: 33 additions & 7 deletions AEPEdgeIdentity.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@
/* Begin PBXBuildFile section */
004DF6198BD3329E598B8FAB /* Pods_TestApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE39896A5E0D0C2B397EDD3 /* Pods_TestApp.framework */; };
43E2977FF5B6CE67BFA18068 /* Pods_FunctionalTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF5FC2982E587DB999C37858 /* Pods_FunctionalTests.framework */; };
4C4B7D8C27A0CA2F00C0CE25 /* IdentityAdIDTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C4B7D8B27A0CA2F00C0CE25 /* IdentityAdIDTests.swift */; };
4C4B7D8E27A0CAC900C0CE25 /* Event+Identity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C4B7D8D27A0CAC900C0CE25 /* Event+Identity.swift */; };
4C4B7D9027A0CAC900C0CE25 /* Event+Identity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C4B7D8D27A0CAC900C0CE25 /* Event+Identity.swift */; };
4C4B7D9127A1114600C0CE25 /* IdentityConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = D43BAB7125BBAFC700B08CC0 /* IdentityConstants.swift */; };
4C4B7D9227A111A500C0CE25 /* IdentityConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = D43BAB7125BBAFC700B08CC0 /* IdentityConstants.swift */; };
4C820A882836F19C00609575 /* AdIdUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C820A872836F19C00609575 /* AdIdUtils.swift */; };
4CAD0F79283C155E00490A1F /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD0F78283C155E00490A1F /* SceneDelegate.swift */; };
4CAD0F7B283C302400490A1F /* TestApp.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4CAD0F7A283C302400490A1F /* TestApp.storyboard */; };
4CC3D10727D2CFD70055ACC6 /* AppTrackingTransparency.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CC3D10627D2CFD70055ACC6 /* AppTrackingTransparency.framework */; };
969BD00DE9BC2B23CA13749C /* Pods_UnitTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8DD25A1697FC0CB5815F427 /* Pods_UnitTests.framework */; };
B6F27EC02609146800C50A04 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F27EBF2609146800C50A04 /* AppDelegate.m */; };
B6F27EC32609146800C50A04 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F27EC22609146800C50A04 /* SceneDelegate.m */; };
Expand All @@ -36,7 +45,6 @@
BFF6492725BFD3160012A4C5 /* Identity+PublicAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF6492625BFD3160012A4C5 /* Identity+PublicAPI.swift */; };
BFF6492D25C087720012A4C5 /* IdentityState.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF6492C25C087720012A4C5 /* IdentityState.swift */; };
BFF6493E25C097560012A4C5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF6493D25C097560012A4C5 /* AppDelegate.swift */; };
BFF6495625C09B2D0012A4C5 /* TestApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF6495525C09B2D0012A4C5 /* TestApp.swift */; };
BFF6497A25C09ED80012A4C5 /* IdentityPublicAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF6497925C09ED80012A4C5 /* IdentityPublicAPITests.swift */; };
BFF6498F25C0AC0F0012A4C5 /* ECIDTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF6498E25C0AC0F0012A4C5 /* ECIDTests.swift */; };
BFF6499B25C0ACC00012A4C5 /* IdentityPropertiesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF6499A25C0ACC00012A4C5 /* IdentityPropertiesTests.swift */; };
Expand Down Expand Up @@ -106,6 +114,12 @@
21194EEA9E974D4025B62CB7 /* Pods-FunctionalTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FunctionalTests.release.xcconfig"; path = "Target Support Files/Pods-FunctionalTests/Pods-FunctionalTests.release.xcconfig"; sourceTree = "<group>"; };
211C042081BAB03AF0C00D2D /* Pods_TestAppObjC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TestAppObjC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4ADECD91E29628B33C7D45F5 /* Pods-UnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UnitTests.release.xcconfig"; path = "Target Support Files/Pods-UnitTests/Pods-UnitTests.release.xcconfig"; sourceTree = "<group>"; };
4C4B7D8B27A0CA2F00C0CE25 /* IdentityAdIDTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IdentityAdIDTests.swift; sourceTree = "<group>"; };
4C4B7D8D27A0CAC900C0CE25 /* Event+Identity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Event+Identity.swift"; sourceTree = "<group>"; };
4C820A872836F19C00609575 /* AdIdUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdIdUtils.swift; sourceTree = "<group>"; };
4CAD0F78283C155E00490A1F /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
4CAD0F7A283C302400490A1F /* TestApp.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = TestApp.storyboard; sourceTree = "<group>"; };
4CC3D10627D2CFD70055ACC6 /* AppTrackingTransparency.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppTrackingTransparency.framework; path = System/Library/Frameworks/AppTrackingTransparency.framework; sourceTree = SDKROOT; };
4EC5B471416D7ABA4A62D49C /* Pods-AEPIdentityEdge.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AEPIdentityEdge.release.xcconfig"; path = "Target Support Files/Pods-AEPIdentityEdge/Pods-AEPIdentityEdge.release.xcconfig"; sourceTree = "<group>"; };
56FF745F8E6F9C0458C1ECA3 /* Pods-AEPIdentityEdgeSampleApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AEPIdentityEdgeSampleApp.debug.xcconfig"; path = "Target Support Files/Pods-AEPIdentityEdgeSampleApp/Pods-AEPIdentityEdgeSampleApp.debug.xcconfig"; sourceTree = "<group>"; };
65142CB35FAC27B4E14836AC /* Pods-TestApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TestApp.release.xcconfig"; path = "Target Support Files/Pods-TestApp/Pods-TestApp.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -136,7 +150,6 @@
BFF6492625BFD3160012A4C5 /* Identity+PublicAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Identity+PublicAPI.swift"; sourceTree = "<group>"; };
BFF6492C25C087720012A4C5 /* IdentityState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityState.swift; sourceTree = "<group>"; };
BFF6493D25C097560012A4C5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
BFF6495525C09B2D0012A4C5 /* TestApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestApp.swift; sourceTree = "<group>"; };
BFF6497925C09ED80012A4C5 /* IdentityPublicAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityPublicAPITests.swift; sourceTree = "<group>"; };
BFF6498E25C0AC0F0012A4C5 /* ECIDTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ECIDTests.swift; sourceTree = "<group>"; };
BFF6499A25C0ACC00012A4C5 /* IdentityPropertiesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityPropertiesTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -210,6 +223,7 @@
buildActionMask = 2147483647;
files = (
004DF6198BD3329E598B8FAB /* Pods_TestApp.framework in Frameworks */,
4CC3D10727D2CFD70055ACC6 /* AppTrackingTransparency.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -219,6 +233,7 @@
0B5B2ACABDDBE64CBBCE2D00 /* Frameworks */ = {
isa = PBXGroup;
children = (
4CC3D10627D2CFD70055ACC6 /* AppTrackingTransparency.framework */,
AF5FC2982E587DB999C37858 /* Pods_FunctionalTests.framework */,
B8DD25A1697FC0CB5815F427 /* Pods_UnitTests.framework */,
FC6D2266840DFF6DD80E5243 /* Pods_AEPEdgeIdentity.framework */,
Expand Down Expand Up @@ -325,6 +340,7 @@
BFF6491A25BFD1990012A4C5 /* ECID.swift */,
D43BAB6925BBAF6000B08CC0 /* Identity.swift */,
D43BAB7125BBAFC700B08CC0 /* IdentityConstants.swift */,
4C4B7D8D27A0CAC900C0CE25 /* Event+Identity.swift */,
BFF6492025BFD1CB0012A4C5 /* IdentityProperties.swift */,
BFF6492C25C087720012A4C5 /* IdentityState.swift */,
D43BAB1425BBA4F700B08CC0 /* Info.plist */,
Expand All @@ -350,6 +366,7 @@
D43BAB3725BBA8C700B08CC0 /* FunctionalTests */ = {
isa = PBXGroup;
children = (
4C4B7D8B27A0CA2F00C0CE25 /* IdentityAdIDTests.swift */,
BFF64A5A25C4C5410012A4C5 /* EdgeIdentity+IdentityDirectTests.swift */,
D43BAB3A25BBA8C700B08CC0 /* Info.plist */,
BFF64A6925C4C6A90012A4C5 /* TestHelpers.swift */,
Expand All @@ -361,8 +378,10 @@
D43BABA825BBC4BA00B08CC0 /* TestApp */ = {
isa = PBXGroup;
children = (
BFF6495525C09B2D0012A4C5 /* TestApp.swift */,
BFF6493D25C097560012A4C5 /* AppDelegate.swift */,
4CAD0F7A283C302400490A1F /* TestApp.storyboard */,
4CAD0F78283C155E00490A1F /* SceneDelegate.swift */,
4C820A872836F19C00609575 /* AdIdUtils.swift */,
D43BABAD25BBC4BB00B08CC0 /* Assets.xcassets */,
D43BABAB25BBC4BA00B08CC0 /* ContentView.swift */,
D43BABB225BBC4BB00B08CC0 /* Info.plist */,
Expand Down Expand Up @@ -587,6 +606,7 @@
buildActionMask = 2147483647;
files = (
D43BABB125BBC4BB00B08CC0 /* Preview Assets.xcassets in Resources */,
4CAD0F7B283C302400490A1F /* TestApp.storyboard in Resources */,
D43BABAE25BBC4BB00B08CC0 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -765,7 +785,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\n ./Pods/SwiftLint/swiftlint lint --config ${SRCROOT}/.swiftlint.yml Sources\nelse\n echo \"warning: SwiftLint is not installed, please run the pod install command from the project root directory.\"\nfi\n";
shellScript = "if which ${PODS_ROOT}/SwiftLint/swiftlint >/dev/null; then\n ${PODS_ROOT}/SwiftLint/swiftlint lint --config ${SRCROOT}/.swiftlint.yml Sources\nelse\n echo \"warning: SwiftLint is not installed, please run the pod install command from the project root directory.\"\nfi\n";
};
D43BAC2125BF4A3A00B08CC0 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -864,6 +884,7 @@
BFF6491B25BFD1990012A4C5 /* ECID.swift in Sources */,
BFF6492125BFD1CB0012A4C5 /* IdentityProperties.swift in Sources */,
D43BAB6A25BBAF6100B08CC0 /* Identity.swift in Sources */,
4C4B7D8E27A0CAC900C0CE25 /* Event+Identity.swift in Sources */,
BFF649AD25C0EFE10012A4C5 /* IdentityMap.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -872,6 +893,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4C4B7D9227A111A500C0CE25 /* IdentityConstants.swift in Sources */,
BFF6497A25C09ED80012A4C5 /* IdentityPublicAPITests.swift in Sources */,
BFF64AED25C8A9B40012A4C5 /* MockDataStore.swift in Sources */,
BFF64AE925C8A9B40012A4C5 /* TestableExtensionRuntime.swift in Sources */,
Expand All @@ -888,7 +910,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4C4B7D9127A1114600C0CE25 /* IdentityConstants.swift in Sources */,
BFF64A6025C4C63F0012A4C5 /* EdgeIdentity+IdentityDirectTests.swift in Sources */,
4C4B7D9027A0CAC900C0CE25 /* Event+Identity.swift in Sources */,
4C4B7D8C27A0CA2F00C0CE25 /* IdentityAdIDTests.swift in Sources */,
BFF64AEE25C8A9B40012A4C5 /* MockDataStore.swift in Sources */,
BFF64AEA25C8A9B40012A4C5 /* TestableExtensionRuntime.swift in Sources */,
BFF64A6A25C4C6A90012A4C5 /* TestHelpers.swift in Sources */,
Expand All @@ -900,9 +925,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4CAD0F79283C155E00490A1F /* SceneDelegate.swift in Sources */,
BFF6493E25C097560012A4C5 /* AppDelegate.swift in Sources */,
4C820A882836F19C00609575 /* AdIdUtils.swift in Sources */,
D43BABAC25BBC4BA00B08CC0 /* ContentView.swift in Sources */,
BFF6495625C09B2D0012A4C5 /* TestApp.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1268,7 +1294,7 @@
DEVELOPMENT_TEAM = FKGEE875K4;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = SampleApps/TestApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1291,7 +1317,7 @@
DEVELOPMENT_TEAM = FKGEE875K4;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = SampleApps/TestApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
13 changes: 12 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,18 @@ test:
@echo "######################################################################"
@echo "### Testing iOS"
@echo "######################################################################"
xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme $(PROJECT_NAME) -destination 'platform=iOS Simulator,name=iPhone 8' -derivedDataPath build/out -enableCodeCoverage YES
@echo "List of available shared Schemes in xcworkspace"
xcodebuild -workspace $(PROJECT_NAME).xcworkspace -list
final_scheme=""; \
if xcodebuild -workspace $(PROJECT_NAME).xcworkspace -list | grep -q "($(PROJECT_NAME) project)"; \
then \
final_scheme="$(EXTENSION_NAME) ($(PROJECT_NAME) project)" ; \
echo $$final_scheme ; \
else \
final_scheme="$(EXTENSION_NAME)" ; \
echo $$final_scheme ; \
fi; \
xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme "$$final_scheme" -destination 'platform=iOS Simulator,name=iPhone 8' -derivedDataPath build/out -enableCodeCoverage YES

install-githook:
./tools/git-hooks/setup.sh
Expand Down
2 changes: 2 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ target 'TestApp' do
pod 'AEPLifecycle'
pod 'AEPSignal'
pod 'AEPAssurance'
pod 'AEPEdge', :git => 'https://github.com/adobe/aepsdk-edge-ios.git', :branch => 'staging'
pod 'AEPEdgeConsent', '1.0.0'
end

target 'TestAppObjC' do
Expand Down
56 changes: 40 additions & 16 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,31 @@ PODS:
- AEPAssurance (3.0.1):
- AEPCore (>= 3.1.0)
- AEPServices (>= 3.1.0)
- AEPCore (3.4.2):
- AEPCore (3.6.0):
- AEPRulesEngine (>= 1.1.0)
- AEPServices (>= 3.4.2)
- AEPIdentity (3.4.2):
- AEPCore (>= 3.4.2)
- AEPLifecycle (3.4.2):
- AEPCore (>= 3.4.2)
- AEPServices (>= 3.6.0)
- AEPEdge (1.4.1):
- AEPCore (>= 3.5.0)
- AEPEdgeIdentity
- AEPEdgeConsent (1.0.0):
- AEPCore (>= 3.1.0)
- AEPEdgeIdentity (1.0.1):
- AEPCore (>= 3.1.1)
- AEPIdentity (3.6.0):
- AEPCore (>= 3.6.0)
- AEPLifecycle (3.6.0):
- AEPCore (>= 3.6.0)
- AEPRulesEngine (1.1.0)
- AEPServices (3.4.2)
- AEPSignal (3.4.2):
- AEPCore (>= 3.4.2)
- AEPServices (3.6.0)
- AEPSignal (3.6.0):
- AEPCore (>= 3.6.0)
- SwiftLint (0.44.0)

DEPENDENCIES:
- AEPAssurance
- AEPCore
- AEPEdge (from `https://github.com/adobe/aepsdk-edge-ios.git`, branch `staging`)
- AEPEdgeConsent (= 1.0.0)
- AEPIdentity
- AEPLifecycle
- AEPServices
Expand All @@ -28,23 +37,38 @@ SPEC REPOS:
trunk:
- AEPAssurance
- AEPCore
- AEPEdgeConsent
- AEPEdgeIdentity
- AEPIdentity
- AEPLifecycle
- AEPRulesEngine
- AEPServices
- AEPSignal
- SwiftLint

EXTERNAL SOURCES:
AEPEdge:
:branch: staging
:git: https://github.com/adobe/aepsdk-edge-ios.git

CHECKOUT OPTIONS:
AEPEdge:
:commit: 8fcf1bcd7cd484bd2395f810332cbae3c2c19857
:git: https://github.com/adobe/aepsdk-edge-ios.git

SPEC CHECKSUMS:
AEPAssurance: b25880cd4b14f22c61a1dce19807bd0ca0fe9b17
AEPCore: b01856bf24972e4720cb0511a358d1e68067252a
AEPIdentity: fbf755560afcbb0acd66cd5b6a1c147530fca5f6
AEPLifecycle: 1e0e843465fb143f8d8949dcf06de169d5c26f62
AEPCore: 03a89f8b792a74e17f739ab535982569d6639b76
AEPEdge: 6faf60328f9e5ae7a107fd61f9a968f46ebf2928
AEPEdgeConsent: dd46002b0c4bf55443f5441990e799248975713e
AEPEdgeIdentity: 5c42cef81835851232136a9e1fbbbe33b204ee11
AEPIdentity: bd5c639f2ddb02e2b15f909c661235ccd86bd98a
AEPLifecycle: 7c0452a650a8ccaaa2473a3625a7004e8687797e
AEPRulesEngine: bb2927ed5501ddf9754c66e97f8d2b1cf8e33b19
AEPServices: 3214311f239c8cdc6267d757200b05ec0ab05878
AEPSignal: be3a4789b492f4d5a5aef7408f30ff8e866d1d79
AEPServices: fd41aa2d0eda1e6939ae00a99f8431a57d09e1ca
AEPSignal: bbdb296030fec8239fb316576f40b230267fcf7c
SwiftLint: e96c0a8c770c7ebbc4d36c55baf9096bb65c4584

PODFILE CHECKSUM: 998b4a8b4d3c95683f7f6f806ef3f2928fc5d84d
PODFILE CHECKSUM: a0256fdea13042a532e1cb7ec8184c9086505667

COCOAPODS: 1.10.1
COCOAPODS: 1.11.3
Loading