Skip to content
New issue

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

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

Already on GitHub? # to your account

downmerge main -> dev #358

Merged
merged 7 commits into from
Jun 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Documentation/Tutorials/EdgeTutorialAppFinal/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ target 'EdgeTutorialApp' do
pod 'AEPCore'
pod 'AEPLifecycle'
pod 'AEPServices'
pod 'AEPEdge', :git => 'https://github.com/adobe/aepsdk-edge-ios.git', :branch => 'dev'
pod 'AEPEdgeConsent', :git => 'https://github.com/adobe/aepsdk-edgeconsent-ios.git', :branch => 'dev'
pod 'AEPEdgeIdentity', :git => 'https://github.com/adobe/aepsdk-edgeidentity-ios.git', :branch => 'dev'
pod 'AEPEdge'
pod 'AEPEdgeConsent'
pod 'AEPEdgeIdentity'
#=end
end
43 changes: 12 additions & 31 deletions Documentation/Tutorials/EdgeTutorialAppFinal/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- AEPAssurance (3.1.2):
- AEPCore (>= 3.9.0)
- AEPServices (>= 3.9.0)
- AEPAssurance (4.0.0):
- AEPCore (>= 4.0.0)
- AEPServices (>= 4.0.0)
- AEPCore (4.0.0):
- AEPRulesEngine (>= 4.0.0)
- AEPServices (>= 4.0.0)
Expand All @@ -21,44 +21,25 @@ PODS:
DEPENDENCIES:
- AEPAssurance
- AEPCore
- AEPEdge (from `https://github.com/adobe/aepsdk-edge-ios.git`, branch `dev`)
- AEPEdgeConsent (from `https://github.com/adobe/aepsdk-edgeconsent-ios.git`, branch `dev`)
- AEPEdgeIdentity (from `https://github.com/adobe/aepsdk-edgeidentity-ios.git`, branch `dev`)
- AEPEdge
- AEPEdgeConsent
- AEPEdgeIdentity
- AEPLifecycle
- AEPServices

SPEC REPOS:
trunk:
- AEPAssurance
- AEPCore
- AEPEdge
- AEPEdgeConsent
- AEPEdgeIdentity
- AEPLifecycle
- AEPRulesEngine
- AEPServices

EXTERNAL SOURCES:
AEPEdge:
:branch: dev
:git: https://github.com/adobe/aepsdk-edge-ios.git
AEPEdgeConsent:
:branch: dev
:git: https://github.com/adobe/aepsdk-edgeconsent-ios.git
AEPEdgeIdentity:
:branch: dev
:git: https://github.com/adobe/aepsdk-edgeidentity-ios.git

CHECKOUT OPTIONS:
AEPEdge:
:commit: 8bb2d4f80e38f9f35c97592d1ea61487156d3cb1
:git: https://github.com/adobe/aepsdk-edge-ios.git
AEPEdgeConsent:
:commit: fdd8e5987d819d670d500405223e7c65d3a4f7fa
:git: https://github.com/adobe/aepsdk-edgeconsent-ios.git
AEPEdgeIdentity:
:commit: 35eac240823eb89832449cd3152160d7edeef15a
:git: https://github.com/adobe/aepsdk-edgeidentity-ios.git

SPEC CHECKSUMS:
AEPAssurance: 694bc2bca10e15bd33542bb6ae4549abee46d85d
AEPAssurance: 4fa3138ddd7308c1f9923570f4d2b0b8526a916f
AEPCore: dd7cd69696c768c610e6adc0307032985a381c7e
AEPEdge: ffea1ada1e81c9cb239aac694efa5c8635b50c1f
AEPEdgeConsent: 54c1b6a30a3d646e3d4bc4bae1713755422b471e
Expand All @@ -67,6 +48,6 @@ SPEC CHECKSUMS:
AEPRulesEngine: 458450a34922823286ead045a0c2bd8c27e224c6
AEPServices: ca493988df250d84fda050124ff7549bcc43c65f

PODFILE CHECKSUM: b01dee6c3c1039f8d79af010c8d1b8afedc7d4f2
PODFILE CHECKSUM: f67c0ee0f4def7974389a47b8307dcf8d65d4288

