Skip to content

Commit 9c672e5

Browse files
tjleingtjleing
authored
Merge branch 'main' into leint/fix-list-plural-name-v2
2 parents b9487a8 + a3f7890 commit 9c672e5

File tree

141 files changed

+5025
-736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+5025
-736
lines changed

‎.github/ISSUE_TEMPLATE/1.bug_report.yaml

+17-15
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@ body:
1414
<details>
1515
<summary>Click to expand package version list</summary>
1616
17-
| Package | Version |
18-
| ---------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
19-
| `com.amplifyframework:aws-analytics-pinpoint` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-analytics-pinpoint) |
20-
| `com.amplifyframework:aws-api` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-api) |
21-
| `com.amplifyframework:aws-api-appsync` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-api-appsync) |
22-
| `com.amplifyframework:aws-auth-cognito` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-auth-cognito) |
23-
| `com.amplifyframework:aws-datastore` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-datastore) |
24-
| `com.amplifyframework:aws-geo-location` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-geo-location) |
25-
| `com.amplifyframework:maplibre-adapter` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/maplibre-adapter) |
26-
| `com.amplifyframework:aws-storage-s3` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-storage-s3) |
27-
| `com.amplifyframework:aws-predictions` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-predictions) |
28-
| `com.amplifyframework:aws-predictions-tensorflow` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-predictions-tensorflow) |
29-
| `com.amplifyframework:core` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/core) |
30-
| `com.amplifyframework:core-kotlin` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/core-kotlin) |
31-
| `com.amplifyframework:rxbindings` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/rxbindings) |
17+
| Package | Version |
18+
| ------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------- |
19+
| `com.amplifyframework:aws-analytics-pinpoint` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-analytics-pinpoint) |
20+
| `com.amplifyframework:aws-api` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-api) |
21+
| `com.amplifyframework:aws-api-appsync` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-api-appsync) |
22+
| `com.amplifyframework:aws-auth-cognito` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-auth-cognito) |
23+
| `com.amplifyframework:aws-datastore` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-datastore) |
24+
| `com.amplifyframework:aws-geo-location` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-geo-location) |
25+
| `com.amplifyframework:maplibre-adapter` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/maplibre-adapter) |
26+
| `com.amplifyframework:aws-storage-s3` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-storage-s3) |
27+
| `com.amplifyframework:aws-predictions` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-predictions) |
28+
| `com.amplifyframework:aws-predictions-tensorflow` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-predictions-tensorflow) |
29+
| `com.amplifyframework:aws-push-notifications-pinpoint` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-push-notifications-pinpoint) |
30+
| `com.amplifyframework:core` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/core) |
31+
| `com.amplifyframework:core-kotlin` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/core-kotlin) |
32+
| `com.amplifyframework:rxbindings` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/rxbindings) |
3233
3334
</details>
3435
@@ -72,6 +73,7 @@ body:
7273
- Geo
7374
- Storage
7475
- Predictions
76+
- Notifications
7577
- Not applicable
7678
validations:
7779
required: true

‎.github/ISSUE_TEMPLATE/2.feature_report.yaml

