Merge from main

aws-amplify · Sep 11, 2020 · 47d5702 · 47d5702
2 parents 84a5fb6 + 50dc83c
commit 47d5702
Show file tree

Hide file tree

Showing 61 changed files with 1,184 additions and 152 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,29 @@
     - `getTokens()` was making a network call every time it was used, negating any benefit of cached tokens. Removed 
     the unnecessary network call so it now correctly returns cached tokens when available with no network call (Issue #1722)
 
+## [Release 2.17.1](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.17.1)
+
+### Bug fixes
+ - Resolves `UnsupportedOperationException` while passing client
+   metadata to signUp and signIn auth APIs
+
+### Updated Service Models
+ - SNS
+   - Documentation updates
+ - Transcribe
+   - Support Medical use cases
+ - Lex
+   - Updates to NLU confidence
+
+### Miscellaneous Updates
+ - Update third-party dependency versions
+  - AndroidX Core 1.3.1
+  - Paho MQTT Client 1.2.5
+  - Google Play Services Auth 18.1.0
+  - Android Gradle Plugin 4.0.1
+
+ - Allow override of User Agent in the AWSMobileClient
+
 ## [Release 2.17.0](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.17.0)
 
 *Version 2.17.0 introduces breaking changes against 2.16.13.*

diff --git a/aws-android-sdk-apigateway-core/build.gradle b/aws-android-sdk-apigateway-core/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-apigateway-test/build.gradle b/aws-android-sdk-apigateway-test/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 14 // junit ext
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 }

diff --git a/aws-android-sdk-auth-core/build.gradle b/aws-android-sdk-auth-core/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-auth-facebook/build.gradle b/aws-android-sdk-auth-facebook/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14 // v4 support, brought from facebook sdk
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-auth-google/build.gradle b/aws-android-sdk-auth-google/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14 // gms auth brought by google sdk
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-auth-ui/build.gradle b/aws-android-sdk-auth-ui/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14 // appcompat
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-auth-userpools/build.gradle b/aws-android-sdk-auth-userpools/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14 // setAllCaps(), 11 otherwise
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-cloudwatch/build.gradle b/aws-android-sdk-cloudwatch/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-cognito/build.gradle b/aws-android-sdk-cognito/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/...id-sdk-cognito/src/main/resources/fabric/com.amazonaws.aws-android-sdk-cognito.properties b/...id-sdk-cognito/src/main/resources/fabric/com.amazonaws.aws-android-sdk-cognito.properties
@@ -1,3 +1,3 @@
 fabric-identifier=com.amazonaws.aws-android-sdk-cognito
-fabric-version=2.17.0
+fabric-version=2.18.0
 fabric-build-type=binary
diff --git a/aws-android-sdk-cognitoauth/build.gradle b/aws-android-sdk-cognitoauth/build.gradle
@@ -9,6 +9,10 @@ android {
         targetSdkVersion 29
         versionCode 1
         versionName '1.0'
+
+        manifestPlaceholders = [
+                'authRedirectScheme': 'FOR_LIBRARY_CONSUMER_TO_OVERRIDE'
+        ]
     }
 
     compileOptions {

diff --git a/aws-android-sdk-cognitoidentityprovider-test/build.gradle b/aws-android-sdk-cognitoidentityprovider-test/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14 // junit ext
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 

diff --git a/aws-android-sdk-cognitoidentityprovider/build.gradle b/aws-android-sdk-cognitoidentityprovider/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 
     testOptions.unitTests.includeAndroidResources = true

diff --git a/aws-android-sdk-comprehend/build.gradle b/aws-android-sdk-comprehend/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-connect/build.gradle b/aws-android-sdk-connect/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-connectparticipant/build.gradle b/aws-android-sdk-connectparticipant/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-core-test/build.gradle b/aws-android-sdk-core-test/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14 // junit ext
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 }

diff --git a/aws-android-sdk-core/build.gradle b/aws-android-sdk-core/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
 
         consumerProguardFiles 'consumer-proguard-rules.pro'
     }

diff --git a/aws-android-sdk-core/src/main/java/com/amazonaws/util/VersionInfoUtils.java b/aws-android-sdk-core/src/main/java/com/amazonaws/util/VersionInfoUtils.java
@@ -26,7 +26,7 @@ public class VersionInfoUtils {
     private static final int DEFAULT_STRING_LENGTH = 128;
 
     /** SDK version info */
-    private static volatile String version = "2.17.0";
+    private static volatile String version = "2.18.0";
                                                                 // changed build
                                                                 // logic
 

diff --git a/aws-android-sdk-core/src/main/resources/fabric/com.amazonaws.aws-android-sdk-core.properties b/aws-android-sdk-core/src/main/resources/fabric/com.amazonaws.aws-android-sdk-core.properties
@@ -1,3 +1,3 @@
 fabric-identifier=com.amazonaws.aws-android-sdk-core
-fabric-version=2.17.0
+fabric-version=2.18.0
 fabric-build-type=binary
diff --git a/aws-android-sdk-core/src/test/java/com/amazonaws/util/VersionInfoUtilsTest.java b/aws-android-sdk-core/src/test/java/com/amazonaws/util/VersionInfoUtilsTest.java
@@ -24,7 +24,7 @@ public class VersionInfoUtilsTest {
 
     @Test
     public void getVersion() {
-        assertEquals("2.17.0", VersionInfoUtils.getVersion());
+        assertEquals("2.18.0", VersionInfoUtils.getVersion());
     }
 
     @Test

diff --git a/aws-android-sdk-ddb-document/build.gradle b/aws-android-sdk-ddb-document/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-ddb-mapper/build.gradle b/aws-android-sdk-ddb-mapper/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-ddb/build.gradle b/aws-android-sdk-ddb/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-ec2/build.gradle b/aws-android-sdk-ec2/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-iot-test/build.gradle b/aws-android-sdk-iot-test/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 14 // junit ext
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         testInstrumentationRunnerArguments(['notClass': 'org.conscrypt.KitKatPlatformOpenSSLSocketImplAdapter'])
     }

diff --git a/aws-android-sdk-iot/build.gradle b/aws-android-sdk-iot/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-kinesis/build.gradle b/aws-android-sdk-kinesis/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-kinesisvideo-archivedmedia/build.gradle b/aws-android-sdk-kinesisvideo-archivedmedia/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 21 // for kinesisvideo, which uses camera2 APIs.
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 
     packagingOptions {

diff --git a/aws-android-sdk-kinesisvideo-signaling/build.gradle b/aws-android-sdk-kinesisvideo-signaling/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 }
 

diff --git a/aws-android-sdk-kinesisvideo/build.gradle b/aws-android-sdk-kinesisvideo/build.gradle
@@ -6,10 +6,10 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        minSdkVersion 21 // android.hardware.camera2
+        minSdkVersion 24 // https://developer.android.com/reference/javax/net/ssl/X509ExtendedTrustManager
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode 21800
+        versionName '2.18.0'
     }
 
     packagingOptions {
@@ -24,5 +24,6 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
     //noinspection DuplicatePlatformClasses
     compileOnly 'org.apache.httpcomponents:httpclient:4.5.12'
+    testImplementation 'junit:junit:4.13'
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ public class VersionInfoUtilsTest { @@
         @Test
         public void getVersion() {
-            assertEquals("2.17.0", VersionInfoUtils.getVersion());
+            assertEquals("2.18.0", VersionInfoUtils.getVersion());
         }
         @Test
@@ Expand Down @@