chore: merge main into dev-preview branch

.circleci/config.yml

@@ -0,0 +1,37 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+orbs:
+  getting-started-smoke-test:
+    orbs:
+      android: circleci/android@2.0.0
+
+    jobs:
+      android:
+        working_directory: ~/android-canaries/canaries/example
+        executor:
+          name: android/android-machine
+          resource-class: xlarge
+          tag: 2022.03.1
+        steps:
+          - checkout:
+              path: ~/android-canaries
+          - android/create-avd:
+              avd-name: myavd
+              install: true
+              system-image: system-images;android-29;default;x86
+          - android/start-emulator:
+              avd-name: myavd
+          - android/run-tests
+
+
+
+workflows:
+  canaries:
+    when:
+      and:
+        - equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
+        - equal: [ "Canaries", << pipeline.schedule.name >> ]
+    jobs:
+      - getting-started-smoke-test/android

.github/CODEOWNERS

@@ -1 +1 @@
-*   @aws-amplify/amplify-android
+*   @aws-amplify/amplify-android @aws-amplify/amplify-data

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,5 @@
+- [ ] PR title and description conform to [Pull Request](https://github.com/aws-amplify/amplify-android/blob/main/CONTRIBUTING.md#pull-request-guidelines) guidelines.
+
 *Issue #, if available:*
 
 *Description of changes:*
@@ -6,8 +8,7 @@
 (Please add a line here how the changes were tested)
 
 - [ ] Added Unit Tests
-- [ ] Tested on frontend (Add Screenshots)
-- [ ] Successful logs (Attach them to the PR)
+- [ ] Added Integration Tests
 
 *Documentation update required?*
 - [ ] No

.github/workflows/priority_bumper.yml

@@ -0,0 +1,34 @@
+name: Projects priority automation
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  bump_to_p2:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.issue.comments > 10 }}
+    steps:
+      - name: Bump to P2
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_WORKFLOW_TOKEN }}
+          PROJECT_ID: ${{ secrets.PROJECT_ID }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+          FIELD_ID: ${{ secrets.PRIORITY_COL }}
+          FIELD_OPT_ID: ${{ secrets.P2_OPT_ID }}
+        shell: bash
+        run: curl -s POST https://api.github.com/graphql -H "Authorization:Bearer $GITHUB_TOKEN" --data '{"query":"mutation {updateProjectNextItemField(input:{projectId:\"${{ env.PROJECT_ID }}\" itemId:\"${{ env.ISSUE_ID }}\" fieldId:\"${{ env.FIELD_ID }}\" value:\"${{ env.FIELD_OPT_ID }}\"}) {projectNextItem {id}}}"}' > /dev/null
+
+  bump_to_p1:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.issue.comments > 15 }}
+    steps:
+      - name: Bump to P1
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_WORKFLOW_TOKEN }}
+          PROJECT_ID: ${{ secrets.PROJECT_ID }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+          FIELD_ID: ${{ secrets.PRIORITY_COL }}
+          FIELD_OPT_ID: ${{ secrets.P1_OPT_ID }}
+        shell: bash
+        run: curl -s POST https://api.github.com/graphql -H "Authorization:Bearer $GITHUB_TOKEN" --data '{"query":"mutation {updateProjectNextItemField(input:{projectId:\"${{ env.PROJECT_ID }}\" itemId:\"${{ env.ISSUE_ID }}\" fieldId:\"${{ env.FIELD_ID }}\" value:\"${{ env.FIELD_OPT_ID }}\"}) {projectNextItem {id}}}"}' > /dev/null
+

.github/workflows/project_automation.yml

@@ -0,0 +1,50 @@
+name: Projects beta automation
+on:
+  issues:
+    types: [opened, assigned, unassigned, labeled, unlabeled]
+
+jobs:
+  add_issue:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'opened' }}
+    steps:
+      - name: Add to project
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_WORKFLOW_TOKEN }}
+          PROJECT_ID: ${{ secrets.PROJECT_ID }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+        shell: bash
+        run: |
+            curl -s POST https://api.github.com/graphql -H "Authorization:Bearer $GITHUB_TOKEN" --data '{"query":"mutation {addProjectNextItem(input:{projectId:\"${{ env.PROJECT_ID }}\" contentId:\"${{ env.ISSUE_ID }}\"}) {projectNextItem {id}}}"}' > /dev/null
+
+  move_to_wip:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'assigned' || contains(github.event.issue.labels.*.name, 'pending-response') || contains(github.event.issue.labels.*.name, 'closing soon') }}
+    steps:
+      - name: Move to WIP column
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_WORKFLOW_TOKEN }}
+          PROJECT_ID: ${{ secrets.PROJECT_ID }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+          FIELD_ID: ${{ secrets.STATUS_COL }}
+          FIELD_OPT_ID: ${{ secrets.WIP_OPT_ID }}
+        shell: bash
+        run: |
+            curl -s POST https://api.github.com/graphql -H "Authorization:Bearer $GITHUB_TOKEN" —data '{"query":"mutation {updateProjectNextItemField(input:{projectId:\"${{ env.PROJECT_ID }}\" itemId:\"${{ env.ISSUE_ID }}\" fieldId:\"${{ env.FIELD_ID }}\" value:\"${{ env.FIELD_OPT_ID }}\"}) {projectNextItem {id}}}"}' > /dev/null
+
+  move_to_todo:
+    runs-on: ubuntu-latest
+    if: ${{ join(github.event.issue.assignees.*.login) == '' && !contains(github.event.issue.labels.*.name, 'pending-response') && !contains(github.event.issue.labels.*.name, 'closing soon') }}
+    steps:
+      - name: Move to Todo column
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_WORKFLOW_TOKEN }}
+          PROJECT_ID: ${{ secrets.PROJECT_ID }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+          FIELD_ID: ${{ secrets.STATUS_COL }}
+          FIELD_OPT_ID: ${{ secrets.TODO_OPT_ID }}
+        shell: bash
+        run: |
+            curl -s POST https://api.github.com/graphql -H "Authorization:Bearer $GITHUB_TOKEN" --data '{"query":"mutation {updateProjectNextItemField(input:{projectId:\"${{ env.PROJECT_ID }}\" itemId:\"${{ env.ISSUE_ID }}\" fieldId:\"${{ env.FIELD_ID }}\" value:\"${{ env.FIELD_OPT_ID }}\"}) {projectNextItem {id}}}"}' > /dev/null
+
+

.github/workflows/release_pr.yml

@@ -1,6 +1,11 @@
 name: Prepare Next Release
 on:
   workflow_dispatch:
+    inputs:
+      release_tag: 
+        description: 'Release Tag'
+        required: false 
+        type: string
 env:
   GIT_USER_NAME: amplify-android-dev+ghops
   GIT_USER_EMAIL: amplify-android-dev+ghops@amazon.com
@@ -42,7 +47,7 @@ jobs:
         RELEASE_MANAGER_TOKEN: ${{secrets.GITHUB_TOKEN}}
       run: |
         cd scripts
-        bundle exec fastlane android create_next_release_pr
+        bundle exec fastlane android create_next_release_pr release_tag:${{ github.event.inputs.release_tag }}
     - name: Check modified file content
       run: |
         cat gradle.properties

.github/workflows/stale.yml

@@ -0,0 +1,24 @@
+name: "Close stale issues"
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/stale@v4
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        operations-per-run: 200
+        stale-issue-message: "This issue is stale since it's been open 30 days with no activity. This will be closed in 7 days unless the `Closing Soon` label is removed or a comment is added. Thank you for your contributions."
+        close-issue-message: "This issue was closed since it's been 7 days with no activity."
+        stale-issue-label: "closing soon"
+        debug-only: true
+        days-before-stale: 30
+        days-before-close: 7
+        # PRs wont go stale
+        days-before-pr-stale: -1
+        # Issues with any of these labels are checked.
+        any-of-labels: "pending-response, closing soon"

.gitignore

@@ -83,6 +83,7 @@ __pycache__/
 # Credentials
 **/awsconfiguration.json
 **/amplifyconfiguration.json
+**/amplifyconfiguration_v2.json
 **/credentials.json
 **/google_client_creds.json
 

CHANGELOG.md

@@ -1,3 +1,90 @@
+## [Release 1.37.2](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.37.2)
+
+### Bug Fixes
+- **datastore**: Fix for Flutter backtick (#1866)
+
+[See all changes between 1.37.1 and 1.37.2](https://github.com/aws-amplify/amplify-android/compare/release_v1.37.1...release_v1.37.2)
+
+## [Release 1.37.1](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.37.1)
+
+### Bug Fixes
+- **storage**: Remove startForegroundService in favor of binding service
+
+### Miscellaneous
+- Update AWS SDK for Android version
+
+[See all changes between 1.37.0 and 1.37.1](https://github.com/aws-amplify/amplify-android/compare/release_v1.37.0...release_v1.37.1)
+
+## [Release 1.37.0](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.37.0)
+
+### Features
+- **datastore**: Implemented support for custom primary key (#1650)
+
+### Bug Fixes
+- **api:** allow post request with empty body (#1864)
+
+[See all changes between 1.36.5 and 1.37.0](https://github.com/aws-amplify/amplify-android/compare/release_v1.36.5...release_v1.37.0)
+
+## [Release 1.36.5](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.36.5)
+
+### Miscellaneous
+- Updating the version to 2.50.1 for AWS SDK (#1861)
+- Reduce the importance level of transfer channel for foreground service to prevent sound/vibrate (#1860)
+
+[See all changes between 1.36.4 and 1.36.5](https://github.com/aws-amplify/amplify-android/compare/release_v1.36.4...release_v1.36.5)
+
+## [Release 1.36.4](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.36.4)
+
+### Miscellaneous
+- Call to start TransferService regardless of if it has already been started
+- Update transfer message in notification
+- Update the Delete REST API to ensure it would work with and without a body (#1842)
+- Chore(Release): Updating mobile client to the latest (#1847)
+
+[See all changes between 1.36.3 and 1.36.4](https://github.com/aws-amplify/amplify-android/compare/release_v1.36.3...release_v1.36.4)
+
+## [Release 1.36.3](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.36.3)
+
+### Bug Fixes
+- **api:** catch all exceptions when making rest request (#1827)
+
+[See all changes between 1.36.2 and 1.36.3](https://github.com/aws-amplify/amplify-android/compare/release_v1.36.2...release_v1.36.3)
+
+## [Release 1.36.2](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.36.2)
+
+### Miscellaneous
+- Expand a catch clause to catch all (#1806)
+
+[See all changes between 1.36.1 and 1.36.2](https://github.com/aws-amplify/amplify-android/compare/release_v1.36.1...release_v1.36.2)
+
+## [Release 1.36.1](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.36.1)
+
+### Miscellaneous
+- fix orchestrator failing if emitter is disposed (#1755)
+- catch exceptions from processOutboxItem (#1743)
+- ci: added canary workflow (#1770)
+
+[See all changes between 1.36.0 and 1.36.1](https://github.com/aws-amplify/amplify-android/compare/release_v1.36.0...release_v1.36.1)
+
+## [Release 1.36.0](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.36.0)
+
+### Features
+- Add flushEvents HubEvent for analytics (#1792)
+
+### Miscellaneous
+- Update build.gradle
+
+[See all changes between 1.35.7 and 1.36.0](https://github.com/aws-amplify/amplify-android/compare/release_v1.35.7...release_v1.36.0)
+
+## [Release 1.35.7](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.35.7)
+
+### Miscellaneous
+- Fix for adding data back to the delete request if it contains data as that is allowed for the Delete api (#1735)
+- Fix/1485 : Fix for sending the session expired hub event when all credentials are expired (#1779)
+- Updating build.gradle to include the latest version of the aws sdk (#1783)
+
+[See all changes between 1.35.6 and 1.35.7](https://github.com/aws-amplify/amplify-android/compare/release_v1.35.6...release_v1.35.7)
+
 ## [Release 1.35.6](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.35.6)
 
 ### Bug Fixes
@@ -15,15 +102,13 @@
 ## [Release 1.36.5-dev-preview.0](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.36.5-dev-preview.0)
 
 ### Miscellaneous
-
 - Dev preview update and version bump (#1752)
 
 [See all changes between 1.35.5 and 1.36.5-dev-preview.0](https://github.com/aws-amplify/amplify-android/compare/release_v1.35.5...release_v1.36.5-dev-preview.0)
 
 ## [Release 1.35.5](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.35.5)
 
 ### Miscellaneous
-
 - chore: update gson version (#1744)
 - Update notify_comments.yml (#1746)
 - Update SDK version in build.gradle (#1747)
@@ -33,19 +118,16 @@
 ## [Release 1.35.4](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.35.4)
 
 ### Miscellaneous
-
 - Update SDK version in build.gradle (#1741)
 
 [See all changes between 1.35.3 and 1.35.4](https://github.com/aws-amplify/amplify-android/compare/release_v1.35.3...release_v1.35.4)
 
 ## [Release 1.35.3](https://github.com/aws-amplify/amplify-android/releases/tag/release_v1.35.3)
 
 ### Bug Fixes
-
 - When DateTimeParseException is not available for lower apis (#1701)
 
 ### Miscellaneous
-
 - Version bumps (#1721)
 
 [See all changes between 1.35.2 and 1.35.3](https://github.com/aws-amplify/amplify-android/compare/release_v1.35.2...release_v1.35.3)

CONTRIBUTING.md

@@ -425,15 +425,24 @@ This last step will give you a URL to view a GitHub page in your browser.
 Copy-paste this, and complete the workflow in the UI. It will invite you to
 "create a PR" from your newly published branch.
 
-Your PR must be reviewed by at least one repository maintainer, in order
+### Pull Request Guidelines
+- The title of your PR must be descriptive to the specific change.
+- The title of your PR must be of below format since next release version is determined from PR titles in the commit history.
+	- For a bugfix: `fix(category): description of changes`
+	- For a feature: `feat(catgory): add awesome feature`
+	- Everything else: `chore: fix build script`
+	- Eg. `fix(auth): throw correct auth exception for code mismatch`. Refer https://github.com/aws-amplify/amplify-android/pull/1370
+- No period at the end of the title.
+- Pull Request message should indicate which issues are fixed: `fixes #<issue>` or `closes #<issue>`.
+- If not obvious (i.e. from unit tests), describe how you verified that your change works.
+- If this PR includes breaking changes, they must be listed at the top of the changelog as described above in the Pull Request Checklist.
+- PR must be reviewed by at least one repository maintainer, in order
 to be considered for inclusion.
-
-your PR must also pass the CircleCI workflow and LGTM validations. CircleCI
+- PR must also pass the CodeBuild workflow and LGTM validations. CodeBuild
 will run all build tasks (Checkstyle, Lint, unit tests).
-
-Currently, CircleCI **DOES NOT** run instrumentation tests for PRs that come
-from user forks. You should run these tests on your laptop before submitting
-the PR.
+- Usually all these are going to be **squashed** when you merge to main.
+- Make sure to update the PR title/description if things change.
+- Rebase with the `main` branch if it has commits ahead of your fork.
 
 ## Troubleshooting
 

README.md

@@ -69,12 +69,12 @@ dependencies section:
 ```groovy
 dependencies {
     // Only specify modules that provide functionality your app will use
-    implementation 'com.amplifyframework:aws-analytics-pinpoint:1.36.6-dev-preview.0'
-    implementation 'com.amplifyframework:aws-api:1.36.6-dev-preview.0'
-    implementation 'com.amplifyframework:aws-auth-cognito:1.36.6-dev-preview.0'
-    implementation 'com.amplifyframework:aws-datastore:1.36.6-dev-preview.0'
-    implementation 'com.amplifyframework:aws-predictions:1.36.6-dev-preview.0'
-    implementation 'com.amplifyframework:aws-storage-s3:1.36.6-dev-preview.0'
+    implementation 'com.amplifyframework:aws-analytics-pinpoint:1.37.0-dev-preview.0'
+    implementation 'com.amplifyframework:aws-api:1.37.0-dev-preview.0'
+    implementation 'com.amplifyframework:aws-auth-cognito:1.37.0-dev-preview.0'
+    implementation 'com.amplifyframework:aws-datastore:1.37.0-dev-preview.0'
+    implementation 'com.amplifyframework:aws-predictions:1.37.0-dev-preview.0'
+    implementation 'com.amplifyframework:aws-storage-s3:1.37.0-dev-preview.0'
 }
 ```
 

aws-analytics-pinpoint/build.gradle

@@ -20,6 +20,7 @@ apply plugin: 'com.android.library'
 apply from: rootProject.file("configuration/checkstyle.gradle")
 apply from: rootProject.file("configuration/publishing.gradle")
 apply plugin: 'kotlin-android'
+apply plugin: 'org.jlleitschuh.gradle.ktlint'
 
 dependencies {
     implementation project(path: ':core')