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

Merge staging into main for v2.0.0 release #27

Merged
merged 63 commits into from
Jan 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
71d3ade
Setup aepsdk-assurance-android
prudrabhat Dec 5, 2022
9e22eb5
Merge pull request #1 from prudrabhat/dev
prudrabhat Dec 5, 2022
a01a56b
Add Spotless integration for checkstyle
prudrabhat Dec 6, 2022
77412fb
Integrate and publish with Jitpack
prudrabhat Dec 6, 2022
ab91b3f
Fix reconnection when cofig state(orgId) is not yet set
prudrabhat Dec 12, 2022
e5ec883
Merge pull request #5 from prudrabhat/ci_cd
prudrabhat Dec 13, 2022
054ad7c
Reword comment
prudrabhat Dec 13, 2022
82045dc
Merge remote-tracking branch 'upstream/dev' into reconnection_issue
prudrabhat Dec 13, 2022
d56081f
Merge pull request #4 from prudrabhat/reconnection_issue
prudrabhat Dec 13, 2022
107337a
Fix AAR name and Makefile for publish
prudrabhat Dec 13, 2022
85e5d7d
Merge remote-tracking branch 'upstream/dev' into reconnection_issue
prudrabhat Dec 13, 2022
b18b3e2
Merge pull request #6 from prudrabhat/publish_fixes
prudrabhat Dec 13, 2022
5850e7b
Add release and snapshot workflows.
prudrabhat Dec 15, 2022
b4cc692
Merge remote-tracking branch 'upstream/dev' into publish_fixes
prudrabhat Dec 15, 2022
ff7650e
Merge pull request #11 from prudrabhat/github_workflows
prudrabhat Dec 15, 2022
a399570
Run ci-format and ci-checkformat to apply new formatting
prudrabhat Dec 16, 2022
e94b4ce
CircleCI and Makefile updates
prudrabhat Dec 16, 2022
8c4c2e5
Merge pull request #12 from prudrabhat/circle_ci_checkstyle_config
prudrabhat Dec 16, 2022
7905e68
Uplevel workflow instances to java 11
prudrabhat Dec 19, 2022
619514d
Merge remote-tracking branch 'upstream/dev' into workflow_uplevel_java
prudrabhat Dec 19, 2022
d89d5e6
Merge pull request #13 from prudrabhat/workflow_uplevel_java
prudrabhat Dec 20, 2022
b00d920
Merge pull request #14 from adobe/dev
prudrabhat Dec 20, 2022
b832ba9
Update Readme
prudrabhat Jan 3, 2023
3a0f15c
Add friendly name
prudrabhat Jan 3, 2023
ace1b86
Merge pull request #15 from prudrabhat/add_friendlyname
prudrabhat Jan 4, 2023
a290377
Update Readme and Usage docs
prudrabhat Jan 9, 2023
e772426
Merge remote-tracking branch 'upstream/dev' into readme_updates
prudrabhat Jan 9, 2023
fabdaca
Fix build target naming and usage
prudrabhat Jan 9, 2023
311381d
Merge pull request #16 from prudrabhat/readme_updates
prudrabhat Jan 9, 2023
74c1df5
Standardize doc names and formatting
prudrabhat Jan 12, 2023
cbf5f28
Merge pull request #17 from prudrabhat/readme_standardization
prudrabhat Jan 12, 2023
48ddbc9
Merge pull request #18 from adobe/dev
prudrabhat Jan 18, 2023
0d0a695
Do not export internal Assurance activities
prudrabhat Jan 19, 2023
37fd8a7
Merge pull request #19 from prudrabhat/fix_activity_export
prudrabhat Jan 19, 2023
ef821e0
Update Assurance 2.0 Test App
prudrabhat Jan 19, 2023
1dc2569
Add NonNull annotations to public API's
prudrabhat Jan 26, 2023
a9bfe34
Add ConstraintLayout POM dependancy and fix style name
prudrabhat Jan 26, 2023
2b6e48d
Merge pull request #21 from prudrabhat/fix_pom_dependancy
prudrabhat Jan 26, 2023
707b49c
Merge pull request #20 from prudrabhat/annotations
prudrabhat Jan 26, 2023
9d8f65e
Use resources for UI
prudrabhat Jan 26, 2023
8a0badc
Merge remote-tracking branch 'upstream/dev' into testapp_ui
prudrabhat Jan 26, 2023
cb8fa93
Change scheme, format and add init log
prudrabhat Jan 26, 2023
0770bcd
Remove unneeded libs and metadata
prudrabhat Jan 27, 2023
c6e5971
Remove unneeded libs
prudrabhat Jan 27, 2023
57c1736
Remove kotlinVersion var - used only once
prudrabhat Jan 27, 2023
4d30daf
Add GettingStarted and Reorganize documentation structure
prudrabhat Jan 26, 2023
0ebb3d9
Merge remote-tracking branch 'upstream/dev' into doc_folder_fix
prudrabhat Jan 27, 2023
962faeb
Fix spacing
prudrabhat Jan 27, 2023
95fe431
Merge pull request #22 from prudrabhat/testapp_ui
prudrabhat Jan 28, 2023
f7e68ab
Rename getting started and usage docs
prudrabhat Jan 30, 2023
9a609df
Merge pull request #23 from prudrabhat/doc_folder_fix
prudrabhat Jan 30, 2023
062c08e
Merge pull request #24 from adobe/dev
prudrabhat Jan 30, 2023
8668c5b
Prepare Assurance SDK v 2.0.0 for release
prudrabhat Jan 30, 2023
6b62882
Fix doc for registerExtension()
prudrabhat Jan 31, 2023
81990b4
Merge pull request #25 from prudrabhat/prepare_for_release
prudrabhat Jan 31, 2023
1a79da5
Merge pull request #26 from adobe/dev
prudrabhat Jan 31, 2023
621b714
Remove versionCode and versionName from build.gradle
prudrabhat Jan 31, 2023
07f9e5f
Merge pull request #28 from prudrabhat/remove_versioncode
prudrabhat Jan 31, 2023
a211f09
Merge pull request #29 from adobe/dev
prudrabhat Jan 31, 2023
e6b461d
Add related extensions to Readme
prudrabhat Jan 31, 2023
c4a8c4c
Add Documentation section
prudrabhat Jan 31, 2023
5df75b2
Merge pull request #30 from prudrabhat/add_relatedextensions
prudrabhat Jan 31, 2023
69574de
Merge pull request #31 from adobe/dev
prudrabhat Jan 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
63 changes: 63 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
version: 2.1