+17-15
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@ body:
1414
<details>
1515
<summary>Click to expand package version list</summary>
1616
17-
| Package | Version |
18-
| ---------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
19-
| `com.amplifyframework:aws-analytics-pinpoint` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-analytics-pinpoint) |
20-
| `com.amplifyframework:aws-api` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-api) |
21-
| `com.amplifyframework:aws-api-appsync` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-api-appsync) |
22-
| `com.amplifyframework:aws-auth-cognito` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-auth-cognito) |
23-
| `com.amplifyframework:aws-datastore` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-datastore) |
24-
| `com.amplifyframework:aws-geo-location` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-geo-location) |
25-
| `com.amplifyframework:maplibre-adapter` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/maplibre-adapter) |
26-
| `com.amplifyframework:aws-storage-s3` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-storage-s3) |
27-
| `com.amplifyframework:aws-predictions` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-predictions) |
28-
| `com.amplifyframework:aws-predictions-tensorflow` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-predictions-tensorflow) |
29-
| `com.amplifyframework:core` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/core) |
30-
| `com.amplifyframework:core-kotlin` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/core-kotlin) |
31-
| `com.amplifyframework:rxbindings` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/rxbindings) |
17+
| Package | Version |
18+
| ------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------- |
19+
| `com.amplifyframework:aws-analytics-pinpoint` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-analytics-pinpoint) |
20+
| `com.amplifyframework:aws-api` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-api) |
21+
| `com.amplifyframework:aws-api-appsync` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-api-appsync) |
22+
| `com.amplifyframework:aws-auth-cognito` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-auth-cognito) |
23+
| `com.amplifyframework:aws-datastore` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-datastore) |
24+
| `com.amplifyframework:aws-geo-location` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-geo-location) |
25+
| `com.amplifyframework:maplibre-adapter` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/maplibre-adapter) |
26+
| `com.amplifyframework:aws-storage-s3` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-storage-s3) |
27+
| `com.amplifyframework:aws-predictions` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-predictions) |
28+
| `com.amplifyframework:aws-predictions-tensorflow` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-predictions-tensorflow) |
29+
| `com.amplifyframework:aws-push-notifications-pinpoint` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/aws-push-notifications-pinpoint) |
30+
| `com.amplifyframework:core` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/core) |
31+
| `com.amplifyframework:core-kotlin` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/core-kotlin) |
32+
| `com.amplifyframework:rxbindings` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework/rxbindings) |
3233
3334
</details>
3435
@@ -72,6 +73,7 @@ body:
7273
- Geo
7374
- Storage
7475
- Predictions
76+
- Notifications
7577
- Not applicable
7678
validations:
7779
required: true

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
},
66
"CHECKS": {
77
"prefixes": ["chore: ", "refactor: ", "perf: ", "test: ", "docs: ", "release: "],
8-
"regexp": "(fix|feat)\\((all|analytics|api|auth|core|datastore|geo|predictions|storage)\\): ",
8+
"regexp": "(fix|feat)\\((all|analytics|api|auth|core|datastore|geo|predictions|storage|notifications)\\): ",
99
"regexpFlags": "",
1010
"ignoreLabels" : ["ignore-pr-title"]
1111
},

