backmerge for release 0.4.5 (#1526)

* fix: bumps ios version and bumps api AuthProvider timeout * chore(amplify_test): updated pubspec versions
aws-amplify · Apr 13, 2022 · ce9c4fa · ce9c4fa
1 parent ede97ea
commit ce9c4fa
Show file tree

Hide file tree

Showing 52 changed files with 159 additions and 79 deletions.
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -25,10 +25,10 @@ dependencies:
   flutter:
     sdk: flutter
   file_picker: ^4.0.0
-  amplify_flutter: 0.4.3
-  amplify_analytics_pinpoint: 0.4.3
-  amplify_auth_cognito: 0.4.3
-  amplify_storage_s3: 0.4.3
+  amplify_flutter: 0.4.5
+  amplify_analytics_pinpoint: 0.4.5
+  amplify_auth_cognito: 0.4.5
+  amplify_storage_s3: 0.4.5
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.3

diff --git a/packages/amplify/amplify_flutter/CHANGELOG.md b/packages/amplify/amplify_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 - fix(api): JNI issues (#1509)

diff --git a/packages/amplify/amplify_flutter/pubspec.yaml b/packages/amplify/amplify_flutter/pubspec.yaml
@@ -1,21 +1,21 @@
 name: amplify_flutter
 description: The top level Flutter package for the AWS Amplify libraries.
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify/amplify_flutter
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
   flutter: ">=2.0.0"
 
 dependencies:
-  amplify_analytics_plugin_interface: 0.4.4
-  amplify_api_plugin_interface: 0.4.4
-  amplify_auth_plugin_interface: 0.4.4
-  amplify_core: 0.4.4
-  amplify_datastore_plugin_interface: 0.4.4
-  amplify_flutter_android: 0.4.4
-  amplify_flutter_ios: 0.4.4
-  amplify_storage_plugin_interface: 0.4.4
+  amplify_analytics_plugin_interface: 0.4.5
+  amplify_api_plugin_interface: 0.4.5
+  amplify_auth_plugin_interface: 0.4.5
+  amplify_core: 0.4.5
+  amplify_datastore_plugin_interface: 0.4.5
+  amplify_flutter_android: 0.4.5
+  amplify_flutter_ios: 0.4.5
+  amplify_storage_plugin_interface: 0.4.5
   collection: ^1.15.0
   flutter:
     sdk: flutter

diff --git a/packages/amplify/amplify_flutter_android/CHANGELOG.md b/packages/amplify/amplify_flutter_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 - fix(api): JNI issues (#1509)

diff --git a/packages/amplify/amplify_flutter_android/pubspec.yaml b/packages/amplify/amplify_flutter_android/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_flutter_android
 description: The method channel implementation for amplify_flutter on Android
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify/amplify_flutter_android
 
 environment:

diff --git a/packages/amplify/amplify_flutter_ios/CHANGELOG.md b/packages/amplify/amplify_flutter_ios/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 - fix(api): JNI issues (#1509)

diff --git a/packages/amplify/amplify_flutter_ios/ios/amplify_flutter_ios.podspec b/packages/amplify/amplify_flutter_ios/ios/amplify_flutter_ios.podspec
@@ -17,9 +17,9 @@ Pod::Spec.new do |s|
   s.source = { :git => 'https://github.com/aws-amplify/amplify-flutter.git' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'Amplify', '1.22.3'
-  s.dependency 'AWSPluginsCore', '1.22.3'
-  s.dependency 'AmplifyPlugins/AWSCognitoAuthPlugin', '1.22.3'
+  s.dependency 'Amplify', '1.23.0'
+  s.dependency 'AWSPluginsCore', '1.23.0'
+  s.dependency 'AmplifyPlugins/AWSCognitoAuthPlugin', '1.23.0'
   s.dependency 'amplify_core'
   s.dependency 'SwiftLint'
   s.dependency 'SwiftFormat/CLI'

diff --git a/packages/amplify/amplify_flutter_ios/pubspec.yaml b/packages/amplify/amplify_flutter_ios/pubspec.yaml
@@ -1,14 +1,14 @@
 name: amplify_flutter_ios
 description: The method channel implementation for amplify_flutter on iOS
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify/amplify_flutter_ios
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
   flutter: ">=2.0.0"
 
 dependencies:
-  amplify_core: 0.4.4
+  amplify_core: 0.4.5
   flutter:
     sdk: flutter
 

diff --git a/packages/amplify_core/CHANGELOG.md b/packages/amplify_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 ## 0.4.3 (2022-04-02)

diff --git a/packages/amplify_core/pubspec.yaml b/packages/amplify_core/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_core
 description: The base package containing common types and utilities that are shared across the Amplify Flutter packages.
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_core
 
 environment:

diff --git a/packages/amplify_datastore/CHANGELOG.md b/packages/amplify_datastore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 ## 0.4.3 (2022-04-02)

diff --git a/packages/amplify_datastore/ios/amplify_datastore.podspec b/packages/amplify_datastore/ios/amplify_datastore.podspec
@@ -15,8 +15,8 @@ The DataStore module for Amplify Flutter.
   s.source = { :git => 'https://github.com/aws-amplify/amplify-flutter.git' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'Amplify', '1.22.3'
-  s.dependency 'AmplifyPlugins/AWSDataStorePlugin', '1.22.3'
+  s.dependency 'Amplify', '1.23.0'
+  s.dependency 'AmplifyPlugins/AWSDataStorePlugin', '1.23.0'
   s.dependency 'amplify_core'
   s.platform = :ios, '13.0'
 

diff --git a/packages/amplify_datastore/pubspec.yaml b/packages/amplify_datastore/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_datastore
 description: The Amplify Flutter DataStore category plugin, providing a queryable, on-device data store.
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_datastore
 
 environment:
@@ -10,8 +10,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  amplify_datastore_plugin_interface: 0.4.4
-  amplify_core: 0.4.4
+  amplify_datastore_plugin_interface: 0.4.5
+  amplify_core: 0.4.5
   plugin_platform_interface: ^2.0.0
   meta: ^1.1.8
   collection: ^1.14.13

diff --git a/packages/amplify_datastore_plugin_interface/CHANGELOG.md b/packages/amplify_datastore_plugin_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 ## 0.4.3 (2022-04-02)

diff --git a/packages/amplify_datastore_plugin_interface/pubspec.yaml b/packages/amplify_datastore_plugin_interface/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_datastore_plugin_interface
 description: The platform interface for the DataStore module of Amplify Flutter.
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_datastore_plugin_interface
 
 environment:
@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
   meta: ^1.3.0
   collection: ^1.15.0
-  amplify_core: 0.4.4
+  amplify_core: 0.4.5
 
 dev_dependencies:
   amplify_test:

diff --git a/packages/amplify_test/pubspec.yaml b/packages/amplify_test/pubspec.yaml
@@ -12,9 +12,9 @@ dependencies:
     path: ../amplify_core
   flutter:
     sdk: flutter
-  amplify_api: ^0.4.3
-  amplify_auth_cognito: ^0.4.3
-  amplify_flutter: ^0.4.3
+  amplify_api: ^0.4.5
+  amplify_auth_cognito: ^0.4.5
+  amplify_flutter: ^0.4.5
   stream_transform: ^2.0.0
 
 dev_dependencies:

diff --git a/packages/analytics/amplify_analytics_pinpoint/CHANGELOG.md b/packages/analytics/amplify_analytics_pinpoint/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 ## 0.4.3 (2022-04-02)

diff --git a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml
@@ -1,17 +1,17 @@
 name: amplify_analytics_pinpoint
 description: The Amplify Flutter Analytics category plugin using the AWS Pinpoint provider.
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/analytics/amplify_analytics_pinpoint
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
   flutter: ">=1.20.0"
 
 dependencies:
-  amplify_analytics_plugin_interface: 0.4.4
-  amplify_analytics_pinpoint_android: 0.4.4
-  amplify_analytics_pinpoint_ios: 0.4.4
-  amplify_core: 0.4.4
+  amplify_analytics_plugin_interface: 0.4.5
+  amplify_analytics_pinpoint_android: 0.4.5
+  amplify_analytics_pinpoint_ios: 0.4.5
+  amplify_core: 0.4.5
   flutter:
     sdk: flutter
   plugin_platform_interface: ^2.0.0

diff --git a/packages/analytics/amplify_analytics_pinpoint_android/CHANGELOG.md b/packages/analytics/amplify_analytics_pinpoint_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 ## 0.4.3 (2022-04-02)

diff --git a/packages/analytics/amplify_analytics_pinpoint_android/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint_android/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_analytics_pinpoint_android
 description: The method channel implementation for amplify_analytics_pinpoint on Android
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/analytics/amplify_analytics_pinpoint_android
 
 environment:

diff --git a/packages/analytics/amplify_analytics_pinpoint_ios/CHANGELOG.md b/packages/analytics/amplify_analytics_pinpoint_ios/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 ## 0.4.3 (2022-04-02)

diff --git a/packages/analytics/amplify_analytics_pinpoint_ios/ios/amplify_analytics_pinpoint_ios.podspec b/packages/analytics/amplify_analytics_pinpoint_ios/ios/amplify_analytics_pinpoint_ios.podspec
@@ -15,8 +15,8 @@ This code is the iOS part of the Amplify Flutter Pinpoint Analytics Plugin.  The
   s.source = { :git => 'https://github.com/aws-amplify/amplify-flutter.git' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'Amplify', '1.22.3'
-  s.dependency 'AmplifyPlugins/AWSPinpointAnalyticsPlugin', '1.22.3'
+  s.dependency 'Amplify', '1.23.0'
+  s.dependency 'AmplifyPlugins/AWSPinpointAnalyticsPlugin', '1.23.0'
   s.dependency 'amplify_core'
   s.platform = :ios, '11.0'
 

diff --git a/packages/analytics/amplify_analytics_pinpoint_ios/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint_ios/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_analytics_pinpoint_ios
 description: The method channel implementation for amplify_analytics_pinpoint on iOS
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/analytics/amplify_analytics_pinpoint_ios
 
 environment:

diff --git a/packages/analytics/amplify_analytics_plugin_interface/CHANGELOG.md b/packages/analytics/amplify_analytics_plugin_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 ## 0.4.3 (2022-04-02)

diff --git a/packages/analytics/amplify_analytics_plugin_interface/pubspec.yaml b/packages/analytics/amplify_analytics_plugin_interface/pubspec.yaml
@@ -1,13 +1,13 @@
 name: amplify_analytics_plugin_interface
 description: The platform interface for the analytics module of Amplify Flutter.
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/analytics/amplify_analytics_plugin_interface
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
-  amplify_core: 0.4.4
+  amplify_core: 0.4.5
   flutter:
     sdk: flutter
   meta: ^1.1.8

diff --git a/packages/api/amplify_api/CHANGELOG.md b/packages/api/amplify_api/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 - fix(api): JNI issues (#1509)

diff --git a/packages/api/amplify_api/pubspec.yaml b/packages/api/amplify_api/pubspec.yaml
@@ -1,17 +1,17 @@
 name: amplify_api
 description: The Amplify Flutter API category plugin, supporting GraphQL and REST operations.
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_api
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
   flutter: ">=1.20.0"
 
 dependencies:
-  amplify_api_plugin_interface: 0.4.4
-  amplify_core: 0.4.4
-  amplify_api_android: 0.4.4
-  amplify_api_ios: 0.4.4
+  amplify_api_plugin_interface: 0.4.5
+  amplify_core: 0.4.5
+  amplify_api_android: 0.4.5
+  amplify_api_ios: 0.4.5
   collection: ^1.15.0
   flutter:
     sdk: flutter

diff --git a/...oid/android/src/main/kotlin/com/amazonaws/amplify/amplify_api/auth/FlutterAuthProvider.kt b/...oid/android/src/main/kotlin/com/amazonaws/amplify/amplify_api/auth/FlutterAuthProvider.kt
@@ -40,7 +40,7 @@ class FlutterAuthProviders(
         /**
          * Timeout on a single [getToken] call.
          */
-        const val getTokenTimeoutMillis = 2000L
+        const val getTokenTimeoutMillis = 5000L
 
         /**
          * Logger tag.

diff --git a/packages/api/amplify_api_android/pubspec.yaml b/packages/api/amplify_api_android/pubspec.yaml
@@ -1,6 +1,6 @@
 name: amplify_api_android
 description: The method channel implementation for amplify_api on Android
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/api/amplify_api_android
 
 environment:

diff --git a/packages/api/amplify_api_ios/ios/Classes/Auth/FlutterAuthProvider.swift b/packages/api/amplify_api_ios/ios/Classes/Auth/FlutterAuthProvider.swift
@@ -64,7 +64,7 @@ class FlutterAuthProviders: APIAuthProviderFactory {
                 }
             }
 
-            let timeout: DispatchTimeInterval = .seconds(2)
+            let timeout: DispatchTimeInterval = .seconds(5)
             let waitResult = completer.wait(timeout: .now() + timeout)
             if waitResult == .timedOut {
                 token = .failure(APIError.operationError(

diff --git a/packages/api/amplify_api_ios/ios/amplify_api_ios.podspec b/packages/api/amplify_api_ios/ios/amplify_api_ios.podspec
@@ -15,8 +15,8 @@ The API module for Amplify Flutter.
   s.source           = { :git => 'https://github.com/aws-amplify/amplify-flutter.git' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'Amplify', '1.22.3'
-  s.dependency 'AmplifyPlugins/AWSAPIPlugin', '1.22.3'
+  s.dependency 'Amplify', '1.23.0'
+  s.dependency 'AmplifyPlugins/AWSAPIPlugin', '1.23.0'
   s.dependency 'amplify_core'
   s.platform = :ios, '11.0'
 

diff --git a/packages/api/amplify_api_ios/pubspec.yaml b/packages/api/amplify_api_ios/pubspec.yaml
@@ -1,14 +1,14 @@
 name: amplify_api_ios
 description: The method channel implementation for amplify_api on iOS
-version: 0.4.4
+version: 0.4.5
 homepage: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/api/amplify_api_ios
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
   flutter: ">=1.20.0"
 
 dependencies:
-  amplify_core: 0.4.4
+  amplify_core: 0.4.5
   flutter:
     sdk: flutter
 

diff --git a/packages/api/amplify_api_plugin_interface/CHANGELOG.md b/packages/api/amplify_api_plugin_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5 (2022-04-13)
+
+-fix: bumps ios version and bumps api AuthProvider timeout (#1526)
+
 ## 0.4.4 (2022-04-06)
 
 - fix(api): JNI issues (#1509)