chore: merge main to push-notifications (#123)

* fix(core): remove unused dynamic nav dependency (#2132)

* fix(datastore): remove typename from ModelMetadata (#2122)

* fix(datastore): remove typename from ModelMetadata

* Test a potential fix

* Test a potential fix

* fix: callbacks not invoked when attached using getTransfer api (#2111)

* fix: listener not invoked when attached using getTransfer api

* address PR comments

* default state to unknown

* add comment

* add comment

* override getRequest in storage operation & make SocketExcpetion retryable

* add nullable annotation

* address nullable request

Co-authored-by: Tyler Roach <[email protected]>

* Prevent attempting to read backed up EncryptedSharedPreferences that are no longer readable (#2113)

* fix(auth): device metadata migration (#2114)

* Number of attributes being too high is not retryable (#2112)

* Number of attributes being too high is not retryable

* Match iOS at not retrying bad request error -- covering multiple 400 errors

* Fix lint

* Fix lint

* Update Kotlin SDK version

Co-authored-by: Thomas Leing <[email protected]>

* Change errors returned on some apis while federated (#2116)

* release: Amplify Android 2.0.0 (#2115)

* release: Amplify Android 2.0.0

* add core-kotlin changelog

* add more info in changelog

* revert unintended change

* remove breaking change for analytics

* fix(datastore): remove typename from ModelMetadata

* fix(datastore): remove typename from ModelMetadata

* remove unneeded file

* small cleanup

* remove print statements

* fix comment

* force tests

* force tests

* force tests

Co-authored-by: Michael Law <[email protected]>
Co-authored-by: Michael Schneider <[email protected]>
Co-authored-by: Saijad Dhuka <[email protected]>
Co-authored-by: Tyler Roach <[email protected]>
Co-authored-by: Divyesh Chitroda <[email protected]>
Co-authored-by: Thomas Leing <[email protected]>
Co-authored-by: Thomas Leing <[email protected]>
Co-authored-by: Sunil Timalsina <[email protected]>

* chore: Remove deprecated maven plugin (#2137)

* Remove deprecated maven project

* Fix task name grep

* chore: Remove Javadoc tasks (#2139)

* Remove deprecated maven project

* Fix task name grep

* Remove Javadoc tasks

* fix: Change order of updating state in local cache (#2141)

* fix: fix integration test and added logger to integration test (#2143)

* fix: Change order of updating state in local cache

* change order for updating status and add logger to integ tests

* change log level to debug

* Fix for when move to idle state is called twice (#2152)

* Update README.md (#2120)

remove dev-preview APIs note.

* Dengdan stress test (#2153)

* Initial commit

* Work in progress

* finish codes

* change build

* update build

* test excludeStressTest

* Revert "Merge branch 'main' into dengdan-stress-test"

This reverts commit b50840e, reversing
changes made to 3bacf1b.

* remove categories

* remove external changes

* remove external changes

* remove more changes

* Update copyright and refactor

* Update StorageStressTest.kt

* Update StorageStressTest.kt

* Update StorageStressTest.kt

* Update StorageStressTest.kt

* linting

* Update StorageStressTest.kt

* Delete StorageStressTest.kt

* Delete amplifyconfigurationupdated.json

* Delete amplifyconfigurationupdated.json

* Update DataStoreStressTest.kt

* Fix(Auth): Sign up if successful should return DONE instead of Confirm sign up (#2130)

* If sign up is successful in the first try return DONE

* Sign up should send DONE if it is successful

* revert jsongenerator cleandir fun

* lint fix

* Feat(Auth Test): Custom party testing for Custom Test without SRP (#2149)

* Adding custom auth test cases

* Updating test cases for Custom Auth to ensure they pass

* lint format

* Fix for phone number

* Recreate all tests

* Unignore storage and pinpoint tests (#2156)

* unignore tests

* extend timeout to 60s

Co-authored-by: Saijad Dhuka <[email protected]>

* feat(Geo): Add Kotlin Geo Facade (#2155)

* Add Kotlin Geo Facade

* Add return docs to the function comments

* Add tests to verify options are passed

* fix: Add missing apis in storage Kotlin & RxJava facade (#2160)

* fix: Add pause, resume api to kotlin and rxJava facade

* add unit tests

* remove irrelevant code changes

* add assertion

* Update DeviceFarm build config (#2168)

* fix: user metadata was persisted empty in the database (#2165)

* fix: usermeta was persisted as empty in the database

* fix compilation error

* fix compilation error

* avoid adding metadata if it is null

* Add Geo Rx Bindings (#2159)

* chore: Re-add storage tests (#2163)

* Readd storage tests

* rename file

* reduce stress

Co-authored-by: Saijad Dhuka <[email protected]>

* Add a network status listener to restart DataStore after the network … (#2148)

* Add a network status listener to restart DataStore after the network comes back online.

* Add Reachability monitor

* working pretty well

* cleanup

* update test

* fix: fix integration test and added logger to integration test (#2143)

* fix: Change order of updating state in local cache

* change order for updating status and add logger to integ tests

* change log level to debug

* Fix for when move to idle state is called twice (#2152)

* Update README.md (#2120)

remove dev-preview APIs note.

* Dengdan stress test (#2153)

* Initial commit

* Work in progress

* finish codes

* change build

* update build

* test excludeStressTest

* Revert "Merge branch 'main' into dengdan-stress-test"

This reverts commit b50840e, reversing
changes made to 3bacf1b.

* remove categories

* remove external changes

* remove external changes

* remove more changes

* Update copyright and refactor

* Update StorageStressTest.kt

* Update StorageStressTest.kt

* Update StorageStressTest.kt

* Update StorageStressTest.kt

* linting

* Update StorageStressTest.kt

* Delete StorageStressTest.kt

* Delete amplifyconfigurationupdated.json

* Delete amplifyconfigurationupdated.json

* Update DataStoreStressTest.kt

* force build

* force build

* force build

* fix typo

* Add a network status listener to restart DataStore after the network comes back online.

* Add Reachability monitor

* working pretty well

* cleanup

* update test

* force build

* force build

* force build

* fix typo

* reply to comments

* Add testImplementation lin eto compile tests correctly in intellij

* reply to comments

* make ReachabilityMonitor expose the observable

* Update datastore plugin to use the reachability monitor

* cleanup

* cleanup

* cleanup

* force tests

Co-authored-by: Michael Schneider <[email protected]>
Co-authored-by: Saijad Dhuka <[email protected]>
Co-authored-by: gpanshu <[email protected]>
Co-authored-by: Divyesh Chitroda <[email protected]>
Co-authored-by: dengdan154 <[email protected]>

* chore: Upgrade Gradle, AGP, and KtLint (#2172)

* Remove deprecated maven project

* Fix task name grep

* Upgrade Gradle to 7.5.1

* Upgrade AGP

* Add VERSION_NAME back to BuildConfig

This was removed for library projects in AGP 4.1. We may consider renaming this in the future to disambiguate the Amplify version and the application version.

* Update KtLint and fix all new lint errors

* Use JDK11 on codebuild

* Use JDK11 in workflows

* Upgrade compileSdkVersion to 31

* Try using custom commands to install Android SDK 31

* Update device farm buildspec with manual Android SDK install

* Fix additional ktlint errors

* Upgrade Desugar to JDK11-compatible version

* Upgrade Robolectric

* Set locale explicitly to match expectation

* fix(geo): Increase Geo timeout so that it runs successfully on a Pixel 3a XL (#2177)

* Increase Geo timeout so that it runs successfully on a Pixel 3a XL

* Fix lint

Co-authored-by: Thomas Leing <[email protected]>

* Add a buildspec file for nightly tests (#2180)

* Chore(Auth): Implementation of the custom auth with SRP parity testing use case (#2167)

* Added the test case for custom auth with SRP

* ktlint

* release: Amplify Android 2.1.0 (manually created) (#2185)

Co-authored-by: Thomas Leing <[email protected]>

* chore: Add PR checker workflow (#2188)

Co-authored-by: Erica Eaton <[email protected]>
Co-authored-by: Michael Schneider <[email protected]>
Co-authored-by: Michael Law <[email protected]>
Co-authored-by: Michael Schneider <[email protected]>
Co-authored-by: Saijad Dhuka <[email protected]>
Co-authored-by: Tyler Roach <[email protected]>
Co-authored-by: Thomas Leing <[email protected]>
Co-authored-by: Thomas Leing <[email protected]>
Co-authored-by: Sunil Timalsina <[email protected]>
Co-authored-by: Matt Creaser <[email protected]>
Co-authored-by: gpanshu <[email protected]>
Co-authored-by: dengdan154 <[email protected]>

Author: 13 people

.github/pr-title-checker-config.json

@@ -0,0 +1,17 @@
+{
+  "LABEL": {
+    "name": "Title Needs Formatting",
+    "color": "FF5733"
+  },
+  "CHECKS": {
+    "prefixes": ["chore: ", "refactor: ", "perf: ", "test: ", "docs: "],
+    "regexp": "(fix|feat)\\((all|analytics|api|auth|core|datastore|geo|predictions|storage)\\): ",
+    "regexpFlags": "",
+    "ignoreLabels" : []
+  },
+  "MESSAGES": {
+    "success": "All OK",
+    "failure": "Your title is not formatted correctly. Please see https://github.com/aws-amplify/amplify-android/blob/main/CONTRIBUTING.md#pull-request-guidelines for guidelines.",
+    "notice": ""
+  }
+}

.github/workflows/codecov_code_coverage.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'corretto'
 
       - name: Run test and generate jacoco report

.github/workflows/gradle.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

.github/workflows/maven_release_publisher.yml

@@ -20,9 +20,11 @@ jobs:
         with:
           project-name: AmplifyAndroid-IntegrationTest
           env-vars-for-codebuild: |
-            ORG_GRADLE_PROJECT_useAwsSdkReleaseBuild
+            ORG_GRADLE_PROJECT_useAwsSdkReleaseBuild,
+            NUMBER_OF_DEVICES_TO_TEST
         env:
           ORG_GRADLE_PROJECT_useAwsSdkReleaseBuild: true
+          NUMBER_OF_DEVICES_TO_TEST: 3
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:

.github/workflows/pr_title_checker.yml

@@ -0,0 +1,21 @@
+# Runs a check to verify PRs have a valid title
+
+name: "PR Title Checker"
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+      - labeled
+      - unlabeled
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: thehanimo/[email protected]
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          pass_on_octokit_error: false
+          configuration_path: ".github/pr-title-checker-config.json"

.gitignore

@@ -111,4 +111,5 @@ build-artifacts.tar.gz
 
 # sample app resources
 sample*
-.graphqlconfig.yml
+.graphqlconfig.yml
+aws-datastore/src/androidTest/res/raw/amplifyconfigurationupdated.json

.idea/codeStyles/Project.xml

@@ -1,3 +1,36 @@
+## [Release 2.1.0](https://github.com/aws-amplify/amplify-android/releases/tag/release_v2.1.0)
+
+### Features
+- feat(Geo): Add Kotlin Geo Facade (#2155)
+- Add a network status listener to restart DataStore after the network comes back online. (#2148)
+
+### Miscellaneous
+- chore: Remove deprecated maven plugin (#2137)
+- chore: Remove Javadoc tasks (#2139)
+- Update README.md (#2120)
+- Dengdan stress test (#2153)
+- Feat(Auth Test): Custom party testing for Custom Test without SRP (#2149)
+- Unignore storage and pinpoint tests (#2156)
+- Update DeviceFarm build config (#2168)
+- Add Geo Rx Bindings (#2159)
+- chore: Re-add storage tests (#2163)
+- chore: Upgrade Gradle, AGP, and KtLint (#2172)
+- Add a buildspec file for nightly tests (#2180)
+- Chore(Auth): Implementation of the custom auth with SRP parity testing use case (#2167)
+
+### Bug fixes
+- fix(core): remove unused dynamic nav dependency (#2132)
+- fix(datastore): remove typename from ModelMetadata (#2122)
+- fix: Change order of updating state in local cache (#2141)
+- fix: fix integration test and added logger to integration test (#2143)
+- Fix for when move to idle state is called twice (#2152)
+- Fix(Auth): Sign up if successful should return DONE instead of Confirm sign up (#2130)
+- fix: Add missing apis in storage Kotlin & RxJava facade (#2160)
+- fix: user metadata was persisted empty in the database (#2165)
+- fix(geo): Increase Geo timeout so that it runs successfully on a Pixel 3a XL (#2177)
+
+[See all changes between 2.1.0 and 2.0.0](https://github.com/aws-amplify/amplify-android/compare/release_v2.0.0...release_v2.1.0)
+
 ## [Release 2.0.0](https://github.com/aws-amplify/amplify-android/releases/tag/release_v2.0.0)
 
 ###Breaking Changes

CHANGELOG.md

@@ -428,10 +428,20 @@ Copy-paste this, and complete the workflow in the UI. It will invite you to
 ### 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
+    - For a bugfix: `fix(category): description of changes`
+    - For a feature: `feat(catgory): add awesome feature`
+    - Everything else: `chore: fix build script`
+    - Valid categories are:
+      - all
+      - analytics
+      - api
+      - auth
+      - core
+      - datastore
+      - geo
+      - predictions
+      - storage
+    - 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.

CONTRIBUTING.md

@@ -24,7 +24,7 @@ Guide](https://docs.amplify.aws/start/q/integration/android).
 
 | Category                                                                                        | AWS Provider | Description                                |
 |-------------------------------------------------------------------------------------------------|--------------|--------------------------------------------|
-| **[Authentication](https://docs.amplify.aws/lib/devpreview/getting-started/q/platform/android/)**      | Cognito      | Building blocks to create auth experiences <br> *Note: Authentication category only supports **Sign Up**, **Sign In**, **Sign Out**, **Fetch Auth Session** and **getCurrentUser** API's.* |
+| **[Authentication](https://docs.amplify.aws/lib/devpreview/getting-started/q/platform/android/)**      | Cognito      | Building blocks to create auth experiences |
 | **[Storage](https://docs.amplify.aws/lib/storage/getting-started/q/platform/android)**          | S3           | Manages content in public, protected, private storage buckets |
 | **[DataStore](https://docs.amplify.aws/lib/datastore/getting-started/q/platform/android)**      | AppSync      | Programming model for shared and distributed data, with simple online/offline synchronization |
 | **[API (GraphQL)](https://docs.amplify.aws/lib/graphqlapi/getting-started/q/platform/android)** | AppSync      | Interact with your GraphQL or AppSync endpoint |
@@ -69,12 +69,12 @@ dependencies section:
 ```groovy
 dependencies {
     // Only specify modules that provide functionality your app will use
-    implementation 'com.amplifyframework:aws-analytics-pinpoint:2.0.0'
-    implementation 'com.amplifyframework:aws-api:2.0.0'
-    implementation 'com.amplifyframework:aws-auth-cognito:2.0.0'
-    implementation 'com.amplifyframework:aws-datastore:2.0.0'
-    implementation 'com.amplifyframework:aws-predictions:2.0.0'
-    implementation 'com.amplifyframework:aws-storage-s3:2.0.0'
+    implementation 'com.amplifyframework:aws-analytics-pinpoint:2.1.0'
+    implementation 'com.amplifyframework:aws-api:2.1.0'
+    implementation 'com.amplifyframework:aws-auth-cognito:2.1.0'
+    implementation 'com.amplifyframework:aws-datastore:2.1.0'
+    implementation 'com.amplifyframework:aws-predictions:2.1.0'
+    implementation 'com.amplifyframework:aws-storage-s3:2.1.0'
 }
 ```