‎CHANGELOG.md

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
## [Release 2.5.0](https://github.com/aws-amplify/amplify-android/releases/tag/release_v2.5.0)
2+
3+
### Features
4+
- **notifications:** add push notifications category and plugin ([#2336](https://github.com/aws-amplify/amplify-android/pull/2336))
5+
6+
[See all changes between 2.4.1 and 2.5.0](https://github.com/aws-amplify/amplify-android/compare/release_v2.4.1...release_v2.5.0)
7+
8+
## [Release 2.4.1](https://github.com/aws-amplify/amplify-android/releases/tag/release_v2.4.1)
9+
10+
### Bug Fixes
11+
- **auth:** Add hosted ui error description on token failure ([#2338](https://github.com/aws-amplify/amplify-android/issues/2338))
12+
- **api:** Use instr() for beginswith checking v2 ([#2347](https://github.com/aws-amplify/amplify-android/issues/2347))
13+
14+
[See all changes between 2.4.0 and 2.4.1](https://github.com/aws-amplify/amplify-android/compare/release_v2.4.0...release_v2.4.1)
15+
116
## [Release 2.4.0](https://github.com/aws-amplify/amplify-android/releases/tag/release_v2.4.0)
217

318
### Features

‎README.md

+19-15
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,17 @@ Guide](https://docs.amplify.aws/start/q/integration/android).
2222

2323
## Categories
2424

25-
| Category | AWS Provider | Description |
26-
|-------------------------------------------------------------------------------------------------|--------------|--------------------------------------------|
27-
| **[Authentication](https://docs.amplify.aws/lib/devpreview/getting-started/q/platform/android/)** | Cognito | Building blocks to create auth experiences |
28-
| **[Storage](https://docs.amplify.aws/lib/storage/getting-started/q/platform/android)** | S3 | Manages content in public, protected, private storage buckets |
29-
| **[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 |
30-
| **[API (GraphQL)](https://docs.amplify.aws/lib/graphqlapi/getting-started/q/platform/android)** | AppSync | Interact with your GraphQL or AppSync endpoint |
31-
| **[API (REST)](https://docs.amplify.aws/lib/restapi/getting-started/q/platform/android)** | API Gateway | Sigv4 signing and AWS auth for API Gateway and other REST endpoints |
32-
| **[Analytics](https://docs.amplify.aws/lib/analytics/getting-started/q/platform/android)** | Pinpoint | Collect Analytics data for your app including tracking user sessions |
33-
| **[Predictions](https://docs.amplify.aws/lib/predictions/getting-started/q/platform/android)** | Various* | Connect your app with machine learning services like NLP, computer vision, TTS, and more. |
25+
| Category | AWS Provider | Description |
26+
|--------------------------------------------------------------------------------------------------|--------------|-----------------------------------------------------------------------------------------------|
27+
| **[Authentication](https://docs.amplify.aws/lib/devpreview/getting-started/q/platform/android)** | Cognito | Building blocks to create auth experiences |
28+
| **[Storage](https://docs.amplify.aws/lib/storage/getting-started/q/platform/android)** | S3 | Manages content in public, protected, private storage buckets |
29+
| **[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 |
30+
| **[API (GraphQL)](https://docs.amplify.aws/lib/graphqlapi/getting-started/q/platform/android)** | AppSync | Interact with your GraphQL or AppSync endpoint |
31+
| **[API (REST)](https://docs.amplify.aws/lib/restapi/getting-started/q/platform/android)** | API Gateway | Sigv4 signing and AWS auth for API Gateway and other REST endpoints |
32+
| **[Analytics](https://docs.amplify.aws/lib/analytics/getting-started/q/platform/android)** | Pinpoint | Collect Analytics data for your app including tracking user sessions |
33+
| **[Geo](https://docs.amplify.aws/lib/geo/getting-started/q/platform/android)** | Location | Add maps to your app with APIs and map UI components |
34+
| **[Predictions](https://docs.amplify.aws/lib/predictions/getting-started/q/platform/android)** | Various* | Connect your app with machine learning services like NLP, computer vision, TTS, and more. |
35+
| **Push Notifications** | Pinpoint | Segment users, trigger push notifications, and record metrics |
3436

3537
\* Predictions utilizes a range of Amazon's Machine Learning services,
3638
including: Amazon Comprehend, Amazon Polly, Amazon Rekognition, Amazon
@@ -69,12 +71,14 @@ dependencies section:
6971
```groovy
7072
dependencies {
7173
// Only specify modules that provide functionality your app will use
72-
implementation 'com.amplifyframework:aws-analytics-pinpoint:2.4.0'
73-
implementation 'com.amplifyframework:aws-api:2.4.0'
74-
implementation 'com.amplifyframework:aws-auth-cognito:2.4.0'
75-
implementation 'com.amplifyframework:aws-datastore:2.4.0'
76-
implementation 'com.amplifyframework:aws-predictions:2.4.0'
77-
implementation 'com.amplifyframework:aws-storage-s3:2.4.0'
74+
implementation 'com.amplifyframework:aws-analytics-pinpoint:2.5.0'
75+
implementation 'com.amplifyframework:aws-api:2.5.0'
76+
implementation 'com.amplifyframework:aws-auth-cognito:2.5.0'
77+
implementation 'com.amplifyframework:aws-datastore:2.5.0'
78+
implementation 'com.amplifyframework:aws-predictions:2.5.0'
79+
implementation 'com.amplifyframework:aws-storage-s3:2.5.0'
80+
implementation 'com.amplifyframework:aws-geo-location:2.5.0'
81+
implementation 'com.amplifyframework:aws-push-notifications-pinpoint:2.5.0'
7882
}
7983
```
8084

‎annotations/src/main/java/com/amplifyframework/annotations/InternalAmplifyApi.kt

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package com.amplifyframework.annotations
17+
18+
/**
19+
* API marked with this annotation is internal to Amplify, and it is not intended to be used outside.
20+
* It could be modified or removed without any notice.
21+
*
22+
* We strongly recommend to not use such API.
23+
*/
24+
@Suppress("DEPRECATION")
25+
@RequiresOptIn(
26+
level = RequiresOptIn.Level.ERROR,
27+
message = "This API is internal to Amplify and should not be used. It could be removed or changed without notice.",
28+
)
29+
@Target(
30+
AnnotationTarget.CLASS,
31+
AnnotationTarget.TYPEALIAS,
32+
AnnotationTarget.FUNCTION,
33+
AnnotationTarget.PROPERTY,
34+
AnnotationTarget.FIELD,
35+
AnnotationTarget.CONSTRUCTOR,
36+
)
37+
public annotation class InternalAmplifyApi

0 commit comments

Comments
 (0)