COCOAPODS: 1.11.3
COCOAPODS: 1.11.2
8 changes: 4 additions & 4 deletions Documentation/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ The Adobe Experience Platform Edge Network extension has the following peer depe
5. Select the **Datastream** you would like to use per environment. Read more about [datastreams](#datastreams) below.
6. Set up the **Domain configuration** by either using the automatically populated domin, or a first party domain mapped to an Adobe-provisioned Edge Network domain. For more information, see [domain configuration](#domain-configuration) below.
7. Select **Save**.
8. Follow the [publishing process](https://aep-sdks.gitbook.io/docs/getting-started/create-a-mobile-property#publish-the-configuration) to update SDK configuration.
8. Follow the [publishing process](https://developer.adobe.com/client-sdks/documentation/getting-started/create-a-mobile-property/#publish-the-configuration) to update SDK configuration.

### Datastreams

If no datastream was previously created, see [Configure datastreams](https://aep-sdks.gitbook.io/docs/getting-started/configure-datastreams) before moving to the next step.
If no datastream was previously created, see [Configure datastreams](https://developer.adobe.com/client-sdks/documentation/getting-started/configure-datastreams/) before moving to the next step.

Select the desired datastream per each environment from the corresponding drop-down lists. If your organization uses multiple sandboxes, select the **Sandbox** first, then select the **Datastream** for each environment.

Expand Down Expand Up @@ -47,7 +47,7 @@ To add the AEPEdge Package to your application, from the Xcode menu select:

`File > Add Packages...`

> **Note**
> **Note**
> The menu options may vary depending on the version of Xcode being used.

Enter the URL for the AEPEdge package repository: `https://github.com/adobe/aepsdk-edge-ios.git`.
Expand Down Expand Up @@ -127,4 +127,4 @@ Import the Mobile Core, Edge Network, and Identity for Edge Network libraries an
[AEPMobileCore configureWithAppId: @"yourEnvironmentID"];
...
}
```
```
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ TVOS_ARCHIVE_DSYM_PATH = $(CURR_DIR)/build/tvos.xcarchive/dSYMs/

setup-tools: install-githook

setup:
pod install

clean:
rm -rf build

Expand Down
12 changes: 6 additions & 6 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@ end

target 'FunctionalTests' do
pod 'AEPCore'
pod 'AEPEdgeIdentity', :git => 'https://github.com/adobe/aepsdk-edgeidentity-ios.git', :branch => 'dev'
pod 'AEPEdgeConsent', :git => 'https://github.com/adobe/aepsdk-edgeconsent-ios.git', :branch => 'dev'
pod 'AEPEdgeIdentity'
pod 'AEPEdgeConsent'
pod 'AEPEdge', :path => './AEPEdge.podspec'
end

target 'TestAppiOS' do
pod 'AEPCore'
pod 'AEPServices'
pod 'AEPEdgeIdentity', :git => 'https://github.com/adobe/aepsdk-edgeidentity-ios.git', :branch => 'dev'
pod 'AEPEdgeConsent', :git => 'https://github.com/adobe/aepsdk-edgeconsent-ios.git', :branch => 'dev'
pod 'AEPEdgeIdentity'
pod 'AEPEdgeConsent'
pod 'AEPEdge', :path => './AEPEdge.podspec'
pod 'AEPAssurance'
end

target 'TestApptvOS' do
pod 'AEPCore'
pod 'AEPServices'
pod 'AEPEdgeIdentity', :git => 'https://github.com/adobe/aepsdk-edgeidentity-ios.git', :branch => 'dev'
pod 'AEPEdgeConsent', :git => 'https://github.com/adobe/aepsdk-edgeconsent-ios.git', :branch => 'dev'
pod 'AEPEdgeIdentity'
pod 'AEPEdgeConsent'
pod 'AEPEdge', :path => './AEPEdge.podspec'
end

Expand Down
32 changes: 10 additions & 22 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- AEPAssurance (3.1.2):
- AEPCore (>= 3.9.0)
- AEPServices (>= 3.9.0)
- AEPAssurance (4.0.0):
- AEPCore (>= 4.0.0)
- AEPServices (>= 4.0.0)
- AEPCore (4.0.0):
- AEPRulesEngine (>= 4.0.0)
- AEPServices (>= 4.0.0)
Expand All @@ -21,39 +21,27 @@ DEPENDENCIES:
- AEPAssurance
- AEPCore
- AEPEdge (from `./AEPEdge.podspec`)
- AEPEdgeConsent (from `https://github.com/adobe/aepsdk-edgeconsent-ios.git`, branch `dev`)
- AEPEdgeIdentity (from `https://github.com/adobe/aepsdk-edgeidentity-ios.git`, branch `dev`)
- AEPEdgeConsent
- AEPEdgeIdentity
- AEPServices
- SwiftLint (= 0.52.0)

SPEC REPOS:
trunk:
- AEPAssurance
- AEPCore
- AEPEdgeConsent
- AEPEdgeIdentity
- AEPRulesEngine
- AEPServices
- SwiftLint

EXTERNAL SOURCES:
AEPEdge:
:path: "./AEPEdge.podspec"
AEPEdgeConsent:
:branch: dev
:git: https://github.com/adobe/aepsdk-edgeconsent-ios.git
AEPEdgeIdentity:
:branch: dev
:git: https://github.com/adobe/aepsdk-edgeidentity-ios.git

CHECKOUT OPTIONS:
AEPEdgeConsent:
:commit: 6db83b68aa3ea18babda2ed4b45ae7d6b544df0d
:git: https://github.com/adobe/aepsdk-edgeconsent-ios.git
AEPEdgeIdentity:
:commit: 2b521c71aa504dd327576608615c772dacd11f4e
:git: https://github.com/adobe/aepsdk-edgeidentity-ios.git

SPEC CHECKSUMS:
AEPAssurance: 694bc2bca10e15bd33542bb6ae4549abee46d85d
AEPAssurance: 4fa3138ddd7308c1f9923570f4d2b0b8526a916f
AEPCore: dd7cd69696c768c610e6adc0307032985a381c7e
AEPEdge: ffea1ada1e81c9cb239aac694efa5c8635b50c1f
AEPEdgeConsent: 54c1b6a30a3d646e3d4bc4bae1713755422b471e
Expand All @@ -62,6 +50,6 @@ SPEC CHECKSUMS:
AEPServices: ca493988df250d84fda050124ff7549bcc43c65f
SwiftLint: 13280e21cdda6786ad908dc6e416afe5acd1fcb7

PODFILE CHECKSUM: a9fc51f7e8edf6f1b68721600f1c48e4abd8c9bf
PODFILE CHECKSUM: a88b954489e72716ffa14542a2ff5d27dfbda663

COCOAPODS: 1.11.3
COCOAPODS: 1.11.2
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# Adobe Experience Platform Edge Network Mobile Extension

[![Cocoapods](https://img.shields.io/cocoapods/v/AEPEdge.svg?color=orange&label=AEPEdge&logo=apple&logoColor=white)](https://cocoapods.org/pods/AEPEdge)[![SPM](https://img.shields.io/badge/SPM-Supported-orange.svg?logo=apple&logoColor=white)](https://swift.org/package-manager/)[![CircleCI](https://img.shields.io/circleci/project/github/adobe/aepsdk-edge-ios/main.svg?logo=circleci)](https://circleci.com/gh/adobe/workflows/aepsdk-edge-ios)[![Code Coverage](https://img.shields.io/codecov/c/github/adobe/aepsdk-edge-ios/main.svg?logo=codecov)](https://codecov.io/gh/adobe/aepsdk-edge-ios/branch/main)
[![CocoaPods](https://img.shields.io/github/v/release/adobe/aepsdk-edge-ios?label=CocoaPods&logo=apple&logoColor=white&color=orange)](https://cocoapods.org/pods/AEPEdge)
[![SPM](https://img.shields.io/github/v/release/adobe/aepsdk-edge-ios?label=SPM&logo=apple&logoColor=white&color=orange)](https://github.com/adobe/aepsdk-edge-ios/releases)
[![CircleCI](https://img.shields.io/circleci/project/github/adobe/aepsdk-edge-ios/main.svg?label=Build&logo=circleci)](https://circleci.com/gh/adobe/workflows/aepsdk-edge-ios)
[![Code Coverage](https://img.shields.io/codecov/c/github/adobe/aepsdk-edge-ios/main.svg?label=Coverage&logo=codecov)](https://codecov.io/gh/adobe/aepsdk-edge-ios/branch/main)

## About this project

The Adobe Experience Platform Edge Network mobile extension allows you to send data to the Adobe Edge Network from a mobile application. This extension allows you to implement Adobe Experience Cloud capabilities in a more robust way, serve multiple Adobe solutions though one network call, and simultaneously forward this information to the Adobe Experience Platform.

The AEP Edge Network mobile extension is an extension for the [Adobe Experience Platform SDK](https://aep-sdks.gitbook.io) and requires the `AEPCore` and `AEPServices` extensions for event handling, as well as the `AEPEdgeIdentity` extension for retrieving the identities, such as ECID.
The Edge Network mobile extension is an extension for the [Adobe Experience Platform SDK](https://developer.adobe.com/client-sdks) and requires the `AEPCore` and `AEPServices` extensions for event handling, as well as the `AEPEdgeIdentity` extension for retrieving the identities, such as ECID.

To learn more about this extension, read the [Adobe Experience Platform Edge Network](https://aep-sdks.gitbook.io/docs/foundation-extensions/experience-platform-extension) documentation.
To learn more about this extension, read the [Adobe Experience Platform Edge Network](https://developer.adobe.com/client-sdks/documentation/edge-network/) documentation.

## Requirements
- Xcode 14.1 (or newer)
Expand Down Expand Up @@ -51,7 +54,7 @@ To add the AEPEdge Package to your application, from the Xcode menu select:

`File > Add Packages...`

> **Note**
> **Note**
> The menu options may vary depending on the version of Xcode being used.

Enter the URL for the AEPEdge package repository: `https://github.com/adobe/aepsdk-edge-ios.git`.
Expand Down