orbs:
android: circleci/android@2.0

workflows:
version: 2
aepsdk-core-ci:
jobs:
- build-and-unit-test
- functional-test

jobs:
build-and-unit-test:
executor:
name: android/android-machine
resource-class: large
tag: 2022.01.1

steps:
- checkout

- run:
name: Check format
command: make checkformat

- run:
name: Generate release build
command: make generate-library-release

- run:
name: Generate JavaDoc
command: make javadoc

- run:
name: Run Unit tests
command: make unit-test

- store_artifacts:
path: code/assurance/build/reports

- store_test_results:
path: code/assurance/build/test-results/testPhoneDebugUnitTest

functional-test:
executor:
name: android/android-machine
resource-class: large
tag: 2022.01.1

steps:
- checkout

- android/start-emulator-and-run-tests:
system-image: system-images;android-29;default;x86
post-emulator-launch-assemble-command: make build-release
test-command: make functional-test

- store_artifacts:
path: code/assurance/build/reports

- store_test_results:
path: code/assurance/build/outputs/androidTest-results
52 changes: 52 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Contributing

Thanks for choosing to contribute!

The following are a set of guidelines to follow when contributing to this project.

## Code Of Conduct

This project adheres to the Adobe [code of conduct](../CODE_OF_CONDUCT.md). By participating,
you are expected to uphold this code. Please report unacceptable behavior to
[Grp-opensourceoffice@adobe.com](mailto:Grp-opensourceoffice@adobe.com).

## Have A Question?

Start by filing an issue. The existing committers on this project work to reach
consensus around project direction and issue solutions within issue threads
(when appropriate).

## Contributor License Agreement

