Skip to content

Commit

Permalink
Staging release 2.12.5 (#793)
Browse files Browse the repository at this point in the history
* Secure information stored in SharedPreferences

* Lower aws-android-sdk-core-test compile and target sdk version to 27

* Add a symlink to android-23.jar for core

* Add a gradle task that creates a symlink to android-23.jar for AWS Core

* Fix the gradle task that creates symbolic link to android-23.jar

* Change config.yml to setup android-23

* Enable core, cognitoidentityprovider and cognitoauth integration tests on CircleCI

* Enable core, cognitoidentityprovider and cognitoauth integration tests on CircleCI

* Fix pom.xml

* Improve exception handling in AWSKeyValueStore

* [2.12.3] Bump the patch version of 2.12.z

* Update 2.12.3 CHANGELOG

* Add the missing bucket prefixes to CleanupBucketIntegrationTests

* Fix a bug where migrating expirationDate in CognitoCachingCredentialsProvider crashes

* [2.12.4] Update changelog and bump version

* Annotate code specific to API Level 23 and above in AWSKeyValueStore

* Added API to accept key-value pairs which are appended to the connection username (#765)

The connection username is used as user metadata by the service for the purpose of metrics calculation.

* build android sdk with android-10 (#782)

* Add sign out options

* [MobileClient] Cleanup javadocs and remove unnecessary try..catch blocks

* [MobileClient] Add developer authenticated identities to federatedSignIn fixes #577

* [MobileClient] Add test for developer authenticated idenities federatedSignIn

* [MobileClient] Persist identity id for developer authenticated identities

* [MobileClient] Add AWSMobileClient as client usage tracker in user agent

* [MobileClient] Add device operations; Add error message to ReturningRunnable

* [MobileClient] Add global sign-out functionality

* [MobileClient] Add custom role arn to settings in federated sign-in persistence

* [MobileClient] Add forgot password test; Fix sign out globally test

* [MobileClient] [Userpools] [CognitoAuth] Add HostedUI and OAuth 2.0 code grant flow support

[MobileClient]
Add HostedUI and OAuth 2.0 code grant flow support

[Userpools]
Fix threading issues reported in issue #722

[CognitoAuth]
Added methods to reset AuthHandler and get session without launching UI
Fix erroneous user cancelled when redirecting back to app fixes #328

* [MobileClient] Fix multiple adds of SignInProvider to provider list fixes #766

* [MobileClient] Fix git merge issues

* [MobileClient] Fix integration tests for new configuration

* [CognitoAuth] Fix NPE when ASF feature turned off

* [MobileClient] Finalize APIs before release, add persistence flag to OAuth 2.0 and HostedUI features

* [AuthSDKs] Update maven repositories in pom to maven.google.com

* [Core] Fix NPE when setting persistence in AWSKeyValueStore after initialization

* [MobileClient] Ignore manual tests in automation

* [MobileClient] Ignore drop-in UI test due to timeout; Default OAuth 2.0 client to persist

* Fix the transition between persistence enabled and disabled in AWSKeyValueStore

* Enable core, cognitoidentityprovider and cognitoauth integration tests on CircleCI

* Update changelog for 2.12.5; Add mobile client; Remove IoT metrics

* Skip reserved keynames (#791)

* Skip reserved keynames

* Add log when reserved key names are encountered

* Bump version 2.12.5 (#792)
  • Loading branch information
minbi authored and Karthikeyan committed Mar 14, 2019
1 parent 50311c3 commit 39c4049
Show file tree
Hide file tree
Showing 100 changed files with 4,470 additions and 599 deletions.
70 changes: 70 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,38 @@ jobs:
key: Libs-{{ .Revision }}
paths:
- lib
build_api10:
working_directory: ~/code
docker:
- image: circleci/android:api-27-alpha
environment:
JVM_OPTS: -Xmx3200m
steps:
- checkout
- generate_gradle_wrapper
- run:
name: download android-10
command:
sudo yes | sdkmanager "platforms;android-10"
- run:
name: install python3-pip
command: |
sudo apt-get update
sudo apt-get -y install python3-pip
- run:
name: install json parser
command: sudo pip3 install demjson
- run:
name: update code for api10
command: |
python3 CircleciScripts/replace_android10.py "$(pwd)"
rm aws-android-sdk-core/src/main/java/com/amazonaws/internal/keyvaluestore/KeyProvider18.java
rm aws-android-sdk-core/src/main/java/com/amazonaws/internal/keyvaluestore/KeyProvider23.java
cat aws-android-sdk-core/src/main/java/com/amazonaws/internal/keyvaluestore/AWSKeyValueStore.java
- run:
name: build the whole project
command: |
bash gradlew :aws-android-sdk-core:build -x test
unittest:
working_directory: ~/code
Expand Down Expand Up @@ -640,6 +672,7 @@ workflows:
build_test:
jobs:
- build
- build_api10
- unittest
- pre_integrationtest:
filters:
Expand Down Expand Up @@ -921,6 +954,12 @@ workflows:
ignore: /.*/
tags:
only: /^(release|beta)_v[0-9]+.[0-9]+.[0-9]+$/
- build_api10:
filters:
branches:
ignore: /.*/
tags:
only: /^(release|beta)_v[0-9]+.[0-9]+.[0-9]+$/
- unittest:
filters:
branches:
Expand Down Expand Up @@ -1134,6 +1173,36 @@ workflows:
ignore: /.*/
tags:
only: /^(release|beta)_v[0-9]+.[0-9]+.[0-9]+$/
- integrationtest:
name: CognitoIdentityProvider
testmodule: aws-android-sdk-cognitoidentityprovider-test
requires:
- pre_integrationtest
filters:
branches:
ignore: /.*/
tags:
only: /^(release|beta)_v[0-9]+.[0-9]+.[0-9]+$/
- integrationtest:
name: Core
testmodule: aws-android-sdk-core-test
requires:
- pre_integrationtest
filters:
branches:
ignore: /.*/
tags:
only: /^(release|beta)_v[0-9]+.[0-9]+.[0-9]+$/
- integrationtest:
name: CognitoAuth
testmodule: aws-android-sdk-cognitoauth
requires:
- pre_integrationtest
filters:
branches:
ignore: /.*/
tags:
only: /^(release|beta)_v[0-9]+.[0-9]+.[0-9]+$/
# - integrationtest:
# name: kinesisvideo
# testmodule: aws-android-sdk-kinesisvideo
Expand Down Expand Up @@ -1199,6 +1268,7 @@ workflows:
requires:
- unittest
- post_integrationtest
- build_api10
filters:
branches:
ignore: /.*/
Expand Down
27 changes: 26 additions & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Change Log - AWS SDK for Android

## [Release 2.12.5](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.12.5)

### New Features

* **AWS Mobile Client**
* Added support for SAML in `federatedSignIn()`.
* Added support for developer authenticated identities in `federatedSignIn()`. See [issue #577](https://github.com/aws-amplify/aws-sdk-android/issues/577)
* Added support Cognito Hosted UI in `showSignIn()`.
* Added support to use OAuth 2.0 provider like `Auth0` in `showSignIn()`. Federation for AWS credentials requires OpenID support from the provider.
* Added support for global sign out.
* Added support for device features which include `list`, `get`, `updateStatus` and `forget`. These APIs are available through `getDeviceOperations()`.

* **Amazon Cognito Identity Provider**
* Fixed threading issues to ensure callbacks are made from main looper when `xInBackground()` method variants are used. See [issue #722](https://github.com/aws-amplify/aws-sdk-android/issues/722)

* **Amazon Cognito Auth**
* Fixed erroneous user cancelled error when redirecting back to app. See [issue #328](https://github.com/aws-amplify/aws-sdk-android/issues/328)

## [Release 2.12.4](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.12.4)

* **AWS Core**
Expand Down
44 changes: 44 additions & 0 deletions CircleciScripts/replace_android10.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
from utils import replacefiles
import demjson
import sys
import re
import os
root = sys.argv[1]

replaces = [
{
"match" : 'android-23',
"replace" : 'android-10',
"files" : [
"aws-android-sdk-core/build.gradle"
]
} ,
{
"match" : 'android-23.jar',
"replace" : 'android-10.jar',
"files" : [
"aws-android-sdk-core/build.gradle"
]
} ,
]
replacefiles(root, replaces)




AWSKeyValueStoreFile = os.path.join(root,"aws-android-sdk-core/src/main/java/com/amazonaws/internal/keyvaluestore/AWSKeyValueStore.java")
newcontent = ""
with open(AWSKeyValueStoreFile, 'r') as myfile:
content = myfile.read()
pattern = r'//@apiLevel23Start[\s\S]*?//@apiLevel23End'
repl = r""
newcontent = re.sub(pattern, repl, content)


pattern = r'//@apiLevel18Start[\s\S]*?//@apiLevel18End'
repl = r""
newcontent = re.sub(pattern, repl, newcontent)
with open(AWSKeyValueStoreFile,"w") as myfile:
myfile.write(newcontent)


4 changes: 2 additions & 2 deletions aws-android-sdk-apigateway-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-android-sdk-pom</artifactId>
<version>2.12.4</version>
<version>2.12.5</version>
</parent>

<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-android-sdk-core</artifactId>
<optional>false</optional>
<version>2.12.4</version>
<version>2.12.5</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions aws-android-sdk-auth-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-android-sdk-pom</artifactId>
<version>2.12.4</version>
<version>2.12.5</version>
</parent>

<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-android-sdk-core</artifactId>
<optional>false</optional>
<version>2.12.4</version>
<version>2.12.5</version>
</dependency>

<dependency>
Expand Down
8 changes: 4 additions & 4 deletions aws-android-sdk-auth-facebook/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-android-sdk-pom</artifactId>
<version>2.12.4</version>
<version>2.12.5</version>
</parent>

<repositories>
<repository>
<id>android-support</id>
<url>file://${env.ANDROID_HOME}/extras/android/m2repository/</url>
<id>google-maven</id>
<url>https://maven.google.com</url>
</repository>
</repositories>

Expand All @@ -36,7 +36,7 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-android-sdk-auth-core</artifactId>
<optional>false</optional>
<version>2.12.4</version>
<version>2.12.5</version>
<type>aar</type>
</dependency>
<dependency>
Expand Down
12 changes: 4 additions & 8 deletions aws-android-sdk-auth-google/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,13 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-android-sdk-pom</artifactId>
<version>2.12.4</version>
<version>2.12.5</version>
</parent>

<repositories>
<repository>
<id>android-support</id>
<url>file://${env.ANDROID_HOME}/extras/android/m2repository/</url>
</repository>
<repository>
<id>google-android-gms</id>
<url>file://${env.ANDROID_HOME}/extras/google/m2repository/</url>
<id>google-maven</id>
<url>https://maven.google.com</url>
</repository>
</repositories>

Expand All @@ -40,7 +36,7 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-android-sdk-auth-core</artifactId>
<optional>false</optional>
<version>2.12.4</version>
<version>2.12.5</version>
<type>aar</type>
</dependency>

Expand Down
Loading

0 comments on commit 39c4049

Please sign in to comment.