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

Dev -> Staging v1.1.0 #81

Merged
merged 81 commits into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 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
ae631d3
Merge pull request #61 from adobe/staging
addb Apr 1, 2022
e420d51
Bump cocoapods-downloader from 1.4.0 to 1.6.3 (#62)
dependabot[bot] Apr 6, 2022
1a167b1
Merge pull request #63 from adobe/main
kevinlind Apr 6, 2022
3309c68
Release Drafter draft release tool (#64)
timkimadobe May 5, 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
397ef78
API docs for setAdvertisingIdentifier (#72)
emdobrin Jun 2, 2022
7f6820e
Merge branch 'dev' into feature/adIdConsent
emdobrin Jun 2, 2022
6ff77d9
Merge pull request #55 from adobe/feature/adIdConsent
emdobrin Jun 2, 2022
6af4702
Update test app dependencies for adid
emdobrin Jun 3, 2022
53741ce
Keep app id empty
emdobrin Jun 3, 2022
022eb1a
Add adid support to objc test app, target ios 10
emdobrin Jun 4, 2022
f8b321d
Update info.plist for idfa
emdobrin Jun 6, 2022
d9616c6
Merge pull request #74 from emdobrin/dev
emdobrin Jun 6, 2022
2c33ffb
Merge pull request #77 from emdobrin/testapp
emdobrin Jun 6, 2022
ffb1429
Bump version to 1.1.0
emdobrin Jun 7, 2022
c87e314
Merge pull request #78 from emdobrin/dev
emdobrin Jun 7, 2022
8a9e9c6
Feature: Added new getUrlVariables API (#79)
addb Jun 7, 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
48 changes: 47 additions & 1 deletion .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,50 @@
# Config file for release drafter
name-template: 'v$RESOLVED_VERSION'
tag-template: 'v$RESOLVED_VERSION'
categories:
- title: 'Features'
labels:
- 'feature'
- title: 'Enhancements'
labels:
- 'enhancement'
- title: 'Bug Fixes'
labels:
- 'bugfix'
- title: 'Deprecations'
labels:
- 'deprecated'
- title: 'Maintenance'
labels:
- 'buildscripts'
- 'documentation'
- 'maintenance'
include-labels:
- 'bug'
- 'bugfix'
- 'buildscripts'
- 'deprecated'
- 'documentation'
- 'enhancement'
- 'feature'
- 'fix'
- 'maintenance'
change-template: '$TITLE (#$NUMBER) @$AUTHOR'
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
version-resolver:
major:
labels:
- 'major'
minor:
labels:
- 'minor'
patch:
labels:
- 'patch'
default: patch
template: |
## What’s Changed
## Changes

$CHANGES

**Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...$RESOLVED_VERSION
36 changes: 36 additions & 0 deletions .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Create Draft Release (GitHub only)

on:
workflow_dispatch:
inputs:
tag:
description: 'tag/version'
required: true
default: '1.0.0'

action_tag:
description: 'create tag ("no" to skip)'
required: true
default: 'yes'

create_full_release:
description: 'create as full release? ("no" to create draft release)'
required: true
default: 'no'

jobs:
create_release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: release-drafter/release-drafter@v5
if: ${{ github.event.inputs.action_tag == 'yes' }}
with:
name: v${{ github.event.inputs.tag }}
tag: ${{ github.event.inputs.tag }}
version: ${{ github.event.inputs.tag }}
publish: ${{ github.event.inputs.create_full_release == 'yes' }}
config-name: release-drafter.yml

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ playground.xcworkspace
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
Package.resolved
# *.xcodeproj
#
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
Expand Down Expand Up @@ -97,4 +97,3 @@ Pods/
# Bundler
.bundle/
vendor/

4 changes: 2 additions & 2 deletions AEPEdgeIdentity.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AEPEdgeIdentity"
s.version = "1.0.1"
s.version = "1.1.0"
s.summary = "Experience Platform Edge Identity extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe."

s.description = <<-DESC
Expand All @@ -15,7 +15,7 @@ Pod::Spec.new do |s|
s.swift_version = '5.1'

s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }
s.dependency 'AEPCore', '>= 3.1.1'
s.dependency 'AEPCore', '>= 3.6.0'

s.source_files = 'Sources/**/*.swift'
end
74 changes: 57 additions & 17 deletions AEPEdgeIdentity.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

84 changes: 84 additions & 0 deletions Documentation/ReleaseProcess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# GitHub release configuration
## Generate automatic release notes using Release Drafter
The Release Drafter tool uses GitHub actions inputs to control GitHub release elements (tags, release name, draft/full release status, etc.); to control changelog level elements (text format, style, label text, etc.), see [Changelog text and style configuration](#changelog-text-and-style-configuration).

For all available action inputs, see the reference: [Action Inputs](https://github.com/release-drafter/release-drafter#action-inputs)


### How to control releases
It is possible to have the tool output a draft release version to verify the output is acceptable; it may be helpful to have a workflow input variable to control this behavior. Note that any existing draft releases with the same tag version will be replaced by the newly created draft (that is, automatic cleanup of older drafts).

### Changelog text and style configuration
The Release Drafter tool uses a yaml config file to control the style of output. This config controls changelog text level elements; to control GitHub release level elements (tags, release name, draft/full release status, etc.), see [GitHub release configuration](#github-release-configuration).

By default, the Release Drafter action looks for its configuration at `.github/release-drafter.yml` (note this is one level up from the action's own `workflows` directory). To use a different config filename, specify the `config-name` as in the example below:
```yaml
- uses: release-drafter/release-drafter@v5
with:
config-name: custom-config-name.yml
```

### How to control labels
#### Label inclusion/exclusion
It is possible to explicitly include or exclude labels. For example, it could be useful in certain cases to not include a PR in the changelog, and a special label like `skip-changelog` could be used to mark a PR as not needed to be added to the changelog.

#### Label categorization
To categorize/group labels with a custom title in the changelog, create the `categories` header at the top level of the config yaml:
```yaml
categories:
# Example of multiple labels for a grouping
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
# Example of a single label for a grouping
- title: '🧰 Maintenance'
label: 'chore'
```

Note that in the default configuration of the tool, unlabeled PRs are grouped together. The categories of PRs follow the same order as in the config yaml file, with the unlabeled category starting first, followed by the defined `categories` order. If you want to exclude unlabeled PRs, define the `include-labels` option as below:

```yaml
include-labels:
- 'bug'
- 'bugfix'
- 'buildscripts'
- 'deprecated'
- 'documentation'
- 'enhancement'
- 'feature'
- 'fix'
- 'maintenance'
```

### How to control changelog output template
See the available environment variables for changelog output populated by the tool: [Template Variables](https://github.com/release-drafter/release-drafter#template-variables)

At the top level of the config yaml:
```yaml
template: |
## Changes

$CHANGES

**Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...$RESOLVED_VERSION
```

Note that the elements of the changelog itself are broken into smaller standard units by the tool; for example, each PR is represented by a "change" entity, and the format for a single change entry is controlled by the `change-template` property.

At the top level of the config yaml:
```yaml
change-template: '$TITLE (#$NUMBER) @$AUTHOR'
```
Given a PR whose author is `@username` with title:
```
New API allows for deleting user data #6
```

The resulting output is:
```
New API allows for deleting user data (#6) @username
```

See the reference for all standard changelog entities: [Configuration Objects](https://github.com/release-drafter/release-drafter#configuration-options)

Loading