All third-party contributions to this project must be accompanied by a signed contributor
license agreement. This gives Adobe permission to redistribute your contributions
as part of the project. [Sign our CLA](http://opensource.adobe.com/cla.html). You
only need to submit an Adobe CLA one time, so if you have submitted one previously,
you are good to go!

## Code Reviews

All submissions should come in the form of pull requests and need to be reviewed
by project committers. Read [GitHub's pull request documentation](https://help.github.com/articles/about-pull-requests/)
for more information on sending pull requests.

Lastly, please follow the [pull request template](PULL_REQUEST_TEMPLATE.md) when
submitting a pull request!

## Style Guide

Code cleanliness and consistency is important. Please review and follow our code
[Style Guide](../Documentation/Contributing/StyleGuide.md) when contributing.

## From Contributor To Committer

We love contributions from our community! If you'd like to go a step beyond contributor
and become a committer with full write access and a say in the project, you must
be invited to the project. The existing committers employ an internal nomination
process that must reach lazy consensus (silence is approval) before invitations
are issued. If you feel you are qualified and want to get more deeply involved,
feel free to reach out to existing committers to have a conversation about that.

## Security Issues

Security issues shouldn't be reported on this issue tracker. Instead, [file an issue to our security experts](https://helpx.adobe.com/security/alertus.html)
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!--- STOP! Before you open an issue please search this repository's issues to see if it has already been reported. This helps reduce duplicate issues from being created. -->
<!--- SECURITY DISCLOSURE: If this is a security disclosure please follow the guidelines in CONTRIBUTING.md. This helps keep folks from accidentally releasing vulnerabilities before the maintainers get a chance to fix the issue. -->

### Expected Behaviour

### Actual Behaviour

#### Steps to Reproduce

#### Platform and Version

#### Logs taken while reproducing problem
45 changes: 45 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<!--- Provide a general summary of your changes in the Title above -->

## Description

<!--- Describe your changes in detail -->

## Related Issue

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->

## Screenshots (if appropriate):

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] I have signed the [Adobe Open Source CLA](http://opensource.adobe.com/cla.html).
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the **CONTRIBUTING** document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
34 changes: 34 additions & 0 deletions .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Publish package to the Maven Central Repository
on:
push:
branches:
- main
jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Java
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache Gradle packages
uses: actions/cache@v2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- name: Import GPG key
env:
GPG_SECRET_KEYS: ${{ secrets.GPG_SECRET_KEYS }}
GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
run: |
echo $GPG_SECRET_KEYS | base64 --decode | gpg --import --no-tty --batch --yes
echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust --no-tty --batch --yes
- name: Publish to maven central staging repository
run: make ci-publish-main
env:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
34 changes: 34 additions & 0 deletions .github/workflows/maven-snapshot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Publish package to the Maven Central Repository
on:
push:
branches:
- staging
jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Java
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache Gradle packages
uses: actions/cache@v2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- name: Import GPG key
env:
GPG_SECRET_KEYS: ${{ secrets.GPG_SECRET_KEYS }}
GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
run: |
echo $GPG_SECRET_KEYS | base64 --decode | gpg --import --no-tty --batch --yes
echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust --no-tty --batch --yes
- name: Publish to maven central staging repository
run: make ci-publish-staging
env:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
35 changes: 35 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# DSStore
.DS_Store

# Generated files
bin/
build/
ci/

# IntelliJ
*.iml
**/.idea/

# Secrets
**/*/values/secrets.xml

# Local configuration file (sdk path, etc)
local.properties

# Android Studio Navigation editor temp files
.navigation/

# Coverage tools
jacoco.exec

# Application files
*.apk
*.aar
*.aab

# Dex files for ART/Dalvik VM
*.dex

# Gradle files
.gradle/
build/
74 changes: 74 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# Adobe Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at Grp-opensourceoffice@adobe.com. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at [https://contributor-covenant.org/version/1/4][version]

[homepage]: https://contributor-covenant.org
[version]: https://contributor-covenant.org/version/1/4/
6 changes: 6 additions & 0 deletions Documentation/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# AEP Assurance SDK Documentation

### Contents

* [Getting Started](./getting-started.md)
* [API Usage](./api-reference.md)