diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yaml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yaml index dc36357f3c..de66f6cece 100644 --- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yaml +++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yaml @@ -79,7 +79,7 @@ body: attributes: label: "Flutter Version" description: "Please share which version of Flutter you're using (found using `flutter --version`)." - placeholder: "3.24.0" + placeholder: "3.27.0" validations: required: true - type: input diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml index a10c62f8cd..c70a2104e1 100644 --- a/.github/workflows/actions.yaml +++ b/.github/workflows/actions.yaml @@ -31,7 +31,7 @@ jobs: - name: Setup Dart uses: dart-lang/setup-dart@e58aeb62aef51dcc4d0ba8eada7c08092aad5314 # main with: - sdk: 3.3.0 + sdk: 3.6.0 - name: Setup pnpm uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # 4.0.0 @@ -63,7 +63,7 @@ jobs: - name: Setup Dart uses: dart-lang/setup-dart@e58aeb62aef51dcc4d0ba8eada7c08092aad5314 # main with: - sdk: 3.3.0 + sdk: 3.6.0 - name: Setup aft shell: bash # Run in bash regardless of platform diff --git a/.github/workflows/amplify_canaries.yaml b/.github/workflows/amplify_canaries.yaml index 5884a5b0f4..81b0a42a1d 100644 --- a/.github/workflows/amplify_canaries.yaml +++ b/.github/workflows/amplify_canaries.yaml @@ -32,7 +32,7 @@ jobs: - "any" # latest include: - channel: "stable" - flutter-version: "3.19.0" + flutter-version: "3.27.0" steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0 with: @@ -88,7 +88,7 @@ jobs: - "any" # latest include: - channel: "stable" - flutter-version: "3.19.0" + flutter-version: "3.27.0" steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0 with: @@ -162,7 +162,7 @@ jobs: - "any" # latest include: - channel: "stable" - flutter-version: "3.19.0" + flutter-version: "3.27.0" ios-version: - "15.0" - "17.5" diff --git a/.github/workflows/dart_dart2js.yaml b/.github/workflows/dart_dart2js.yaml index da3680a461..a092491fa1 100644 --- a/.github/workflows/dart_dart2js.yaml +++ b/.github/workflows/dart_dart2js.yaml @@ -22,7 +22,7 @@ jobs: matrix: sdk: # Minimum supported Dart version - - "3.3.0" + - "3.6.0" - stable - beta browser: diff --git a/.github/workflows/dart_ddc.yaml b/.github/workflows/dart_ddc.yaml index ead8092585..574333e2fb 100644 --- a/.github/workflows/dart_ddc.yaml +++ b/.github/workflows/dart_ddc.yaml @@ -22,7 +22,7 @@ jobs: matrix: sdk: # Minimum supported Dart version - - "3.3.0" + - "3.6.0" - stable - beta browser: diff --git a/.github/workflows/dart_vm.yaml b/.github/workflows/dart_vm.yaml index 4824ad4f95..1b9c307a9f 100644 --- a/.github/workflows/dart_vm.yaml +++ b/.github/workflows/dart_vm.yaml @@ -21,7 +21,7 @@ jobs: matrix: sdk: # Minimum supported Dart version - - "3.3.0" + - "3.6.0" - stable - beta # Skips 'beta' tests on PRs diff --git a/.github/workflows/flutter_vm.yaml b/.github/workflows/flutter_vm.yaml index 03f18b4848..6f00066f67 100644 --- a/.github/workflows/flutter_vm.yaml +++ b/.github/workflows/flutter_vm.yaml @@ -31,7 +31,7 @@ jobs: - "any" # latest include: - channel: "stable" - flutter-version: "3.19.0" + flutter-version: "3.27.0" # Skips 'beta' tests on PRs exclude: - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }} diff --git a/actions/lib/src/node/actions/exec.dart b/actions/lib/src/node/actions/exec.dart index 547ba6b666..0927944aec 100644 --- a/actions/lib/src/node/actions/exec.dart +++ b/actions/lib/src/node/actions/exec.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'dart:js_interop'; +//ignore: deprecated_member_use import 'dart:js_util'; @JS() diff --git a/actions/pubspec.yaml b/actions/pubspec.yaml index f4b560a372..62fc4b609a 100644 --- a/actions/pubspec.yaml +++ b/actions/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: aws_common: ^0.6.1 diff --git a/build-support/build_canary.sh b/build-support/build_canary.sh index 5aab81f552..e8c86a29a6 100755 --- a/build-support/build_canary.sh +++ b/build-support/build_canary.sh @@ -24,24 +24,62 @@ cp -r $ROOT_DIR/canaries/lib . cp $ROOT_DIR/build-support/dummy_amplifyconfiguration.dart lib/amplifyconfiguration.dart # Android -sed -i '' -e "s/id \"com.android.application\" .*/id \"com.android.application\" version \"8.1.0\" apply false/" ./android/settings.gradle -sed -i '' -e "s/id \"org.jetbrains.kotlin.android\" .*/id \"org.jetbrains.kotlin.android\" version \"1.9.10\" apply false/" ./android/settings.gradle -cat ./android/settings.gradle - -# TODO(khatruong2009): remove this line after the next stable release (3.22.0 or 4.0) -sed -i '' -e "s/minSdkVersion .*/minSdkVersion 24/" ./android/app/build.gradle -sed -i '' -e "s/minSdk .*/minSdk 24/" ./android/app/build.gradle -sed -i '' -e '/id "kotlin-android"/a\ -id '\''kotlin-parcelize'\''' ./android/app/build.gradle -sed -i '' -e "s/compileSdk .*/compileSdk = 35/" ./android/app/build.gradle -sed -i '' -e "s/sourceCompatibility .*/sourceCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle -sed -i '' -e "s/targetCompatibility .*/targetCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle -# TODO(equartey): remove this line after the next stable release (3.22.0 or 4.0) -sed -i '' -e '/kotlinOptions {/,/}/ s/jvmTarget = .*/jvmTarget = '\''17'\''/' ./android/app/build.gradle -cat ./android/app/build.gradle - -sed -i '' -e "s#distributionUrl=.*#distributionUrl=https\\://services.gradle.org/distributions/gradle-8.1-all.zip#" ./android/gradle/wrapper/gradle-wrapper.properties -cat ./android/gradle/wrapper/gradle-wrapper.properties +# Flutter >=3.29.0 +if [ -e ./android/settings.gradle.kts ] +then + sed -i '' -e "s/id(\"com.android.application\") .*/id(\"com.android.application\") version \"8.1.0\" apply false/" ./android/settings.gradle.kts + sed -i '' -e "s/id(\"org.jetbrains.kotlin.android\") .*/id(\"org.jetbrains.kotlin.android\") version \"1.9.10\" apply false/" ./android/settings.gradle.kts + cat ./android/settings.gradle.kts + + # TODO(khatruong2009): remove this line after the next stable release (3.22.0 or 4.0) + sed -i '' -e "s/minSdkVersion = .*/minSdkVersion = 24/" ./android/app/build.gradle.kts + sed -i '' -e "s/minSdk = .*/minSdk = 24/" ./android/app/build.gradle.kts + + sed -i '' -e '/id "kotlin-android"/a\ + id '\''kotlin-parcelize'\''' ./android/app/build.gradle.kts + + sed -i '' -e "s/compileSdk = .*/compileSdk = 35/" ./android/app/build.gradle.kts + + sed -i '' -e "s/sourceCompatibility = .*/sourceCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle.kts + + sed -i '' -e "s/targetCompatibility = .*/targetCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle.kts + + # TODO(equartey): remove this line after the next stable release (3.22.0 or 4.0) + sed -i '' -e "s/jvmTarget = .*/jvmTarget = JavaVersion.VERSION_17.toString()/" ./android/app/build.gradle.kts + + sed -i '' -e "s/compileOptions {.*/compileOptions {\n\t\tisCoreLibraryDesugaringEnabled = true/" ./android/app/build.gradle.kts + sed -i '' -e "s/flutter {.*/dependencies {\n\tcoreLibraryDesugaring(\"com.android.tools:desugar_jdk_libs:2.0.3\")\n}\n\nflutter {/" ./android/app/build.gradle.kts + cat ./android/app/build.gradle.kts + + sed -i '' -e "s#distributionUrl=.*#distributionUrl=https\\://services.gradle.org/distributions/gradle-8.9-all.zip#" ./android/gradle/wrapper/gradle-wrapper.properties + cat ./android/gradle/wrapper/gradle-wrapper.properties +# Flutter <3.29.0 (delete this else block when min Flutter SDK is bumped to 3.29.0 or higher) +else + sed -i '' -e "s/id \"com.android.application\" .*/id \"com.android.application\" version \"8.1.0\" apply false/" ./android/settings.gradle + sed -i '' -e "s/id \"org.jetbrains.kotlin.android\" .*/id \"org.jetbrains.kotlin.android\" version \"1.9.10\" apply false/" ./android/settings.gradle + cat ./android/settings.gradle + + sed -i '' -e "s/minSdkVersion = .*/minSdkVersion = 24/" ./android/app/build.gradle + sed -i '' -e "s/minSdk = .*/minSdk = 24/" ./android/app/build.gradle + + sed -i '' -e '/id "kotlin-android"/a\ + id '\''kotlin-parcelize'\''' ./android/app/build.gradle + + sed -i '' -e "s/compileSdk = .*/compileSdk = 35/" ./android/app/build.gradle + + sed -i '' -e "s/sourceCompatibility = .*/sourceCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle + + sed -i '' -e "s/targetCompatibility = .*/targetCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle + + sed -i '' -e "s/jvmTarget = .*/jvmTarget = JavaVersion.VERSION_17/" ./android/app/build.gradle + + #sed -i '' -e "s/compileOptions {.*/compileOptions {\n\t\tCoreLibraryDesugaringEnabled = true/" ./android/app/build.gradle + sed -i '' -e "s/flutter {.*/dependencies {\n\tcoreLibraryDesugaring(\"com.android.tools:desugar_jdk_libs:2.0.3\")\n}\n\nflutter {/" ./android/app/build.gradle + cat ./android/app/build.gradle + + sed -i '' -e "s#distributionUrl=.*#distributionUrl=https\\://services.gradle.org/distributions/gradle-8.9-all.zip#" ./android/gradle/wrapper/gradle-wrapper.properties + cat ./android/gradle/wrapper/gradle-wrapper.properties +fi # iOS sed -i '' -e "s/# platform .*/platform :ios, '13.0'/" ./ios/Podfile diff --git a/canaries/pubspec.yaml b/canaries/pubspec.yaml index ef6d237fa9..e1b9aeaa01 100644 --- a/canaries/pubspec.yaml +++ b/canaries/pubspec.yaml @@ -2,8 +2,8 @@ name: amplified_todo publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_analytics_pinpoint: ^2.0.0 diff --git a/infra-gen2/pubspec.yaml b/infra-gen2/pubspec.yaml index ec07ffb1ce..0e4bf117af 100644 --- a/infra-gen2/pubspec.yaml +++ b/infra-gen2/pubspec.yaml @@ -2,7 +2,7 @@ name: infra_gen2 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_core: any diff --git a/infra/pubspec.yaml b/infra/pubspec.yaml index 64ebda6602..47fd11ea11 100644 --- a/infra/pubspec.yaml +++ b/infra/pubspec.yaml @@ -2,7 +2,7 @@ name: infra publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_core: any diff --git a/packages/aft/pubspec.yaml b/packages/aft/pubspec.yaml index e5fd0ae7dc..46df7159e8 100644 --- a/packages/aft/pubspec.yaml +++ b/packages/aft/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.1 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: args: ^2.3.0 @@ -66,7 +66,7 @@ dependency_overrides: dev_dependencies: amplify_lints: ">=2.0.2 <2.1.0" build_runner: ^2.4.9 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 checks: ^0.3.0 json_serializable: 6.8.0 test: ^1.22.1 diff --git a/packages/aft/test/version_bump/data/repo_snapshot/packages/common/amplify_db_common_dart/pubspec.yaml b/packages/aft/test/version_bump/data/repo_snapshot/packages/common/amplify_db_common_dart/pubspec.yaml index 9c729b5ba2..c2c099024f 100644 --- a/packages/aft/test/version_bump/data/repo_snapshot/packages/common/amplify_db_common_dart/pubspec.yaml +++ b/packages/aft/test/version_bump/data/repo_snapshot/packages/common/amplify_db_common_dart/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: drift: ">=2.18.0 <2.19.0" meta: ^1.7.0 path: ">=1.8.0 <2.0.0" - sqlite3: ">=2.0.0 <2.4.3" + sqlite3: ">=2.0.0 <2.7.0" dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" diff --git a/packages/aft/test/version_bump/data/repo_snapshot/pubspec.yaml b/packages/aft/test/version_bump/data/repo_snapshot/pubspec.yaml index 392888e035..37dc8c834a 100644 --- a/packages/aft/test/version_bump/data/repo_snapshot/pubspec.yaml +++ b/packages/aft/test/version_bump/data/repo_snapshot/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: oauth2: ^2.0.2 package_info_plus: ^8.0.0 pigeon: ^11.0.0 - sqlite3: ">=2.0.0 <2.4.3" + sqlite3: ">=2.0.0 <2.7.0" source_gen: ^1.3.2 stack_trace: ^1.10.0 uuid: ">=3.0.6 <5.0.0" diff --git a/packages/amplify/amplify_flutter/CHANGELOG.md b/packages/amplify/amplify_flutter/CHANGELOG.md index 53fec92508..4dd3bd36cd 100644 --- a/packages/amplify/amplify_flutter/CHANGELOG.md +++ b/packages/amplify/amplify_flutter/CHANGELOG.md @@ -93,7 +93,7 @@ As always, you can find us on [GitHub](https://github.com/aws-amplify/amplify-fl ## 1.8.0 NOTE: This version has been updated to: -- Flutter: ">=3.19.0" +- flutter: ">=3.19.0" - Dart ^3.3.0 - Java 17, Kotlin 1.9.10 and Gradle 8.1 for Android projects diff --git a/packages/amplify/amplify_flutter/example/pubspec.yaml b/packages/amplify/amplify_flutter/example/pubspec.yaml index 9b7a8cdc9e..289952b479 100644 --- a/packages/amplify/amplify_flutter/example/pubspec.yaml +++ b/packages/amplify/amplify_flutter/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the Amplify Flutter client libraries. publish_to: none environment: - flutter: ">=3.19.0" - sdk: ^3.3.0 + flutter: ">=3.27.0" + sdk: ^3.6.0 dependencies: amplify_analytics_pinpoint: ">=1.0.0-next.8 <1.0.0-next.9" diff --git a/packages/amplify/amplify_flutter/pubspec.yaml b/packages/amplify/amplify_flutter/pubspec.yaml index dc68ae3183..a443aea6f5 100644 --- a/packages/amplify/amplify_flutter/pubspec.yaml +++ b/packages/amplify/amplify_flutter/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/am issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" # Helps `pana` since we do not use Flutter plugins for most platforms platforms: diff --git a/packages/amplify_core/doc/pubspec.yaml b/packages/amplify_core/doc/pubspec.yaml index 976fc1dd59..30ddaa4008 100644 --- a/packages/amplify_core/doc/pubspec.yaml +++ b/packages/amplify_core/doc/pubspec.yaml @@ -7,8 +7,8 @@ issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_analytics_pinpoint: any diff --git a/packages/amplify_core/lib/src/platform/platform_html.dart b/packages/amplify_core/lib/src/platform/platform_html.dart index ffc632d048..0805eb22c8 100644 --- a/packages/amplify_core/lib/src/platform/platform_html.dart +++ b/packages/amplify_core/lib/src/platform/platform_html.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; final RegExp _edgeRegex = RegExp(r'Edg/[\d\.]+'); diff --git a/packages/amplify_core/pubspec.yaml b/packages/amplify_core/pubspec.yaml index 8ca73a398c..b138692ad7 100644 --- a/packages/amplify_core/pubspec.yaml +++ b/packages/amplify_core/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/am issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: async: ^2.10.0 diff --git a/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/NativeAuthPluginWrapper.kt b/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/NativeAuthPluginWrapper.kt index 33e638babf..297943be6f 100644 --- a/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/NativeAuthPluginWrapper.kt +++ b/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/NativeAuthPluginWrapper.kt @@ -9,6 +9,7 @@ import android.content.Intent import aws.smithy.kotlin.runtime.time.Instant import com.amazonaws.amplify.amplify_datastore.pigeons.NativeAuthPlugin import com.amplifyframework.annotations.InternalAmplifyApi +import com.amplifyframework.auth.AWSCognitoUserPoolTokens import com.amplifyframework.auth.AWSCredentials import com.amplifyframework.auth.AuthCodeDeliveryDetails import com.amplifyframework.auth.AuthDevice @@ -85,45 +86,50 @@ class NativeAuthPluginWrapper( return } MainScope().launch { - nativePlugin.fetchAuthSession() { session -> - val couldNotFetchException = UnknownException("Could not fetch") - val userPoolTokens = if (session.userPoolTokens != null) { - val tokens = FlutterFactory.createAWSCognitoUserPoolTokens( - session.userPoolTokens!!.accessToken, - session.userPoolTokens!!.idToken, - session.userPoolTokens!!.refreshToken - ) - AuthSessionResult.success(tokens) - } else { - AuthSessionResult.failure(couldNotFetchException) - } - val awsCredentials: AuthSessionResult = - if (session.awsCredentials != null) { - val sessionCredentials = session.awsCredentials!! - val credentials = AWSCredentials.createAWSCredentials( - sessionCredentials.accessKeyId, - sessionCredentials.secretAccessKey, - sessionCredentials.sessionToken, - if (sessionCredentials.expirationIso8601Utc != null) { - Instant.fromIso8601( - sessionCredentials.expirationIso8601Utc!! - ).epochSeconds - } else { - null - } + nativePlugin.fetchAuthSession() { result -> + val session = result.getOrNull() + if(session != null) { + val userPoolTokens = if (session.userPoolTokens != null) { + val tokens = FlutterFactory.createAWSCognitoUserPoolTokens( + session.userPoolTokens!!.accessToken, + session.userPoolTokens!!.idToken, + session.userPoolTokens!!.refreshToken ) - AuthSessionResult.success(credentials) + AuthSessionResult.success(tokens) } else { - AuthSessionResult.failure(couldNotFetchException) + AuthSessionResult.failure(UnknownException("Could not fetch userPoolTokens")) } - val authSession = FlutterFactory.createAWSCognitoAuthSession( - session.isSignedIn, - AuthSessionResult.success(session.identityId), - awsCredentials, - AuthSessionResult.success(session.userSub), - userPoolTokens - ) - onSuccess.accept(authSession) + val awsCredentials: AuthSessionResult = + if (session.awsCredentials != null) { + val sessionCredentials = session.awsCredentials!! + val credentials = AWSCredentials.createAWSCredentials( + sessionCredentials.accessKeyId, + sessionCredentials.secretAccessKey, + sessionCredentials.sessionToken, + if (sessionCredentials.expirationIso8601Utc != null) { + Instant.fromIso8601( + sessionCredentials.expirationIso8601Utc!! + ).epochSeconds + } else { + null + } + ) + AuthSessionResult.success(credentials) + } else { + AuthSessionResult.failure(UnknownException("Could not fetch awsCredentials")) + } + val authSession = FlutterFactory.createAWSCognitoAuthSession( + session.isSignedIn, + AuthSessionResult.success(session.identityId), + awsCredentials, + AuthSessionResult.success(session.userSub), + userPoolTokens + ) + onSuccess.accept(authSession) + } else { + val error = UnknownException(result.exceptionOrNull()?.message ?: "Could not fetch") + AuthSessionResult.failure(error) + } } } } diff --git a/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt b/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt index 6b936216b1..725df140ba 100644 --- a/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt +++ b/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt @@ -1,8 +1,9 @@ -// +// // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.1), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon +@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") package com.amazonaws.amplify.amplify_datastore.pigeons @@ -19,14 +20,14 @@ private fun wrapResult(result: Any?): List { } private fun wrapError(exception: Throwable): List { - if (exception is FlutterError) { - return listOf( + return if (exception is FlutterError) { + listOf( exception.code, exception.message, exception.details ) } else { - return listOf( + listOf( exception.javaClass.simpleName, exception.toString(), "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception) @@ -34,6 +35,9 @@ private fun wrapError(exception: Throwable): List { } } +private fun createConnectionError(channelName: String): FlutterError { + return FlutterError("channel-error", "Unable to establish connection on channel: '$channelName'.", "")} + /** * Error class for passing custom error details to Flutter via a thrown PlatformException. * @property code The error code. @@ -53,30 +57,25 @@ data class NativeAuthSession ( val userPoolTokens: NativeUserPoolTokens? = null, val identityId: String? = null, val awsCredentials: NativeAWSCredentials? = null - -) { +) + { companion object { - @Suppress("UNCHECKED_CAST") - fun fromList(list: List): NativeAuthSession { - val isSignedIn = list[0] as Boolean - val userSub = list[1] as String? - val userPoolTokens: NativeUserPoolTokens? = (list[2] as List?)?.let { - NativeUserPoolTokens.fromList(it) - } - val identityId = list[3] as String? - val awsCredentials: NativeAWSCredentials? = (list[4] as List?)?.let { - NativeAWSCredentials.fromList(it) - } + fun fromList(pigeonVar_list: List): NativeAuthSession { + val isSignedIn = pigeonVar_list[0] as Boolean + val userSub = pigeonVar_list[1] as String? + val userPoolTokens = pigeonVar_list[2] as NativeUserPoolTokens? + val identityId = pigeonVar_list[3] as String? + val awsCredentials = pigeonVar_list[4] as NativeAWSCredentials? return NativeAuthSession(isSignedIn, userSub, userPoolTokens, identityId, awsCredentials) } } fun toList(): List { - return listOf( + return listOf( isSignedIn, userSub, - userPoolTokens?.toList(), + userPoolTokens, identityId, - awsCredentials?.toList(), + awsCredentials, ) } } @@ -85,18 +84,17 @@ data class NativeAuthSession ( data class NativeAuthUser ( val userId: String, val username: String - -) { +) + { companion object { - @Suppress("UNCHECKED_CAST") - fun fromList(list: List): NativeAuthUser { - val userId = list[0] as String - val username = list[1] as String + fun fromList(pigeonVar_list: List): NativeAuthUser { + val userId = pigeonVar_list[0] as String + val username = pigeonVar_list[1] as String return NativeAuthUser(userId, username) } } fun toList(): List { - return listOf( + return listOf( userId, username, ) @@ -108,19 +106,18 @@ data class NativeUserPoolTokens ( val accessToken: String, val refreshToken: String, val idToken: String - -) { +) + { companion object { - @Suppress("UNCHECKED_CAST") - fun fromList(list: List): NativeUserPoolTokens { - val accessToken = list[0] as String - val refreshToken = list[1] as String - val idToken = list[2] as String + fun fromList(pigeonVar_list: List): NativeUserPoolTokens { + val accessToken = pigeonVar_list[0] as String + val refreshToken = pigeonVar_list[1] as String + val idToken = pigeonVar_list[2] as String return NativeUserPoolTokens(accessToken, refreshToken, idToken) } } fun toList(): List { - return listOf( + return listOf( accessToken, refreshToken, idToken, @@ -134,20 +131,19 @@ data class NativeAWSCredentials ( val secretAccessKey: String, val sessionToken: String? = null, val expirationIso8601Utc: String? = null - -) { +) + { companion object { - @Suppress("UNCHECKED_CAST") - fun fromList(list: List): NativeAWSCredentials { - val accessKeyId = list[0] as String - val secretAccessKey = list[1] as String - val sessionToken = list[2] as String? - val expirationIso8601Utc = list[3] as String? + fun fromList(pigeonVar_list: List): NativeAWSCredentials { + val accessKeyId = pigeonVar_list[0] as String + val secretAccessKey = pigeonVar_list[1] as String + val sessionToken = pigeonVar_list[2] as String? + val expirationIso8601Utc = pigeonVar_list[3] as String? return NativeAWSCredentials(accessKeyId, secretAccessKey, sessionToken, expirationIso8601Utc) } } fun toList(): List { - return listOf( + return listOf( accessKeyId, secretAccessKey, sessionToken, @@ -156,20 +152,58 @@ data class NativeAWSCredentials ( } } +/** Generated class from Pigeon that represents data sent in messages. */ +data class LegacyCredentialStoreData ( + val identityId: String? = null, + val accessKeyId: String? = null, + val secretAccessKey: String? = null, + val sessionToken: String? = null, + val expirationMsSinceEpoch: Long? = null, + val accessToken: String? = null, + val refreshToken: String? = null, + val idToken: String? = null +) + { + companion object { + fun fromList(pigeonVar_list: List): LegacyCredentialStoreData { + val identityId = pigeonVar_list[0] as String? + val accessKeyId = pigeonVar_list[1] as String? + val secretAccessKey = pigeonVar_list[2] as String? + val sessionToken = pigeonVar_list[3] as String? + val expirationMsSinceEpoch = pigeonVar_list[4] as Long? + val accessToken = pigeonVar_list[5] as String? + val refreshToken = pigeonVar_list[6] as String? + val idToken = pigeonVar_list[7] as String? + return LegacyCredentialStoreData(identityId, accessKeyId, secretAccessKey, sessionToken, expirationMsSinceEpoch, accessToken, refreshToken, idToken) + } + } + fun toList(): List { + return listOf( + identityId, + accessKeyId, + secretAccessKey, + sessionToken, + expirationMsSinceEpoch, + accessToken, + refreshToken, + idToken, + ) + } +} + /** Generated class from Pigeon that represents data sent in messages. */ data class NativeGraphQLResponse ( val payloadJson: String? = null - -) { +) + { companion object { - @Suppress("UNCHECKED_CAST") - fun fromList(list: List): NativeGraphQLResponse { - val payloadJson = list[0] as String? + fun fromList(pigeonVar_list: List): NativeGraphQLResponse { + val payloadJson = pigeonVar_list[0] as String? return NativeGraphQLResponse(payloadJson) } } fun toList(): List { - return listOf( + return listOf( payloadJson, ) } @@ -180,19 +214,18 @@ data class NativeGraphQLSubscriptionResponse ( val type: String, val subscriptionId: String, val payloadJson: String? = null - -) { +) + { companion object { - @Suppress("UNCHECKED_CAST") - fun fromList(list: List): NativeGraphQLSubscriptionResponse { - val type = list[0] as String - val subscriptionId = list[1] as String - val payloadJson = list[2] as String? + fun fromList(pigeonVar_list: List): NativeGraphQLSubscriptionResponse { + val type = pigeonVar_list[0] as String + val subscriptionId = pigeonVar_list[1] as String + val payloadJson = pigeonVar_list[2] as String? return NativeGraphQLSubscriptionResponse(type, subscriptionId, payloadJson) } } fun toList(): List { - return listOf( + return listOf( type, subscriptionId, payloadJson, @@ -209,23 +242,22 @@ data class NativeGraphQLRequest ( val decodePath: String? = null, val options: String? = null, val authMode: String? = null - -) { +) + { companion object { - @Suppress("UNCHECKED_CAST") - fun fromList(list: List): NativeGraphQLRequest { - val document = list[0] as String - val apiName = list[1] as String? - val variablesJson = list[2] as String? - val responseType = list[3] as String? - val decodePath = list[4] as String? - val options = list[5] as String? - val authMode = list[6] as String? + fun fromList(pigeonVar_list: List): NativeGraphQLRequest { + val document = pigeonVar_list[0] as String + val apiName = pigeonVar_list[1] as String? + val variablesJson = pigeonVar_list[2] as String? + val responseType = pigeonVar_list[3] as String? + val decodePath = pigeonVar_list[4] as String? + val options = pigeonVar_list[5] as String? + val authMode = pigeonVar_list[6] as String? return NativeGraphQLRequest(document, apiName, variablesJson, responseType, decodePath, options, authMode) } } fun toList(): List { - return listOf( + return listOf( document, apiName, variablesJson, @@ -236,167 +268,264 @@ data class NativeGraphQLRequest ( ) } } - -@Suppress("UNCHECKED_CAST") -private object NativeAuthPluginCodec : StandardMessageCodec() { +private open class NativePluginBindingsPigeonCodec : StandardMessageCodec() { override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? { return when (type) { - 128.toByte() -> { - return (readValue(buffer) as? List)?.let { - NativeAWSCredentials.fromList(it) - } - } 129.toByte() -> { return (readValue(buffer) as? List)?.let { NativeAuthSession.fromList(it) } } 130.toByte() -> { + return (readValue(buffer) as? List)?.let { + NativeAuthUser.fromList(it) + } + } + 131.toByte() -> { return (readValue(buffer) as? List)?.let { NativeUserPoolTokens.fromList(it) } } + 132.toByte() -> { + return (readValue(buffer) as? List)?.let { + NativeAWSCredentials.fromList(it) + } + } + 133.toByte() -> { + return (readValue(buffer) as? List)?.let { + LegacyCredentialStoreData.fromList(it) + } + } + 134.toByte() -> { + return (readValue(buffer) as? List)?.let { + NativeGraphQLResponse.fromList(it) + } + } + 135.toByte() -> { + return (readValue(buffer) as? List)?.let { + NativeGraphQLSubscriptionResponse.fromList(it) + } + } + 136.toByte() -> { + return (readValue(buffer) as? List)?.let { + NativeGraphQLRequest.fromList(it) + } + } else -> super.readValueOfType(type, buffer) } } override fun writeValue(stream: ByteArrayOutputStream, value: Any?) { when (value) { - is NativeAWSCredentials -> { - stream.write(128) - writeValue(stream, value.toList()) - } is NativeAuthSession -> { stream.write(129) writeValue(stream, value.toList()) } - is NativeUserPoolTokens -> { + is NativeAuthUser -> { stream.write(130) writeValue(stream, value.toList()) } + is NativeUserPoolTokens -> { + stream.write(131) + writeValue(stream, value.toList()) + } + is NativeAWSCredentials -> { + stream.write(132) + writeValue(stream, value.toList()) + } + is LegacyCredentialStoreData -> { + stream.write(133) + writeValue(stream, value.toList()) + } + is NativeGraphQLResponse -> { + stream.write(134) + writeValue(stream, value.toList()) + } + is NativeGraphQLSubscriptionResponse -> { + stream.write(135) + writeValue(stream, value.toList()) + } + is NativeGraphQLRequest -> { + stream.write(136) + writeValue(stream, value.toList()) + } else -> super.writeValue(stream, value) } } } + /** * Bridge for calling Auth from Native into Flutter * * Generated class from Pigeon that represents Flutter messages that can be called from Kotlin. */ -@Suppress("UNCHECKED_CAST") -class NativeAuthPlugin(private val binaryMessenger: BinaryMessenger) { +class NativeAuthPlugin(private val binaryMessenger: BinaryMessenger, private val messageChannelSuffix: String = "") { companion object { /** The codec used by NativeAuthPlugin. */ val codec: MessageCodec by lazy { - NativeAuthPluginCodec + NativePluginBindingsPigeonCodec() } } - fun fetchAuthSession(callback: (NativeAuthSession) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeAuthPlugin.fetchAuthSession", codec) + fun fetchAuthSession(callback: (Result) -> Unit) +{ + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = "dev.flutter.pigeon.amplify_datastore.NativeAuthPlugin.fetchAuthSession$separatedMessageChannelSuffix" + val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(null) { - val result = it as NativeAuthSession - callback(result) - } - } -} -@Suppress("UNCHECKED_CAST") -private object NativeApiPluginCodec : StandardMessageCodec() { - override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? { - return when (type) { - 128.toByte() -> { - return (readValue(buffer) as? List)?.let { - NativeGraphQLRequest.fromList(it) - } - } - 129.toByte() -> { - return (readValue(buffer) as? List)?.let { - NativeGraphQLResponse.fromList(it) - } - } - 130.toByte() -> { - return (readValue(buffer) as? List)?.let { - NativeGraphQLSubscriptionResponse.fromList(it) + if (it is List<*>) { + if (it.size > 1) { + callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?))) + } else if (it[0] == null) { + callback(Result.failure(FlutterError("null-error", "Flutter api returned null value for non-null return value.", ""))) + } else { + val output = it[0] as NativeAuthSession + callback(Result.success(output)) } - } - else -> super.readValueOfType(type, buffer) - } - } - override fun writeValue(stream: ByteArrayOutputStream, value: Any?) { - when (value) { - is NativeGraphQLRequest -> { - stream.write(128) - writeValue(stream, value.toList()) - } - is NativeGraphQLResponse -> { - stream.write(129) - writeValue(stream, value.toList()) - } - is NativeGraphQLSubscriptionResponse -> { - stream.write(130) - writeValue(stream, value.toList()) - } - else -> super.writeValue(stream, value) + } else { + callback(Result.failure(createConnectionError(channelName))) + } } } } - /** * Bridge for calling API plugin from Native into Flutter * * Generated class from Pigeon that represents Flutter messages that can be called from Kotlin. */ -@Suppress("UNCHECKED_CAST") -class NativeApiPlugin(private val binaryMessenger: BinaryMessenger) { +class NativeApiPlugin(private val binaryMessenger: BinaryMessenger, private val messageChannelSuffix: String = "") { companion object { /** The codec used by NativeApiPlugin. */ val codec: MessageCodec by lazy { - NativeApiPluginCodec + NativePluginBindingsPigeonCodec() } } - fun getLatestAuthToken(providerNameArg: String, callback: (String?) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken", codec) + fun getLatestAuthToken(providerNameArg: String, callback: (Result) -> Unit) +{ + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken$separatedMessageChannelSuffix" + val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(providerNameArg)) { - val result = it as String? - callback(result) + if (it is List<*>) { + if (it.size > 1) { + callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?))) + } else { + val output = it[0] as String? + callback(Result.success(output)) + } + } else { + callback(Result.failure(createConnectionError(channelName))) + } } } - fun mutate(requestArg: NativeGraphQLRequest, callback: (NativeGraphQLResponse) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.mutate", codec) + fun mutate(requestArg: NativeGraphQLRequest, callback: (Result) -> Unit) +{ + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.mutate$separatedMessageChannelSuffix" + val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(requestArg)) { - val result = it as NativeGraphQLResponse - callback(result) + if (it is List<*>) { + if (it.size > 1) { + callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?))) + } else if (it[0] == null) { + callback(Result.failure(FlutterError("null-error", "Flutter api returned null value for non-null return value.", ""))) + } else { + val output = it[0] as NativeGraphQLResponse + callback(Result.success(output)) + } + } else { + callback(Result.failure(createConnectionError(channelName))) + } } } - fun query(requestArg: NativeGraphQLRequest, callback: (NativeGraphQLResponse) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.query", codec) + fun query(requestArg: NativeGraphQLRequest, callback: (Result) -> Unit) +{ + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.query$separatedMessageChannelSuffix" + val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(requestArg)) { - val result = it as NativeGraphQLResponse - callback(result) + if (it is List<*>) { + if (it.size > 1) { + callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?))) + } else if (it[0] == null) { + callback(Result.failure(FlutterError("null-error", "Flutter api returned null value for non-null return value.", ""))) + } else { + val output = it[0] as NativeGraphQLResponse + callback(Result.success(output)) + } + } else { + callback(Result.failure(createConnectionError(channelName))) + } } } - fun subscribe(requestArg: NativeGraphQLRequest, callback: (NativeGraphQLSubscriptionResponse) -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.subscribe", codec) + fun subscribe(requestArg: NativeGraphQLRequest, callback: (Result) -> Unit) +{ + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.subscribe$separatedMessageChannelSuffix" + val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(requestArg)) { - val result = it as NativeGraphQLSubscriptionResponse - callback(result) + if (it is List<*>) { + if (it.size > 1) { + callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?))) + } else if (it[0] == null) { + callback(Result.failure(FlutterError("null-error", "Flutter api returned null value for non-null return value.", ""))) + } else { + val output = it[0] as NativeGraphQLSubscriptionResponse + callback(Result.success(output)) + } + } else { + callback(Result.failure(createConnectionError(channelName))) + } } } - fun unsubscribe(subscriptionIdArg: String, callback: () -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.unsubscribe", codec) + fun unsubscribe(subscriptionIdArg: String, callback: (Result) -> Unit) +{ + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.unsubscribe$separatedMessageChannelSuffix" + val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(subscriptionIdArg)) { - callback() + if (it is List<*>) { + if (it.size > 1) { + callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?))) + } else { + callback(Result.success(Unit)) + } + } else { + callback(Result.failure(createConnectionError(channelName))) + } } } - fun deviceOffline(callback: () -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.deviceOffline", codec) + fun deviceOffline(callback: (Result) -> Unit) +{ + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.deviceOffline$separatedMessageChannelSuffix" + val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(null) { - callback() + if (it is List<*>) { + if (it.size > 1) { + callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?))) + } else { + callback(Result.success(Unit)) + } + } else { + callback(Result.failure(createConnectionError(channelName))) + } } } - fun onStop(callback: () -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.onStop", codec) + fun onStop(callback: (Result) -> Unit) +{ + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.onStop$separatedMessageChannelSuffix" + val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(null) { - callback() + if (it is List<*>) { + if (it.size > 1) { + callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?))) + } else { + callback(Result.success(Unit)) + } + } else { + callback(Result.failure(createConnectionError(channelName))) + } } } } @@ -411,13 +540,14 @@ interface NativeAmplifyBridge { companion object { /** The codec used by NativeAmplifyBridge. */ val codec: MessageCodec by lazy { - StandardMessageCodec() + NativePluginBindingsPigeonCodec() } /** Sets up an instance of `NativeAmplifyBridge` to handle messages through the `binaryMessenger`. */ - @Suppress("UNCHECKED_CAST") - fun setUp(binaryMessenger: BinaryMessenger, api: NativeAmplifyBridge?) { + @JvmOverloads + fun setUp(binaryMessenger: BinaryMessenger, api: NativeAmplifyBridge?, messageChannelSuffix: String = "") { + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeAmplifyBridge.configure", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeAmplifyBridge.configure$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -439,29 +569,6 @@ interface NativeAmplifyBridge { } } } -@Suppress("UNCHECKED_CAST") -private object NativeAuthBridgeCodec : StandardMessageCodec() { - override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? { - return when (type) { - 128.toByte() -> { - return (readValue(buffer) as? List)?.let { - NativeAuthUser.fromList(it) - } - } - else -> super.readValueOfType(type, buffer) - } - } - override fun writeValue(stream: ByteArrayOutputStream, value: Any?) { - when (value) { - is NativeAuthUser -> { - stream.write(128) - writeValue(stream, value.toList()) - } - else -> super.writeValue(stream, value) - } - } -} - /** * Bridge for calling Auth plugin from Flutter into Native * @@ -474,16 +581,17 @@ interface NativeAuthBridge { companion object { /** The codec used by NativeAuthBridge. */ val codec: MessageCodec by lazy { - NativeAuthBridgeCodec + NativePluginBindingsPigeonCodec() } /** Sets up an instance of `NativeAuthBridge` to handle messages through the `binaryMessenger`. */ - @Suppress("UNCHECKED_CAST") - fun setUp(binaryMessenger: BinaryMessenger, api: NativeAuthBridge?) { + @JvmOverloads + fun setUp(binaryMessenger: BinaryMessenger, api: NativeAuthBridge?, messageChannelSuffix: String = "") { + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.addAuthPlugin", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.addAuthPlugin$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> - api.addAuthPlugin() { result: Result -> + api.addAuthPlugin{ result: Result -> val error = result.exceptionOrNull() if (error != null) { reply.reply(wrapError(error)) @@ -497,17 +605,16 @@ interface NativeAuthBridge { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.updateCurrentUser", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.updateCurrentUser$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List val userArg = args[0] as NativeAuthUser? - var wrapped: List - try { + val wrapped: List = try { api.updateCurrentUser(userArg) - wrapped = listOf(null) + listOf(null) } catch (exception: Throwable) { - wrapped = wrapError(exception) + wrapError(exception) } reply.reply(wrapped) } @@ -518,29 +625,6 @@ interface NativeAuthBridge { } } } -@Suppress("UNCHECKED_CAST") -private object NativeApiBridgeCodec : StandardMessageCodec() { - override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? { - return when (type) { - 128.toByte() -> { - return (readValue(buffer) as? List)?.let { - NativeGraphQLSubscriptionResponse.fromList(it) - } - } - else -> super.readValueOfType(type, buffer) - } - } - override fun writeValue(stream: ByteArrayOutputStream, value: Any?) { - when (value) { - is NativeGraphQLSubscriptionResponse -> { - stream.write(128) - writeValue(stream, value.toList()) - } - else -> super.writeValue(stream, value) - } - } -} - /** * Bridge for calling API methods from Flutter into Native * @@ -553,13 +637,14 @@ interface NativeApiBridge { companion object { /** The codec used by NativeApiBridge. */ val codec: MessageCodec by lazy { - NativeApiBridgeCodec + NativePluginBindingsPigeonCodec() } /** Sets up an instance of `NativeApiBridge` to handle messages through the `binaryMessenger`. */ - @Suppress("UNCHECKED_CAST") - fun setUp(binaryMessenger: BinaryMessenger, api: NativeApiBridge?) { + @JvmOverloads + fun setUp(binaryMessenger: BinaryMessenger, api: NativeApiBridge?, messageChannelSuffix: String = "") { + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiBridge.addApiPlugin", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiBridge.addApiPlugin$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -579,7 +664,7 @@ interface NativeApiBridge { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiBridge.sendSubscriptionEvent", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiBridge.sendSubscriptionEvent$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List diff --git a/packages/amplify_datastore/example/android/app/build.gradle b/packages/amplify_datastore/example/android/app/build.gradle index 65e0a784d3..01ab2c90bb 100644 --- a/packages/amplify_datastore/example/android/app/build.gradle +++ b/packages/amplify_datastore/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace 'com.amazonaws.amplify.amplify_datastore_example' compileSdk flutter.compileSdkVersion @@ -70,7 +67,6 @@ flutter { dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.13.2' diff --git a/packages/amplify_datastore/example/android/build.gradle b/packages/amplify_datastore/example/android/build.gradle index 070b4ffbfd..bc157bd1a1 100644 --- a/packages/amplify_datastore/example/android/build.gradle +++ b/packages/amplify_datastore/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/packages/amplify_datastore/example/android/settings.gradle b/packages/amplify_datastore/example/android/settings.gradle index 44e62bcf06..276cdabf9c 100644 --- a/packages/amplify_datastore/example/android/settings.gradle +++ b/packages/amplify_datastore/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.10" apply false +} + +include ":app" diff --git a/packages/amplify_datastore/example/ios/unit_tests/NativeAuthPluginTests.swift b/packages/amplify_datastore/example/ios/unit_tests/NativeAuthPluginTests.swift index 79cca616a4..87fb2fc276 100644 --- a/packages/amplify_datastore/example/ios/unit_tests/NativeAuthPluginTests.swift +++ b/packages/amplify_datastore/example/ios/unit_tests/NativeAuthPluginTests.swift @@ -14,7 +14,7 @@ class MockBinaryMessenger: NSObject, FlutterBinaryMessenger { let isSignedIn: Bool - lazy var codec = NativeAuthPluginCodec.shared + lazy var codec = NativePluginBindingsPigeonCodec.shared func send(onChannel channel: String, message: Data?) { } @@ -30,7 +30,7 @@ class MockBinaryMessenger: NSObject, FlutterBinaryMessenger { identityId: nil, awsCredentials: nil ) - let encodedAuthSession = codec.encode(authSession) + let encodedAuthSession = codec.encode([authSession]) callback?(encodedAuthSession) } @@ -51,10 +51,14 @@ class NativeAuthPluginTests: XCTestCase { let binaryMessenger = MockBinaryMessenger(isSignedIn: isSignedIn) let nativePlugin = NativeAuthPlugin(binaryMessenger: binaryMessenger) let expectation = expectation(description: "fetchAuthSession completes") - nativePlugin.fetchAuthSession { session in + nativePlugin.fetchAuthSession { result in defer { expectation.fulfill() } - XCTAssertNotNil(session) - XCTAssertEqual(session.isSignedIn, isSignedIn) + switch result { + case .success(let session): + XCTAssertEqual(session.isSignedIn, isSignedIn) + case .failure(let error): + XCTFail("fetchAuthSession failed with error: \(error)") + } } waitForExpectations(timeout: 1) } diff --git a/packages/amplify_datastore/example/pubspec.yaml b/packages/amplify_datastore/example/pubspec.yaml index bbfd9f218b..1c25c88141 100644 --- a/packages/amplify_datastore/example/pubspec.yaml +++ b/packages/amplify_datastore/example/pubspec.yaml @@ -6,8 +6,8 @@ description: Demonstrates how to use the amplify_datastore plugin. publish_to: "none" # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: flutter: diff --git a/packages/amplify_datastore/ios/Classes/CognitoPlugin.swift b/packages/amplify_datastore/ios/Classes/CognitoPlugin.swift index 377fab8181..2dd8ac96f8 100644 --- a/packages/amplify_datastore/ios/Classes/CognitoPlugin.swift +++ b/packages/amplify_datastore/ios/Classes/CognitoPlugin.swift @@ -29,9 +29,15 @@ public class CognitoPlugin: AuthCategoryPlugin { public func fetchAuthSession(options: AuthFetchSessionRequest.Options?) async throws -> any AuthSession { await withCheckedContinuation { continuation in DispatchQueue.main.async { - self.nativeAuthPlugin.fetchAuthSession { session in - let result = NativeAWSAuthCognitoSession(from: session) - continuation.resume(returning: result) + self.nativeAuthPlugin.fetchAuthSession { result in + switch result { + case .success(let session): + let returning = NativeAWSAuthCognitoSession(from: session) + continuation.resume(returning: returning) + case .failure(let error): + let returning = NativeAWSAuthCognitoSession(from: NativeAuthSession(isSignedIn: false)) + continuation.resume(returning: returning) + } } } } diff --git a/packages/amplify_datastore/ios/Classes/FlutterApiPlugin.swift b/packages/amplify_datastore/ios/Classes/FlutterApiPlugin.swift index 3443e244ce..008020ea6a 100644 --- a/packages/amplify_datastore/ios/Classes/FlutterApiPlugin.swift +++ b/packages/amplify_datastore/ios/Classes/FlutterApiPlugin.swift @@ -30,7 +30,15 @@ public class FlutterApiPlugin: APICategoryPlugin, AWSAPIAuthInformation let cancellable = try reachabilityPublisher()?.sink(receiveValue: { reachabilityUpdate in if !reachabilityUpdate.isOnline { DispatchQueue.main.async { - self.nativeApiPlugin.deviceOffline {} + self.nativeApiPlugin.deviceOffline { result in + switch result { + case .success(let session): + break //NoOp + case .failure(let error): + break //NoOp + } + return + } } } }) @@ -94,7 +102,14 @@ public class FlutterApiPlugin: APICategoryPlugin, AWSAPIAuthInformation func unsubscribe(subscriptionId: String?){ if let subscriptionId { DispatchQueue.main.async { - self.nativeApiPlugin.unsubscribe(subscriptionId: subscriptionId) {} + self.nativeApiPlugin.unsubscribe(subscriptionId: subscriptionId) { result in + switch result { + case .success(let session): + break //NoOp + case .failure(let error): + break //NoOp + } + } } } } @@ -154,8 +169,13 @@ public class FlutterApiPlugin: APICategoryPlugin, AWSAPIAuthInformation sequence.send(.connection(.connecting)) DispatchQueue.main.async { - self.nativeApiPlugin.subscribe(request: request.toNativeGraphQLRequest()) { response in - subscriptionId = response.subscriptionId + self.nativeApiPlugin.subscribe(request: request.toNativeGraphQLRequest()) { result in + switch result { + case .success(let response): + subscriptionId = response.subscriptionId + case .failure(let error): + subscriptionId = nil + } } } return sequence @@ -216,8 +236,13 @@ public class FlutterApiPlugin: APICategoryPlugin, AWSAPIAuthInformation func asyncQuery(nativeRequest: NativeGraphQLRequest) async -> NativeGraphQLResponse { await withCheckedContinuation { continuation in DispatchQueue.main.async { - self.nativeApiPlugin.query(request: nativeRequest) { response in - continuation.resume(returning: response) + self.nativeApiPlugin.query(request: nativeRequest) { result in + switch result { + case .success(let response): + continuation.resume(returning: response) + case .failure(let error): + continuation.resume(returning: NativeGraphQLResponse()) + } } } } @@ -226,8 +251,13 @@ public class FlutterApiPlugin: APICategoryPlugin, AWSAPIAuthInformation func asyncMutate(nativeRequest: NativeGraphQLRequest) async -> NativeGraphQLResponse{ await withCheckedContinuation { continuation in DispatchQueue.main.async { - self.nativeApiPlugin.mutate(request: nativeRequest) { response in - continuation.resume(returning: response) + self.nativeApiPlugin.mutate(request: nativeRequest) { result in + switch result { + case .success(let response): + continuation.resume(returning: response) + case .failure(let error): + continuation.resume(returning: NativeGraphQLResponse()) + } } } } diff --git a/packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift b/packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift index c3775556a2..a3e7e341f0 100644 --- a/packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift +++ b/packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift @@ -233,7 +233,14 @@ public class SwiftAmplifyDataStorePlugin: NSObject, FlutterPlugin, NativeAmplify case "stop": onStop(flutterResult: result) DispatchQueue.main.async { - self.nativeApiPlugin.onStop {} + self.nativeApiPlugin.onStop { result in + switch result { + case .success(let session): + break //NoOp + case .failure(let error): + break //NoOp + } + } } default: result(FlutterMethodNotImplemented) diff --git a/packages/amplify_datastore/ios/Classes/auth/FlutterAuthProviders.swift b/packages/amplify_datastore/ios/Classes/auth/FlutterAuthProviders.swift index 53be119532..82caddc5f9 100644 --- a/packages/amplify_datastore/ios/Classes/auth/FlutterAuthProviders.swift +++ b/packages/amplify_datastore/ios/Classes/auth/FlutterAuthProviders.swift @@ -30,19 +30,30 @@ class FlutterAuthProviders: APIAuthProviderFactory { let completer = DispatchSemaphore(value: 0) DispatchQueue.main.async { - self.nativeApiPlugin.getLatestAuthToken(providerName: type.rawValue) { resultToken in - defer { completer.signal() } + self.nativeApiPlugin.getLatestAuthToken(providerName: type.rawValue) { result in + switch result { + case .success(let resultToken): + defer { completer.signal() } - if let resultToken = resultToken { - token = .success(resultToken) - } else { - token = .failure(APIError.operationError( - "Unable to retrieve token for \(type)", - """ - Make sure you register your auth providers in the addPlugin call and \ - that getLatestAuthToken returns a value. - """ - )) + if let resultToken = resultToken { + token = .success(resultToken) + } else { + token = .failure(APIError.operationError( + "Unable to retrieve token for \(type)", + """ + Make sure you register your auth providers in the addPlugin call and \ + that getLatestAuthToken returns a value. + """ + )) + } + case .failure(let error): + token = .failure(APIError.operationError( + "Unable to retrieve token for \(type)", + """ + Make sure you register your auth providers in the addPlugin call and \ + that getLatestAuthToken returns a value. + """ + )) } } } diff --git a/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift b/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift index df1b268a75..cfd8646841 100644 --- a/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift +++ b/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift @@ -1,20 +1,35 @@ -// +// // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.1), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation + #if os(iOS) -import Flutter + import Flutter #elseif os(macOS) -import FlutterMacOS + import FlutterMacOS #else -#error("Unsupported platform.") + #error("Unsupported platform.") #endif -private func isNullish(_ value: Any?) -> Bool { - return value is NSNull || value == nil +/// Error class for passing custom error details to Dart side. +final class PigeonError: Error { + let code: String + let message: String? + let details: Any? + + init(code: String, message: String?, details: Any?) { + self.code = code + self.message = message + self.details = details + } + + var localizedDescription: String { + return + "PigeonError(code: \(code), message: \(message ?? ""), details: \(details ?? "")" + } } private func wrapResult(_ result: Any?) -> [Any?] { @@ -22,20 +37,35 @@ private func wrapResult(_ result: Any?) -> [Any?] { } private func wrapError(_ error: Any) -> [Any?] { + if let pigeonError = error as? PigeonError { + return [ + pigeonError.code, + pigeonError.message, + pigeonError.details, + ] + } if let flutterError = error as? FlutterError { return [ flutterError.code, flutterError.message, - flutterError.details + flutterError.details, ] } return [ "\(error)", "\(type(of: error))", - "Stacktrace: \(Thread.callStackSymbols)" + "Stacktrace: \(Thread.callStackSymbols)", ] } +private func createConnectionError(withChannelName channelName: String) -> PigeonError { + return PigeonError(code: "channel-error", message: "Unable to establish connection on channel: '\(channelName)'.", details: "") +} + +private func isNullish(_ value: Any?) -> Bool { + return value is NSNull || value == nil +} + private func nilOrValue(_ value: Any?) -> T? { if value is NSNull { return nil } return value as! T? @@ -49,18 +79,15 @@ struct NativeAuthSession { var identityId: String? = nil var awsCredentials: NativeAWSCredentials? = nil - static func fromList(_ list: [Any?]) -> NativeAuthSession? { - let isSignedIn = list[0] as! Bool - let userSub: String? = nilOrValue(list[1]) - var userPoolTokens: NativeUserPoolTokens? = nil - if let userPoolTokensList: [Any?] = nilOrValue(list[2]) { - userPoolTokens = NativeUserPoolTokens.fromList(userPoolTokensList) - } - let identityId: String? = nilOrValue(list[3]) - var awsCredentials: NativeAWSCredentials? = nil - if let awsCredentialsList: [Any?] = nilOrValue(list[4]) { - awsCredentials = NativeAWSCredentials.fromList(awsCredentialsList) - } + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> NativeAuthSession? { + let isSignedIn = pigeonVar_list[0] as! Bool + let userSub: String? = nilOrValue(pigeonVar_list[1]) + let userPoolTokens: NativeUserPoolTokens? = nilOrValue(pigeonVar_list[2]) + let identityId: String? = nilOrValue(pigeonVar_list[3]) + let awsCredentials: NativeAWSCredentials? = nilOrValue(pigeonVar_list[4]) return NativeAuthSession( isSignedIn: isSignedIn, @@ -74,9 +101,9 @@ struct NativeAuthSession { return [ isSignedIn, userSub, - userPoolTokens?.toList(), + userPoolTokens, identityId, - awsCredentials?.toList(), + awsCredentials, ] } } @@ -86,9 +113,12 @@ struct NativeAuthUser { var userId: String var username: String - static func fromList(_ list: [Any?]) -> NativeAuthUser? { - let userId = list[0] as! String - let username = list[1] as! String + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> NativeAuthUser? { + let userId = pigeonVar_list[0] as! String + let username = pigeonVar_list[1] as! String return NativeAuthUser( userId: userId, @@ -109,10 +139,13 @@ struct NativeUserPoolTokens { var refreshToken: String var idToken: String - static func fromList(_ list: [Any?]) -> NativeUserPoolTokens? { - let accessToken = list[0] as! String - let refreshToken = list[1] as! String - let idToken = list[2] as! String + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> NativeUserPoolTokens? { + let accessToken = pigeonVar_list[0] as! String + let refreshToken = pigeonVar_list[1] as! String + let idToken = pigeonVar_list[2] as! String return NativeUserPoolTokens( accessToken: accessToken, @@ -136,11 +169,14 @@ struct NativeAWSCredentials { var sessionToken: String? = nil var expirationIso8601Utc: String? = nil - static func fromList(_ list: [Any?]) -> NativeAWSCredentials? { - let accessKeyId = list[0] as! String - let secretAccessKey = list[1] as! String - let sessionToken: String? = nilOrValue(list[2]) - let expirationIso8601Utc: String? = nilOrValue(list[3]) + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> NativeAWSCredentials? { + let accessKeyId = pigeonVar_list[0] as! String + let secretAccessKey = pigeonVar_list[1] as! String + let sessionToken: String? = nilOrValue(pigeonVar_list[2]) + let expirationIso8601Utc: String? = nilOrValue(pigeonVar_list[3]) return NativeAWSCredentials( accessKeyId: accessKeyId, @@ -159,12 +195,64 @@ struct NativeAWSCredentials { } } +/// Generated class from Pigeon that represents data sent in messages. +struct LegacyCredentialStoreData { + var identityId: String? = nil + var accessKeyId: String? = nil + var secretAccessKey: String? = nil + var sessionToken: String? = nil + var expirationMsSinceEpoch: Int64? = nil + var accessToken: String? = nil + var refreshToken: String? = nil + var idToken: String? = nil + + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> LegacyCredentialStoreData? { + let identityId: String? = nilOrValue(pigeonVar_list[0]) + let accessKeyId: String? = nilOrValue(pigeonVar_list[1]) + let secretAccessKey: String? = nilOrValue(pigeonVar_list[2]) + let sessionToken: String? = nilOrValue(pigeonVar_list[3]) + let expirationMsSinceEpoch: Int64? = nilOrValue(pigeonVar_list[4]) + let accessToken: String? = nilOrValue(pigeonVar_list[5]) + let refreshToken: String? = nilOrValue(pigeonVar_list[6]) + let idToken: String? = nilOrValue(pigeonVar_list[7]) + + return LegacyCredentialStoreData( + identityId: identityId, + accessKeyId: accessKeyId, + secretAccessKey: secretAccessKey, + sessionToken: sessionToken, + expirationMsSinceEpoch: expirationMsSinceEpoch, + accessToken: accessToken, + refreshToken: refreshToken, + idToken: idToken + ) + } + func toList() -> [Any?] { + return [ + identityId, + accessKeyId, + secretAccessKey, + sessionToken, + expirationMsSinceEpoch, + accessToken, + refreshToken, + idToken, + ] + } +} + /// Generated class from Pigeon that represents data sent in messages. struct NativeGraphQLResponse { var payloadJson: String? = nil - static func fromList(_ list: [Any?]) -> NativeGraphQLResponse? { - let payloadJson: String? = nilOrValue(list[0]) + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> NativeGraphQLResponse? { + let payloadJson: String? = nilOrValue(pigeonVar_list[0]) return NativeGraphQLResponse( payloadJson: payloadJson @@ -172,7 +260,7 @@ struct NativeGraphQLResponse { } func toList() -> [Any?] { return [ - payloadJson, + payloadJson ] } } @@ -183,10 +271,13 @@ struct NativeGraphQLSubscriptionResponse { var subscriptionId: String var payloadJson: String? = nil - static func fromList(_ list: [Any?]) -> NativeGraphQLSubscriptionResponse? { - let type = list[0] as! String - let subscriptionId = list[1] as! String - let payloadJson: String? = nilOrValue(list[2]) + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> NativeGraphQLSubscriptionResponse? { + let type = pigeonVar_list[0] as! String + let subscriptionId = pigeonVar_list[1] as! String + let payloadJson: String? = nilOrValue(pigeonVar_list[2]) return NativeGraphQLSubscriptionResponse( type: type, @@ -213,14 +304,17 @@ struct NativeGraphQLRequest { var options: String? = nil var authMode: String? = nil - static func fromList(_ list: [Any?]) -> NativeGraphQLRequest? { - let document = list[0] as! String - let apiName: String? = nilOrValue(list[1]) - let variablesJson: String? = nilOrValue(list[2]) - let responseType: String? = nilOrValue(list[3]) - let decodePath: String? = nilOrValue(list[4]) - let options: String? = nilOrValue(list[5]) - let authMode: String? = nilOrValue(list[6]) + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> NativeGraphQLRequest? { + let document = pigeonVar_list[0] as! String + let apiName: String? = nilOrValue(pigeonVar_list[1]) + let variablesJson: String? = nilOrValue(pigeonVar_list[2]) + let responseType: String? = nilOrValue(pigeonVar_list[3]) + let decodePath: String? = nilOrValue(pigeonVar_list[4]) + let options: String? = nilOrValue(pigeonVar_list[5]) + let authMode: String? = nilOrValue(pigeonVar_list[6]) return NativeGraphQLRequest( document: document, @@ -245,172 +339,272 @@ struct NativeGraphQLRequest { } } -private class NativeAuthPluginCodecReader: FlutterStandardReader { +private class NativePluginBindingsPigeonCodecReader: FlutterStandardReader { override func readValue(ofType type: UInt8) -> Any? { switch type { - case 128: - return NativeAWSCredentials.fromList(self.readValue() as! [Any?]) - case 129: - return NativeAuthSession.fromList(self.readValue() as! [Any?]) - case 130: - return NativeUserPoolTokens.fromList(self.readValue() as! [Any?]) - default: - return super.readValue(ofType: type) + case 129: + return NativeAuthSession.fromList(self.readValue() as! [Any?]) + case 130: + return NativeAuthUser.fromList(self.readValue() as! [Any?]) + case 131: + return NativeUserPoolTokens.fromList(self.readValue() as! [Any?]) + case 132: + return NativeAWSCredentials.fromList(self.readValue() as! [Any?]) + case 133: + return LegacyCredentialStoreData.fromList(self.readValue() as! [Any?]) + case 134: + return NativeGraphQLResponse.fromList(self.readValue() as! [Any?]) + case 135: + return NativeGraphQLSubscriptionResponse.fromList(self.readValue() as! [Any?]) + case 136: + return NativeGraphQLRequest.fromList(self.readValue() as! [Any?]) + default: + return super.readValue(ofType: type) } } } -private class NativeAuthPluginCodecWriter: FlutterStandardWriter { +private class NativePluginBindingsPigeonCodecWriter: FlutterStandardWriter { override func writeValue(_ value: Any) { - if let value = value as? NativeAWSCredentials { - super.writeByte(128) - super.writeValue(value.toList()) - } else if let value = value as? NativeAuthSession { + if let value = value as? NativeAuthSession { super.writeByte(129) super.writeValue(value.toList()) - } else if let value = value as? NativeUserPoolTokens { + } else if let value = value as? NativeAuthUser { super.writeByte(130) super.writeValue(value.toList()) + } else if let value = value as? NativeUserPoolTokens { + super.writeByte(131) + super.writeValue(value.toList()) + } else if let value = value as? NativeAWSCredentials { + super.writeByte(132) + super.writeValue(value.toList()) + } else if let value = value as? LegacyCredentialStoreData { + super.writeByte(133) + super.writeValue(value.toList()) + } else if let value = value as? NativeGraphQLResponse { + super.writeByte(134) + super.writeValue(value.toList()) + } else if let value = value as? NativeGraphQLSubscriptionResponse { + super.writeByte(135) + super.writeValue(value.toList()) + } else if let value = value as? NativeGraphQLRequest { + super.writeByte(136) + super.writeValue(value.toList()) } else { super.writeValue(value) } } } -private class NativeAuthPluginCodecReaderWriter: FlutterStandardReaderWriter { +private class NativePluginBindingsPigeonCodecReaderWriter: FlutterStandardReaderWriter { override func reader(with data: Data) -> FlutterStandardReader { - return NativeAuthPluginCodecReader(data: data) + return NativePluginBindingsPigeonCodecReader(data: data) } override func writer(with data: NSMutableData) -> FlutterStandardWriter { - return NativeAuthPluginCodecWriter(data: data) + return NativePluginBindingsPigeonCodecWriter(data: data) } } -class NativeAuthPluginCodec: FlutterStandardMessageCodec { - static let shared = NativeAuthPluginCodec(readerWriter: NativeAuthPluginCodecReaderWriter()) +class NativePluginBindingsPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable { + static let shared = NativePluginBindingsPigeonCodec(readerWriter: NativePluginBindingsPigeonCodecReaderWriter()) } + /// Bridge for calling Auth from Native into Flutter /// -/// Generated class from Pigeon that represents Flutter messages that can be called from Swift. -class NativeAuthPlugin { +/// Generated protocol from Pigeon that represents Flutter messages that can be called from Swift. +protocol NativeAuthPluginProtocol { + func fetchAuthSession(completion: @escaping (Result) -> Void) +} +class NativeAuthPlugin: NativeAuthPluginProtocol { private let binaryMessenger: FlutterBinaryMessenger - init(binaryMessenger: FlutterBinaryMessenger){ + private let messageChannelSuffix: String + init(binaryMessenger: FlutterBinaryMessenger, messageChannelSuffix: String = "") { self.binaryMessenger = binaryMessenger + self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" } - var codec: FlutterStandardMessageCodec { - return NativeAuthPluginCodec.shared + var codec: NativePluginBindingsPigeonCodec { + return NativePluginBindingsPigeonCodec.shared } - func fetchAuthSession(completion: @escaping (NativeAuthSession) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeAuthPlugin.fetchAuthSession", binaryMessenger: binaryMessenger, codec: codec) + func fetchAuthSession(completion: @escaping (Result) -> Void) { + let channelName: String = "dev.flutter.pigeon.amplify_datastore.NativeAuthPlugin.fetchAuthSession\(messageChannelSuffix)" + let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { response in - let result = response as! NativeAuthSession - completion(result) - } - } -} -private class NativeApiPluginCodecReader: FlutterStandardReader { - override func readValue(ofType type: UInt8) -> Any? { - switch type { - case 128: - return NativeGraphQLRequest.fromList(self.readValue() as! [Any?]) - case 129: - return NativeGraphQLResponse.fromList(self.readValue() as! [Any?]) - case 130: - return NativeGraphQLSubscriptionResponse.fromList(self.readValue() as! [Any?]) - default: - return super.readValue(ofType: type) - } - } -} - -private class NativeApiPluginCodecWriter: FlutterStandardWriter { - override func writeValue(_ value: Any) { - if let value = value as? NativeGraphQLRequest { - super.writeByte(128) - super.writeValue(value.toList()) - } else if let value = value as? NativeGraphQLResponse { - super.writeByte(129) - super.writeValue(value.toList()) - } else if let value = value as? NativeGraphQLSubscriptionResponse { - super.writeByte(130) - super.writeValue(value.toList()) - } else { - super.writeValue(value) + guard let listResponse = response as? [Any?] else { + completion(.failure(createConnectionError(withChannelName: channelName))) + return + } + if listResponse.count > 1 { + let code: String = listResponse[0] as! String + let message: String? = nilOrValue(listResponse[1]) + let details: String? = nilOrValue(listResponse[2]) + completion(.failure(PigeonError(code: code, message: message, details: details))) + } else if listResponse[0] == nil { + completion(.failure(PigeonError(code: "null-error", message: "Flutter api returned null value for non-null return value.", details: ""))) + } else { + let result = listResponse[0] as! NativeAuthSession + completion(.success(result)) + } } } } - -private class NativeApiPluginCodecReaderWriter: FlutterStandardReaderWriter { - override func reader(with data: Data) -> FlutterStandardReader { - return NativeApiPluginCodecReader(data: data) - } - - override func writer(with data: NSMutableData) -> FlutterStandardWriter { - return NativeApiPluginCodecWriter(data: data) - } -} - -class NativeApiPluginCodec: FlutterStandardMessageCodec { - static let shared = NativeApiPluginCodec(readerWriter: NativeApiPluginCodecReaderWriter()) -} - /// Bridge for calling API plugin from Native into Flutter /// -/// Generated class from Pigeon that represents Flutter messages that can be called from Swift. -class NativeApiPlugin { +/// Generated protocol from Pigeon that represents Flutter messages that can be called from Swift. +protocol NativeApiPluginProtocol { + func getLatestAuthToken(providerName providerNameArg: String, completion: @escaping (Result) -> Void) + func mutate(request requestArg: NativeGraphQLRequest, completion: @escaping (Result) -> Void) + func query(request requestArg: NativeGraphQLRequest, completion: @escaping (Result) -> Void) + func subscribe(request requestArg: NativeGraphQLRequest, completion: @escaping (Result) -> Void) + func unsubscribe(subscriptionId subscriptionIdArg: String, completion: @escaping (Result) -> Void) + func deviceOffline(completion: @escaping (Result) -> Void) + func onStop(completion: @escaping (Result) -> Void) +} +class NativeApiPlugin: NativeApiPluginProtocol { private let binaryMessenger: FlutterBinaryMessenger - init(binaryMessenger: FlutterBinaryMessenger){ + private let messageChannelSuffix: String + init(binaryMessenger: FlutterBinaryMessenger, messageChannelSuffix: String = "") { self.binaryMessenger = binaryMessenger + self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" } - var codec: FlutterStandardMessageCodec { - return NativeApiPluginCodec.shared + var codec: NativePluginBindingsPigeonCodec { + return NativePluginBindingsPigeonCodec.shared } - func getLatestAuthToken(providerName providerNameArg: String, completion: @escaping (String?) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken", binaryMessenger: binaryMessenger, codec: codec) + func getLatestAuthToken(providerName providerNameArg: String, completion: @escaping (Result) -> Void) { + let channelName: String = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken\(messageChannelSuffix)" + let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([providerNameArg] as [Any?]) { response in - let result: String? = nilOrValue(response) - completion(result) + guard let listResponse = response as? [Any?] else { + completion(.failure(createConnectionError(withChannelName: channelName))) + return + } + if listResponse.count > 1 { + let code: String = listResponse[0] as! String + let message: String? = nilOrValue(listResponse[1]) + let details: String? = nilOrValue(listResponse[2]) + completion(.failure(PigeonError(code: code, message: message, details: details))) + } else { + let result: String? = nilOrValue(listResponse[0]) + completion(.success(result)) + } } } - func mutate(request requestArg: NativeGraphQLRequest, completion: @escaping (NativeGraphQLResponse) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.mutate", binaryMessenger: binaryMessenger, codec: codec) + func mutate(request requestArg: NativeGraphQLRequest, completion: @escaping (Result) -> Void) { + let channelName: String = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.mutate\(messageChannelSuffix)" + let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([requestArg] as [Any?]) { response in - let result = response as! NativeGraphQLResponse - completion(result) + guard let listResponse = response as? [Any?] else { + completion(.failure(createConnectionError(withChannelName: channelName))) + return + } + if listResponse.count > 1 { + let code: String = listResponse[0] as! String + let message: String? = nilOrValue(listResponse[1]) + let details: String? = nilOrValue(listResponse[2]) + completion(.failure(PigeonError(code: code, message: message, details: details))) + } else if listResponse[0] == nil { + completion(.failure(PigeonError(code: "null-error", message: "Flutter api returned null value for non-null return value.", details: ""))) + } else { + let result = listResponse[0] as! NativeGraphQLResponse + completion(.success(result)) + } } } - func query(request requestArg: NativeGraphQLRequest, completion: @escaping (NativeGraphQLResponse) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.query", binaryMessenger: binaryMessenger, codec: codec) + func query(request requestArg: NativeGraphQLRequest, completion: @escaping (Result) -> Void) { + let channelName: String = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.query\(messageChannelSuffix)" + let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([requestArg] as [Any?]) { response in - let result = response as! NativeGraphQLResponse - completion(result) + guard let listResponse = response as? [Any?] else { + completion(.failure(createConnectionError(withChannelName: channelName))) + return + } + if listResponse.count > 1 { + let code: String = listResponse[0] as! String + let message: String? = nilOrValue(listResponse[1]) + let details: String? = nilOrValue(listResponse[2]) + completion(.failure(PigeonError(code: code, message: message, details: details))) + } else if listResponse[0] == nil { + completion(.failure(PigeonError(code: "null-error", message: "Flutter api returned null value for non-null return value.", details: ""))) + } else { + let result = listResponse[0] as! NativeGraphQLResponse + completion(.success(result)) + } } } - func subscribe(request requestArg: NativeGraphQLRequest, completion: @escaping (NativeGraphQLSubscriptionResponse) -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.subscribe", binaryMessenger: binaryMessenger, codec: codec) + func subscribe(request requestArg: NativeGraphQLRequest, completion: @escaping (Result) -> Void) { + let channelName: String = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.subscribe\(messageChannelSuffix)" + let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([requestArg] as [Any?]) { response in - let result = response as! NativeGraphQLSubscriptionResponse - completion(result) + guard let listResponse = response as? [Any?] else { + completion(.failure(createConnectionError(withChannelName: channelName))) + return + } + if listResponse.count > 1 { + let code: String = listResponse[0] as! String + let message: String? = nilOrValue(listResponse[1]) + let details: String? = nilOrValue(listResponse[2]) + completion(.failure(PigeonError(code: code, message: message, details: details))) + } else if listResponse[0] == nil { + completion(.failure(PigeonError(code: "null-error", message: "Flutter api returned null value for non-null return value.", details: ""))) + } else { + let result = listResponse[0] as! NativeGraphQLSubscriptionResponse + completion(.success(result)) + } } } - func unsubscribe(subscriptionId subscriptionIdArg: String, completion: @escaping () -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.unsubscribe", binaryMessenger: binaryMessenger, codec: codec) - channel.sendMessage([subscriptionIdArg] as [Any?]) { _ in - completion() + func unsubscribe(subscriptionId subscriptionIdArg: String, completion: @escaping (Result) -> Void) { + let channelName: String = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.unsubscribe\(messageChannelSuffix)" + let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec) + channel.sendMessage([subscriptionIdArg] as [Any?]) { response in + guard let listResponse = response as? [Any?] else { + completion(.failure(createConnectionError(withChannelName: channelName))) + return + } + if listResponse.count > 1 { + let code: String = listResponse[0] as! String + let message: String? = nilOrValue(listResponse[1]) + let details: String? = nilOrValue(listResponse[2]) + completion(.failure(PigeonError(code: code, message: message, details: details))) + } else { + completion(.success(Void())) + } } } - func deviceOffline(completion: @escaping () -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.deviceOffline", binaryMessenger: binaryMessenger, codec: codec) - channel.sendMessage(nil) { _ in - completion() + func deviceOffline(completion: @escaping (Result) -> Void) { + let channelName: String = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.deviceOffline\(messageChannelSuffix)" + let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec) + channel.sendMessage(nil) { response in + guard let listResponse = response as? [Any?] else { + completion(.failure(createConnectionError(withChannelName: channelName))) + return + } + if listResponse.count > 1 { + let code: String = listResponse[0] as! String + let message: String? = nilOrValue(listResponse[1]) + let details: String? = nilOrValue(listResponse[2]) + completion(.failure(PigeonError(code: code, message: message, details: details))) + } else { + completion(.success(Void())) + } } } - func onStop(completion: @escaping () -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.onStop", binaryMessenger: binaryMessenger, codec: codec) - channel.sendMessage(nil) { _ in - completion() + func onStop(completion: @escaping (Result) -> Void) { + let channelName: String = "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.onStop\(messageChannelSuffix)" + let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec) + channel.sendMessage(nil) { response in + guard let listResponse = response as? [Any?] else { + completion(.failure(createConnectionError(withChannelName: channelName))) + return + } + if listResponse.count > 1 { + let code: String = listResponse[0] as! String + let message: String? = nilOrValue(listResponse[1]) + let details: String? = nilOrValue(listResponse[2]) + completion(.failure(PigeonError(code: code, message: message, details: details))) + } else { + completion(.success(Void())) + } } } } @@ -423,10 +617,11 @@ protocol NativeAmplifyBridge { /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. class NativeAmplifyBridgeSetup { - /// The codec used by NativeAmplifyBridge. + static var codec: FlutterStandardMessageCodec { NativePluginBindingsPigeonCodec.shared } /// Sets up an instance of `NativeAmplifyBridge` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NativeAmplifyBridge?) { - let configureChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeAmplifyBridge.configure", binaryMessenger: binaryMessenger) + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NativeAmplifyBridge?, messageChannelSuffix: String = "") { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" + let configureChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeAmplifyBridge.configure\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { configureChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -434,10 +629,10 @@ class NativeAmplifyBridgeSetup { let configArg = args[1] as! String api.configure(version: versionArg, config: configArg) { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } @@ -446,42 +641,6 @@ class NativeAmplifyBridgeSetup { } } } -private class NativeAuthBridgeCodecReader: FlutterStandardReader { - override func readValue(ofType type: UInt8) -> Any? { - switch type { - case 128: - return NativeAuthUser.fromList(self.readValue() as! [Any?]) - default: - return super.readValue(ofType: type) - } - } -} - -private class NativeAuthBridgeCodecWriter: FlutterStandardWriter { - override func writeValue(_ value: Any) { - if let value = value as? NativeAuthUser { - super.writeByte(128) - super.writeValue(value.toList()) - } else { - super.writeValue(value) - } - } -} - -private class NativeAuthBridgeCodecReaderWriter: FlutterStandardReaderWriter { - override func reader(with data: Data) -> FlutterStandardReader { - return NativeAuthBridgeCodecReader(data: data) - } - - override func writer(with data: NSMutableData) -> FlutterStandardWriter { - return NativeAuthBridgeCodecWriter(data: data) - } -} - -class NativeAuthBridgeCodec: FlutterStandardMessageCodec { - static let shared = NativeAuthBridgeCodec(readerWriter: NativeAuthBridgeCodecReaderWriter()) -} - /// Bridge for calling Auth plugin from Flutter into Native /// /// Generated protocol from Pigeon that represents a handler of messages from Flutter. @@ -492,26 +651,26 @@ protocol NativeAuthBridge { /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. class NativeAuthBridgeSetup { - /// The codec used by NativeAuthBridge. - static var codec: FlutterStandardMessageCodec { NativeAuthBridgeCodec.shared } + static var codec: FlutterStandardMessageCodec { NativePluginBindingsPigeonCodec.shared } /// Sets up an instance of `NativeAuthBridge` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NativeAuthBridge?) { - let addAuthPluginChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.addAuthPlugin", binaryMessenger: binaryMessenger, codec: codec) + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NativeAuthBridge?, messageChannelSuffix: String = "") { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" + let addAuthPluginChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.addAuthPlugin\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { addAuthPluginChannel.setMessageHandler { _, reply in - api.addAuthPlugin() { result in + api.addAuthPlugin { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } } else { addAuthPluginChannel.setMessageHandler(nil) } - let updateCurrentUserChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.updateCurrentUser", binaryMessenger: binaryMessenger, codec: codec) + let updateCurrentUserChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.updateCurrentUser\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { updateCurrentUserChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -528,42 +687,6 @@ class NativeAuthBridgeSetup { } } } -private class NativeApiBridgeCodecReader: FlutterStandardReader { - override func readValue(ofType type: UInt8) -> Any? { - switch type { - case 128: - return NativeGraphQLSubscriptionResponse.fromList(self.readValue() as! [Any?]) - default: - return super.readValue(ofType: type) - } - } -} - -private class NativeApiBridgeCodecWriter: FlutterStandardWriter { - override func writeValue(_ value: Any) { - if let value = value as? NativeGraphQLSubscriptionResponse { - super.writeByte(128) - super.writeValue(value.toList()) - } else { - super.writeValue(value) - } - } -} - -private class NativeApiBridgeCodecReaderWriter: FlutterStandardReaderWriter { - override func reader(with data: Data) -> FlutterStandardReader { - return NativeApiBridgeCodecReader(data: data) - } - - override func writer(with data: NSMutableData) -> FlutterStandardWriter { - return NativeApiBridgeCodecWriter(data: data) - } -} - -class NativeApiBridgeCodec: FlutterStandardMessageCodec { - static let shared = NativeApiBridgeCodec(readerWriter: NativeApiBridgeCodecReaderWriter()) -} - /// Bridge for calling API methods from Flutter into Native /// /// Generated protocol from Pigeon that represents a handler of messages from Flutter. @@ -574,11 +697,11 @@ protocol NativeApiBridge { /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. class NativeApiBridgeSetup { - /// The codec used by NativeApiBridge. - static var codec: FlutterStandardMessageCodec { NativeApiBridgeCodec.shared } + static var codec: FlutterStandardMessageCodec { NativePluginBindingsPigeonCodec.shared } /// Sets up an instance of `NativeApiBridge` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NativeApiBridge?) { - let addApiPluginChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiBridge.addApiPlugin", binaryMessenger: binaryMessenger, codec: codec) + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NativeApiBridge?, messageChannelSuffix: String = "") { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" + let addApiPluginChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiBridge.addApiPlugin\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { addApiPluginChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -586,27 +709,27 @@ class NativeApiBridgeSetup { let endpointsArg = args[1] as! [String: String] api.addApiPlugin(authProvidersList: authProvidersListArg, endpoints: endpointsArg) { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } } else { addApiPluginChannel.setMessageHandler(nil) } - let sendSubscriptionEventChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiBridge.sendSubscriptionEvent", binaryMessenger: binaryMessenger, codec: codec) + let sendSubscriptionEventChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiBridge.sendSubscriptionEvent\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { sendSubscriptionEventChannel.setMessageHandler { message, reply in let args = message as! [Any?] let eventArg = args[0] as! NativeGraphQLSubscriptionResponse api.sendSubscriptionEvent(event: eventArg) { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } diff --git a/packages/amplify_datastore/lib/amplify_datastore.dart b/packages/amplify_datastore/lib/amplify_datastore.dart index b71231d95c..f94384ed6a 100644 --- a/packages/amplify_datastore/lib/amplify_datastore.dart +++ b/packages/amplify_datastore/lib/amplify_datastore.dart @@ -61,7 +61,7 @@ class AmplifyDataStore extends DataStorePluginInterface if (authPlugin != null) { // Configure this plugin to act as a native iOS/Android plugin. final nativePlugin = _NativeAmplifyAuthCognito(); - NativeAuthPlugin.setup(nativePlugin); + NativeAuthPlugin.setUp(nativePlugin); final nativeBridge = NativeAuthBridge(); try { await nativeBridge.addAuthPlugin(); @@ -109,7 +109,7 @@ class AmplifyDataStore extends DataStorePluginInterface endpoints[e.key] = e.value.defaultAuthorizationType.name; }); final nativePlugin = NativeAmplifyApi(authProviders); - NativeApiPlugin.setup(nativePlugin); + NativeApiPlugin.setUp(nativePlugin); final nativeBridge = NativeApiBridge(); try { diff --git a/packages/amplify_datastore/lib/src/native_plugin.g.dart b/packages/amplify_datastore/lib/src/native_plugin.g.dart index c87f9b9994..f385d6c848 100644 --- a/packages/amplify_datastore/lib/src/native_plugin.g.dart +++ b/packages/amplify_datastore/lib/src/native_plugin.g.dart @@ -1,9 +1,9 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.1), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; @@ -11,6 +11,24 @@ import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +PlatformException _createConnectionError(String channelName) { + return PlatformException( + code: 'channel-error', + message: 'Unable to establish connection on channel: "$channelName".', + ); +} + +List wrapResponse( + {Object? result, PlatformException? error, bool empty = false}) { + if (empty) { + return []; + } + if (error == null) { + return [result]; + } + return [error.code, error.message, error.details]; +} + class NativeAuthSession { NativeAuthSession({ required this.isSignedIn, @@ -34,9 +52,9 @@ class NativeAuthSession { return [ isSignedIn, userSub, - userPoolTokens?.encode(), + userPoolTokens, identityId, - awsCredentials?.encode(), + awsCredentials, ]; } @@ -45,13 +63,9 @@ class NativeAuthSession { return NativeAuthSession( isSignedIn: result[0]! as bool, userSub: result[1] as String?, - userPoolTokens: result[2] != null - ? NativeUserPoolTokens.decode(result[2]! as List) - : null, + userPoolTokens: result[2] as NativeUserPoolTokens?, identityId: result[3] as String?, - awsCredentials: result[4] != null - ? NativeAWSCredentials.decode(result[4]! as List) - : null, + awsCredentials: result[4] as NativeAWSCredentials?, ); } } @@ -149,6 +163,62 @@ class NativeAWSCredentials { } } +class LegacyCredentialStoreData { + LegacyCredentialStoreData({ + this.identityId, + this.accessKeyId, + this.secretAccessKey, + this.sessionToken, + this.expirationMsSinceEpoch, + this.accessToken, + this.refreshToken, + this.idToken, + }); + + String? identityId; + + String? accessKeyId; + + String? secretAccessKey; + + String? sessionToken; + + int? expirationMsSinceEpoch; + + String? accessToken; + + String? refreshToken; + + String? idToken; + + Object encode() { + return [ + identityId, + accessKeyId, + secretAccessKey, + sessionToken, + expirationMsSinceEpoch, + accessToken, + refreshToken, + idToken, + ]; + } + + static LegacyCredentialStoreData decode(Object result) { + result as List; + return LegacyCredentialStoreData( + identityId: result[0] as String?, + accessKeyId: result[1] as String?, + secretAccessKey: result[2] as String?, + sessionToken: result[3] as String?, + expirationMsSinceEpoch: result[4] as int?, + accessToken: result[5] as String?, + refreshToken: result[6] as String?, + idToken: result[7] as String?, + ); + } +} + class NativeGraphQLResponse { NativeGraphQLResponse({ this.payloadJson, @@ -252,19 +322,37 @@ class NativeGraphQLRequest { } } -class _NativeAuthPluginCodec extends StandardMessageCodec { - const _NativeAuthPluginCodec(); +class _PigeonCodec extends StandardMessageCodec { + const _PigeonCodec(); @override void writeValue(WriteBuffer buffer, Object? value) { - if (value is NativeAWSCredentials) { - buffer.putUint8(128); - writeValue(buffer, value.encode()); + if (value is int) { + buffer.putUint8(4); + buffer.putInt64(value); } else if (value is NativeAuthSession) { buffer.putUint8(129); writeValue(buffer, value.encode()); - } else if (value is NativeUserPoolTokens) { + } else if (value is NativeAuthUser) { buffer.putUint8(130); writeValue(buffer, value.encode()); + } else if (value is NativeUserPoolTokens) { + buffer.putUint8(131); + writeValue(buffer, value.encode()); + } else if (value is NativeAWSCredentials) { + buffer.putUint8(132); + writeValue(buffer, value.encode()); + } else if (value is LegacyCredentialStoreData) { + buffer.putUint8(133); + writeValue(buffer, value.encode()); + } else if (value is NativeGraphQLResponse) { + buffer.putUint8(134); + writeValue(buffer, value.encode()); + } else if (value is NativeGraphQLSubscriptionResponse) { + buffer.putUint8(135); + writeValue(buffer, value.encode()); + } else if (value is NativeGraphQLRequest) { + buffer.putUint8(136); + writeValue(buffer, value.encode()); } else { super.writeValue(buffer, value); } @@ -273,12 +361,22 @@ class _NativeAuthPluginCodec extends StandardMessageCodec { @override Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { - case 128: - return NativeAWSCredentials.decode(readValue(buffer)!); case 129: return NativeAuthSession.decode(readValue(buffer)!); case 130: + return NativeAuthUser.decode(readValue(buffer)!); + case 131: return NativeUserPoolTokens.decode(readValue(buffer)!); + case 132: + return NativeAWSCredentials.decode(readValue(buffer)!); + case 133: + return LegacyCredentialStoreData.decode(readValue(buffer)!); + case 134: + return NativeGraphQLResponse.decode(readValue(buffer)!); + case 135: + return NativeGraphQLSubscriptionResponse.decode(readValue(buffer)!); + case 136: + return NativeGraphQLRequest.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); } @@ -287,65 +385,46 @@ class _NativeAuthPluginCodec extends StandardMessageCodec { /// Bridge for calling Auth from Native into Flutter abstract class NativeAuthPlugin { - static const MessageCodec codec = _NativeAuthPluginCodec(); + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); Future fetchAuthSession(); - static void setup(NativeAuthPlugin? api, {BinaryMessenger? binaryMessenger}) { + static void setUp( + NativeAuthPlugin? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeAuthPlugin.fetchAuthSession', - codec, + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< + Object?>( + 'dev.flutter.pigeon.amplify_datastore.NativeAuthPlugin.fetchAuthSession$messageChannelSuffix', + pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - channel.setMessageHandler((Object? message) async { - // ignore message - final NativeAuthSession output = await api.fetchAuthSession(); - return output; + pigeonVar_channel.setMessageHandler((Object? message) async { + try { + final NativeAuthSession output = await api.fetchAuthSession(); + return wrapResponse(result: output); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString())); + } }); } } } } -class _NativeApiPluginCodec extends StandardMessageCodec { - const _NativeApiPluginCodec(); - @override - void writeValue(WriteBuffer buffer, Object? value) { - if (value is NativeGraphQLRequest) { - buffer.putUint8(128); - writeValue(buffer, value.encode()); - } else if (value is NativeGraphQLResponse) { - buffer.putUint8(129); - writeValue(buffer, value.encode()); - } else if (value is NativeGraphQLSubscriptionResponse) { - buffer.putUint8(130); - writeValue(buffer, value.encode()); - } else { - super.writeValue(buffer, value); - } - } - - @override - Object? readValueOfType(int type, ReadBuffer buffer) { - switch (type) { - case 128: - return NativeGraphQLRequest.decode(readValue(buffer)!); - case 129: - return NativeGraphQLResponse.decode(readValue(buffer)!); - case 130: - return NativeGraphQLSubscriptionResponse.decode(readValue(buffer)!); - default: - return super.readValueOfType(type, buffer); - } - } -} - /// Bridge for calling API plugin from Native into Flutter abstract class NativeApiPlugin { - static const MessageCodec codec = _NativeApiPluginCodec(); + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); Future getLatestAuthToken(String providerName); @@ -362,36 +441,54 @@ abstract class NativeApiPlugin { Future onStop(); - static void setup(NativeApiPlugin? api, {BinaryMessenger? binaryMessenger}) { + static void setUp( + NativeApiPlugin? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken', - codec, + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< + Object?>( + 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken$messageChannelSuffix', + pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken was null.'); final List args = (message as List?)!; final String? arg_providerName = (args[0] as String?); assert(arg_providerName != null, 'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken was null, expected non-null String.'); - final String? output = - await api.getLatestAuthToken(arg_providerName!); - return output; + try { + final String? output = + await api.getLatestAuthToken(arg_providerName!); + return wrapResponse(result: output); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString())); + } }); } } { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.mutate', codec, + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< + Object?>( + 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.mutate$messageChannelSuffix', + pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.mutate was null.'); final List args = (message as List?)!; @@ -399,19 +496,29 @@ abstract class NativeApiPlugin { (args[0] as NativeGraphQLRequest?); assert(arg_request != null, 'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.mutate was null, expected non-null NativeGraphQLRequest.'); - final NativeGraphQLResponse output = await api.mutate(arg_request!); - return output; + try { + final NativeGraphQLResponse output = await api.mutate(arg_request!); + return wrapResponse(result: output); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString())); + } }); } } { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.query', codec, + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< + Object?>( + 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.query$messageChannelSuffix', + pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.query was null.'); final List args = (message as List?)!; @@ -419,20 +526,29 @@ abstract class NativeApiPlugin { (args[0] as NativeGraphQLRequest?); assert(arg_request != null, 'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.query was null, expected non-null NativeGraphQLRequest.'); - final NativeGraphQLResponse output = await api.query(arg_request!); - return output; + try { + final NativeGraphQLResponse output = await api.query(arg_request!); + return wrapResponse(result: output); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString())); + } }); } } { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.subscribe', - codec, + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< + Object?>( + 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.subscribe$messageChannelSuffix', + pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.subscribe was null.'); final List args = (message as List?)!; @@ -440,58 +556,91 @@ abstract class NativeApiPlugin { (args[0] as NativeGraphQLRequest?); assert(arg_request != null, 'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.subscribe was null, expected non-null NativeGraphQLRequest.'); - final NativeGraphQLSubscriptionResponse output = - await api.subscribe(arg_request!); - return output; + try { + final NativeGraphQLSubscriptionResponse output = + await api.subscribe(arg_request!); + return wrapResponse(result: output); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString())); + } }); } } { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.unsubscribe', - codec, + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< + Object?>( + 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.unsubscribe$messageChannelSuffix', + pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.unsubscribe was null.'); final List args = (message as List?)!; final String? arg_subscriptionId = (args[0] as String?); assert(arg_subscriptionId != null, 'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.unsubscribe was null, expected non-null String.'); - await api.unsubscribe(arg_subscriptionId!); - return; + try { + await api.unsubscribe(arg_subscriptionId!); + return wrapResponse(empty: true); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString())); + } }); } } { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.deviceOffline', - codec, + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< + Object?>( + 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.deviceOffline$messageChannelSuffix', + pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - channel.setMessageHandler((Object? message) async { - // ignore message - await api.deviceOffline(); - return; + pigeonVar_channel.setMessageHandler((Object? message) async { + try { + await api.deviceOffline(); + return wrapResponse(empty: true); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString())); + } }); } } { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.onStop', codec, + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< + Object?>( + 'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.onStop$messageChannelSuffix', + pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - channel.setMessageHandler((Object? message) async { - // ignore message - await api.onStop(); - return; + pigeonVar_channel.setMessageHandler((Object? message) async { + try { + await api.onStop(); + return wrapResponse(empty: true); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString())); + } }); } } @@ -503,29 +652,35 @@ class NativeAmplifyBridge { /// Constructor for [NativeAmplifyBridge]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - NativeAmplifyBridge({BinaryMessenger? binaryMessenger}) - : _binaryMessenger = binaryMessenger; - final BinaryMessenger? _binaryMessenger; - - static const MessageCodec codec = StandardMessageCodec(); - - Future configure(String arg_version, String arg_config) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeAmplifyBridge.configure', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel - .send([arg_version, arg_config]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + NativeAmplifyBridge( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + final BinaryMessenger? pigeonVar_binaryMessenger; + + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); + + final String pigeonVar_messageChannelSuffix; + + Future configure(String version, String config) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_datastore.NativeAmplifyBridge.configure$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([version, config]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -533,79 +688,64 @@ class NativeAmplifyBridge { } } -class _NativeAuthBridgeCodec extends StandardMessageCodec { - const _NativeAuthBridgeCodec(); - @override - void writeValue(WriteBuffer buffer, Object? value) { - if (value is NativeAuthUser) { - buffer.putUint8(128); - writeValue(buffer, value.encode()); - } else { - super.writeValue(buffer, value); - } - } - - @override - Object? readValueOfType(int type, ReadBuffer buffer) { - switch (type) { - case 128: - return NativeAuthUser.decode(readValue(buffer)!); - default: - return super.readValueOfType(type, buffer); - } - } -} - /// Bridge for calling Auth plugin from Flutter into Native class NativeAuthBridge { /// Constructor for [NativeAuthBridge]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - NativeAuthBridge({BinaryMessenger? binaryMessenger}) - : _binaryMessenger = binaryMessenger; - final BinaryMessenger? _binaryMessenger; + NativeAuthBridge( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + final BinaryMessenger? pigeonVar_binaryMessenger; + + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); - static const MessageCodec codec = _NativeAuthBridgeCodec(); + final String pigeonVar_messageChannelSuffix; Future addAuthPlugin() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.addAuthPlugin', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send(null) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.addAuthPlugin$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; } } - Future updateCurrentUser(NativeAuthUser? arg_user) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.updateCurrentUser', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_user]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + Future updateCurrentUser(NativeAuthUser? user) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.updateCurrentUser$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send([user]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -613,59 +753,41 @@ class NativeAuthBridge { } } -class _NativeApiBridgeCodec extends StandardMessageCodec { - const _NativeApiBridgeCodec(); - @override - void writeValue(WriteBuffer buffer, Object? value) { - if (value is NativeGraphQLSubscriptionResponse) { - buffer.putUint8(128); - writeValue(buffer, value.encode()); - } else { - super.writeValue(buffer, value); - } - } - - @override - Object? readValueOfType(int type, ReadBuffer buffer) { - switch (type) { - case 128: - return NativeGraphQLSubscriptionResponse.decode(readValue(buffer)!); - default: - return super.readValueOfType(type, buffer); - } - } -} - /// Bridge for calling API methods from Flutter into Native class NativeApiBridge { /// Constructor for [NativeApiBridge]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - NativeApiBridge({BinaryMessenger? binaryMessenger}) - : _binaryMessenger = binaryMessenger; - final BinaryMessenger? _binaryMessenger; - - static const MessageCodec codec = _NativeApiBridgeCodec(); - - Future addApiPlugin(List arg_authProvidersList, - Map arg_endpoints) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeApiBridge.addApiPlugin', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_authProvidersList, arg_endpoints]) - as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + NativeApiBridge( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + final BinaryMessenger? pigeonVar_binaryMessenger; + + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); + + final String pigeonVar_messageChannelSuffix; + + Future addApiPlugin( + List authProvidersList, Map endpoints) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_datastore.NativeApiBridge.addApiPlugin$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([authProvidersList, endpoints]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -673,23 +795,24 @@ class NativeApiBridge { } Future sendSubscriptionEvent( - NativeGraphQLSubscriptionResponse arg_event) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_datastore.NativeApiBridge.sendSubscriptionEvent', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_event]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + NativeGraphQLSubscriptionResponse event) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_datastore.NativeApiBridge.sendSubscriptionEvent$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send([event]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; diff --git a/packages/amplify_datastore/pubspec.yaml b/packages/amplify_datastore/pubspec.yaml index 0896746cda..876d6fa6f8 100644 --- a/packages/amplify_datastore/pubspec.yaml +++ b/packages/amplify_datastore/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/am issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: flutter: @@ -25,7 +25,7 @@ dev_dependencies: flutter_test: sdk: flutter fake_async: ^1.2.0 - pigeon: ^11.0.0 + pigeon: ^22.6.2 # The following section is specific to Flutter. flutter: diff --git a/packages/amplify_datastore/test/native_amplify_api_test.dart b/packages/amplify_datastore/test/native_amplify_api_test.dart index 20d5844468..996dbb6ae7 100644 --- a/packages/amplify_datastore/test/native_amplify_api_test.dart +++ b/packages/amplify_datastore/test/native_amplify_api_test.dart @@ -973,8 +973,32 @@ class MockAPIPlugin extends APIPluginInterface { class MockNativeAuthBridgeCodec extends StandardMessageCodec { @override void writeValue(WriteBuffer buffer, Object? value) { - if (value is NativeGraphQLSubscriptionResponse) { - buffer.putUint8(128); + if (value is int) { + buffer.putUint8(4); + buffer.putInt64(value); + } else if (value is NativeAuthSession) { + buffer.putUint8(129); + writeValue(buffer, value.encode()); + } else if (value is NativeAuthUser) { + buffer.putUint8(130); + writeValue(buffer, value.encode()); + } else if (value is NativeUserPoolTokens) { + buffer.putUint8(131); + writeValue(buffer, value.encode()); + } else if (value is NativeAWSCredentials) { + buffer.putUint8(132); + writeValue(buffer, value.encode()); + } else if (value is LegacyCredentialStoreData) { + buffer.putUint8(133); + writeValue(buffer, value.encode()); + } else if (value is NativeGraphQLResponse) { + buffer.putUint8(134); + writeValue(buffer, value.encode()); + } else if (value is NativeGraphQLSubscriptionResponse) { + buffer.putUint8(135); + writeValue(buffer, value.encode()); + } else if (value is NativeGraphQLRequest) { + buffer.putUint8(136); writeValue(buffer, value.encode()); } else { super.writeValue(buffer, value); @@ -984,8 +1008,22 @@ class MockNativeAuthBridgeCodec extends StandardMessageCodec { @override Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { - case 128: + case 129: + return NativeAuthSession.decode(readValue(buffer)!); + case 130: + return NativeAuthUser.decode(readValue(buffer)!); + case 131: + return NativeUserPoolTokens.decode(readValue(buffer)!); + case 132: + return NativeAWSCredentials.decode(readValue(buffer)!); + case 133: + return LegacyCredentialStoreData.decode(readValue(buffer)!); + case 134: + return NativeGraphQLResponse.decode(readValue(buffer)!); + case 135: return NativeGraphQLSubscriptionResponse.decode(readValue(buffer)!); + case 136: + return NativeGraphQLRequest.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); } diff --git a/packages/amplify_datastore_plugin_interface/pubspec.yaml b/packages/amplify_datastore_plugin_interface/pubspec.yaml index a9f56a5cde..0e4742ade0 100644 --- a/packages/amplify_datastore_plugin_interface/pubspec.yaml +++ b/packages/amplify_datastore_plugin_interface/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/am issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_core: ">=2.6.0 <2.7.0" diff --git a/packages/amplify_lints/pubspec.yaml b/packages/amplify_lints/pubspec.yaml index 01d83766c0..87ad28cc7c 100644 --- a/packages/amplify_lints/pubspec.yaml +++ b/packages/amplify_lints/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/am issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: flutter_lints: ^3.0.0 diff --git a/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/pigeons/LegacyNativePluginPigeon.kt b/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/pigeons/LegacyNativePluginPigeon.kt index f6035accd1..f4b6a8668f 100644 --- a/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/pigeons/LegacyNativePluginPigeon.kt +++ b/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/pigeons/LegacyNativePluginPigeon.kt @@ -1,8 +1,9 @@ -// +// // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.1), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon +@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") package com.amazonaws.amplify.amplify_native_legacy_wrapper.pigeons @@ -19,14 +20,14 @@ private fun wrapResult(result: Any?): List { } private fun wrapError(exception: Throwable): List { - if (exception is FlutterError) { - return listOf( + return if (exception is FlutterError) { + listOf( exception.code, exception.message, exception.details ) } else { - return listOf( + listOf( exception.javaClass.simpleName, exception.toString(), "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception) @@ -45,6 +46,15 @@ class FlutterError ( override val message: String? = null, val details: Any? = null ) : Throwable() +private open class LegacyNativePluginPigeonPigeonCodec : StandardMessageCodec() { + override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? { + return super.readValueOfType(type, buffer) + } + override fun writeValue(stream: ByteArrayOutputStream, value: Any?) { + super.writeValue(stream, value) + } +} + /** Generated interface from Pigeon that represents a handler of messages from Flutter. */ interface LegacyNativePlugin { @@ -56,13 +66,14 @@ interface LegacyNativePlugin { companion object { /** The codec used by LegacyNativePlugin. */ val codec: MessageCodec by lazy { - StandardMessageCodec() + LegacyNativePluginPigeonPigeonCodec() } /** Sets up an instance of `LegacyNativePlugin` to handle messages through the `binaryMessenger`. */ - @Suppress("UNCHECKED_CAST") - fun setUp(binaryMessenger: BinaryMessenger, api: LegacyNativePlugin?) { + @JvmOverloads + fun setUp(binaryMessenger: BinaryMessenger, api: LegacyNativePlugin?, messageChannelSuffix: String = "") { + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.configure", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.configure$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -81,10 +92,10 @@ interface LegacyNativePlugin { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signOut", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signOut$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> - api.signOut() { result: Result -> + api.signOut{ result: Result -> val error = result.exceptionOrNull() if (error != null) { reply.reply(wrapError(error)) @@ -98,7 +109,7 @@ interface LegacyNativePlugin { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signIn", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signIn$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -118,10 +129,10 @@ interface LegacyNativePlugin { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.rememberDevice", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.rememberDevice$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> - api.rememberDevice() { result: Result -> + api.rememberDevice{ result: Result -> val error = result.exceptionOrNull() if (error != null) { reply.reply(wrapError(error)) diff --git a/packages/amplify_native_legacy_wrapper/example/android/app/build.gradle b/packages/amplify_native_legacy_wrapper/example/android/app/build.gradle index cad59f0ca2..68b1cdcdd2 100644 --- a/packages/amplify_native_legacy_wrapper/example/android/app/build.gradle +++ b/packages/amplify_native_legacy_wrapper/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace 'com.amazonaws.amplify.amplify_native_legacy_wrapper_example' compileSdk flutter.compileSdkVersion @@ -67,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/packages/amplify_native_legacy_wrapper/example/android/build.gradle b/packages/amplify_native_legacy_wrapper/example/android/build.gradle index 070b4ffbfd..bc157bd1a1 100644 --- a/packages/amplify_native_legacy_wrapper/example/android/build.gradle +++ b/packages/amplify_native_legacy_wrapper/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/packages/amplify_native_legacy_wrapper/example/android/settings.gradle b/packages/amplify_native_legacy_wrapper/example/android/settings.gradle index 44e62bcf06..276cdabf9c 100644 --- a/packages/amplify_native_legacy_wrapper/example/android/settings.gradle +++ b/packages/amplify_native_legacy_wrapper/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.10" apply false +} + +include ":app" diff --git a/packages/amplify_native_legacy_wrapper/example/pubspec.yaml b/packages/amplify_native_legacy_wrapper/example/pubspec.yaml index 7a3d57263d..393bb6178e 100644 --- a/packages/amplify_native_legacy_wrapper/example/pubspec.yaml +++ b/packages/amplify_native_legacy_wrapper/example/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0 publish_to: "none" environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_native_legacy_wrapper: ^0.1.0 diff --git a/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift b/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift index dd47b3f22d..8933534d7c 100644 --- a/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift +++ b/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift @@ -1,20 +1,35 @@ -// +// // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.1), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation + #if os(iOS) -import Flutter + import Flutter #elseif os(macOS) -import FlutterMacOS + import FlutterMacOS #else -#error("Unsupported platform.") + #error("Unsupported platform.") #endif -private func isNullish(_ value: Any?) -> Bool { - return value is NSNull || value == nil +/// Error class for passing custom error details to Dart side. +final class PigeonError: Error { + let code: String + let message: String? + let details: Any? + + init(code: String, message: String?, details: Any?) { + self.code = code + self.message = message + self.details = details + } + + var localizedDescription: String { + return + "PigeonError(code: \(code), message: \(message ?? ""), details: \(details ?? "")" + } } private func wrapResult(_ result: Any?) -> [Any?] { @@ -22,25 +37,57 @@ private func wrapResult(_ result: Any?) -> [Any?] { } private func wrapError(_ error: Any) -> [Any?] { + if let pigeonError = error as? PigeonError { + return [ + pigeonError.code, + pigeonError.message, + pigeonError.details, + ] + } if let flutterError = error as? FlutterError { return [ flutterError.code, flutterError.message, - flutterError.details + flutterError.details, ] } return [ "\(error)", "\(type(of: error))", - "Stacktrace: \(Thread.callStackSymbols)" + "Stacktrace: \(Thread.callStackSymbols)", ] } +private func isNullish(_ value: Any?) -> Bool { + return value is NSNull || value == nil +} + private func nilOrValue(_ value: Any?) -> T? { if value is NSNull { return nil } return value as! T? } +private class AmplifyNativeLegacyPluginPigeonCodecReader: FlutterStandardReader { +} + +private class AmplifyNativeLegacyPluginPigeonCodecWriter: FlutterStandardWriter { +} + +private class AmplifyNativeLegacyPluginPigeonCodecReaderWriter: FlutterStandardReaderWriter { + override func reader(with data: Data) -> FlutterStandardReader { + return AmplifyNativeLegacyPluginPigeonCodecReader(data: data) + } + + override func writer(with data: NSMutableData) -> FlutterStandardWriter { + return AmplifyNativeLegacyPluginPigeonCodecWriter(data: data) + } +} + +class AmplifyNativeLegacyPluginPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable { + static let shared = AmplifyNativeLegacyPluginPigeonCodec(readerWriter: AmplifyNativeLegacyPluginPigeonCodecReaderWriter()) +} + + /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol LegacyNativePlugin { func configure(config: String, completion: @escaping (Result) -> Void) @@ -51,42 +98,43 @@ protocol LegacyNativePlugin { /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. class LegacyNativePluginSetup { - /// The codec used by LegacyNativePlugin. + static var codec: FlutterStandardMessageCodec { AmplifyNativeLegacyPluginPigeonCodec.shared } /// Sets up an instance of `LegacyNativePlugin` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: LegacyNativePlugin?) { - let configureChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.configure", binaryMessenger: binaryMessenger) + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: LegacyNativePlugin?, messageChannelSuffix: String = "") { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" + let configureChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.configure\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { configureChannel.setMessageHandler { message, reply in let args = message as! [Any?] let configArg = args[0] as! String api.configure(config: configArg) { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } } else { configureChannel.setMessageHandler(nil) } - let signOutChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signOut", binaryMessenger: binaryMessenger) + let signOutChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signOut\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { signOutChannel.setMessageHandler { _, reply in - api.signOut() { result in + api.signOut { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } } else { signOutChannel.setMessageHandler(nil) } - let signInChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signIn", binaryMessenger: binaryMessenger) + let signInChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signIn\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { signInChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -94,25 +142,25 @@ class LegacyNativePluginSetup { let passwordArg = args[1] as! String api.signIn(username: usernameArg, password: passwordArg) { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } } else { signInChannel.setMessageHandler(nil) } - let rememberDeviceChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.rememberDevice", binaryMessenger: binaryMessenger) + let rememberDeviceChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.rememberDevice\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { rememberDeviceChannel.setMessageHandler { _, reply in - api.rememberDevice() { result in + api.rememberDevice { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } diff --git a/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart b/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart index 06dce1ea3c..4990c442e9 100644 --- a/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart +++ b/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart @@ -1,9 +1,9 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.1), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; @@ -11,33 +11,67 @@ import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +PlatformException _createConnectionError(String channelName) { + return PlatformException( + code: 'channel-error', + message: 'Unable to establish connection on channel: "$channelName".', + ); +} + +class _PigeonCodec extends StandardMessageCodec { + const _PigeonCodec(); + @override + void writeValue(WriteBuffer buffer, Object? value) { + if (value is int) { + buffer.putUint8(4); + buffer.putInt64(value); + } else { + super.writeValue(buffer, value); + } + } + + @override + Object? readValueOfType(int type, ReadBuffer buffer) { + switch (type) { + default: + return super.readValueOfType(type, buffer); + } + } +} + class LegacyNativePlugin { /// Constructor for [LegacyNativePlugin]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - LegacyNativePlugin({BinaryMessenger? binaryMessenger}) - : _binaryMessenger = binaryMessenger; - final BinaryMessenger? _binaryMessenger; + LegacyNativePlugin( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + final BinaryMessenger? pigeonVar_binaryMessenger; - static const MessageCodec codec = StandardMessageCodec(); + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); - Future configure(String arg_config) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.configure', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_config]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_messageChannelSuffix; + + Future configure(String config) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.configure$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send([config]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -45,44 +79,47 @@ class LegacyNativePlugin { } Future signOut() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signOut', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send(null) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signOut$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; } } - Future signIn(String arg_username, String arg_password) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signIn', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel - .send([arg_username, arg_password]) as List?; - if (replyList == null) { + Future signIn(String username, String password) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signIn$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([username, password]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { - throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -90,21 +127,23 @@ class LegacyNativePlugin { } Future rememberDevice() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.rememberDevice', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send(null) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.rememberDevice$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; diff --git a/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_wrapper.dart b/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_wrapper.dart index 38bacdd158..091eea04e0 100644 --- a/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_wrapper.dart +++ b/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_wrapper.dart @@ -1,7 +1,10 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +// ignore_for_file: non_constant_identifier_names + import 'package:amplify_native_legacy_wrapper/amplify_native_legacy_plugin.g.dart'; +import 'package:flutter/services.dart'; /// A wrapper around the Native v1 Amplify plugins and the legacy SDKs. /// @@ -30,4 +33,12 @@ class AmplifyNativeLegacyWrapper implements LegacyNativePlugin { Future rememberDevice() { return _plugin.rememberDevice(); } + + @override + BinaryMessenger? get pigeonVar_binaryMessenger => + _plugin.pigeonVar_binaryMessenger; + + @override + String get pigeonVar_messageChannelSuffix => + _plugin.pigeonVar_messageChannelSuffix; } diff --git a/packages/amplify_native_legacy_wrapper/pubspec.yaml b/packages/amplify_native_legacy_wrapper/pubspec.yaml index 1727efaa84..dbdd020952 100644 --- a/packages/amplify_native_legacy_wrapper/pubspec.yaml +++ b/packages/amplify_native_legacy_wrapper/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: flutter: @@ -15,7 +15,7 @@ dev_dependencies: amplify_lints: ">=2.0.2 <2.1.0" flutter_test: sdk: flutter - pigeon: ^11.0.0 + pigeon: ^22.6.2 flutter: plugin: diff --git a/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java b/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java index b237532d82..d5123cb027 100644 --- a/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java +++ b/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java @@ -1,6 +1,6 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon package com.amazonaws.amplify.amplify_analytics_pinpoint; @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** Generated class from Pigeon. */ @SuppressWarnings({"unused", "unchecked", "CodeBlock2Expr", "RedundantSuppression", "serial"}) @@ -44,7 +45,7 @@ public FlutterError(@NonNull String code, @Nullable String message, @Nullable Ob @NonNull protected static ArrayList wrapError(@NonNull Throwable exception) { - ArrayList errorList = new ArrayList(3); + ArrayList errorList = new ArrayList<>(3); if (exception instanceof FlutterError) { FlutterError error = (FlutterError) exception; errorList.add(error.code); @@ -59,35 +60,79 @@ protected static ArrayList wrapError(@NonNull Throwable exception) { return errorList; } + private static class PigeonCodec extends StandardMessageCodec { + public static final PigeonCodec INSTANCE = new PigeonCodec(); + + private PigeonCodec() {} + + @Override + protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) { + switch (type) { + default: + return super.readValueOfType(type, buffer); + } + } + + @Override + protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) { + { + super.writeValue(stream, value); + } + } + } + + + /** Asynchronous error handling return type for non-nullable API method returns. */ public interface Result { - @SuppressWarnings("UnknownNullness") - void success(T result); + /** Success case callback method for handling returns. */ + void success(@NonNull T result); + + /** Failure case callback method for handling errors. */ + void error(@NonNull Throwable error); + } + /** Asynchronous error handling return type for nullable API method returns. */ + public interface NullableResult { + /** Success case callback method for handling returns. */ + void success(@Nullable T result); + /** Failure case callback method for handling errors. */ + void error(@NonNull Throwable error); + } + /** Asynchronous error handling return type for void API method returns. */ + public interface VoidResult { + /** Success case callback method for handling returns. */ + void success(); + + /** Failure case callback method for handling errors. */ void error(@NonNull Throwable error); } /** Generated interface from Pigeon that represents a handler of messages from Flutter. */ - public interface PigeonLegacyDataProvider { + public interface PinpointLegacyDataProvider { - void getEndpointId(@NonNull String pinpointAppId, @NonNull Result result); + void getEndpointId(@NonNull String pinpointAppId, @NonNull NullableResult result); - /** The codec used by PigeonLegacyDataProvider. */ + /** The codec used by PinpointLegacyDataProvider. */ static @NonNull MessageCodec getCodec() { - return new StandardMessageCodec(); + return PigeonCodec.INSTANCE; + } + /**Sets up an instance of `PinpointLegacyDataProvider` to handle messages through the `binaryMessenger`. */ + static void setUp(@NonNull BinaryMessenger binaryMessenger, @Nullable PinpointLegacyDataProvider api) { + setUp(binaryMessenger, "", api); } - /**Sets up an instance of `PigeonLegacyDataProvider` to handle messages through the `binaryMessenger`. */ - static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable PigeonLegacyDataProvider api) { + static void setUp(@NonNull BinaryMessenger binaryMessenger, @NonNull String messageChannelSuffix, @Nullable PinpointLegacyDataProvider api) { + messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix; { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.amplify_analytics_pinpoint.PigeonLegacyDataProvider.getEndpointId", getCodec()); + binaryMessenger, "dev.flutter.pigeon.amplify_analytics_pinpoint.PinpointLegacyDataProvider.getEndpointId" + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; String pinpointAppIdArg = (String) args.get(0); - Result resultCallback = - new Result() { + NullableResult resultCallback = + new NullableResult() { public void success(String result) { wrapped.add(0, result); reply.reply(wrapped); diff --git a/packages/analytics/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/AmplifyAnalyticsPinpointPlugin.kt b/packages/analytics/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/AmplifyAnalyticsPinpointPlugin.kt index d1068b90c2..0a090706ca 100644 --- a/packages/analytics/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/AmplifyAnalyticsPinpointPlugin.kt +++ b/packages/analytics/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/AmplifyAnalyticsPinpointPlugin.kt @@ -7,7 +7,7 @@ import android.content.Context import android.content.SharedPreferences import io.flutter.embedding.engine.plugins.FlutterPlugin -class AmplifyAnalyticsPinpointPlugin: FlutterPlugin, Messages.PigeonLegacyDataProvider { +class AmplifyAnalyticsPinpointPlugin: FlutterPlugin, Messages.PinpointLegacyDataProvider { private var context: Context? = null private var sharedPrefs: SharedPreferences? = null @@ -19,15 +19,15 @@ class AmplifyAnalyticsPinpointPlugin: FlutterPlugin, Messages.PigeonLegacyDataPr override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) { context = binding.applicationContext - Messages.PigeonLegacyDataProvider.setup(binding.binaryMessenger, this) + Messages.PinpointLegacyDataProvider.setUp(binding.binaryMessenger, this) } override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) { - Messages.PigeonLegacyDataProvider.setup(binding.binaryMessenger, null) + Messages.PinpointLegacyDataProvider.setUp(binding.binaryMessenger, null) context = null } - override fun getEndpointId(pinpointAppId: String, result: Messages.Result){ + override fun getEndpointId(pinpointAppId: String, result: Messages.NullableResult){ if (context == null) { result.error(Exception("Application context is null")) return diff --git a/packages/analytics/amplify_analytics_pinpoint/example/android/app/build.gradle b/packages/analytics/amplify_analytics_pinpoint/example/android/app/build.gradle index a824c4943f..9b3fde71cc 100644 --- a/packages/analytics/amplify_analytics_pinpoint/example/android/app/build.gradle +++ b/packages/analytics/amplify_analytics_pinpoint/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace 'com.amazonaws.amplify.amplify_analytics_pinpoint_example' compileSdk flutter.compileSdkVersion @@ -66,5 +63,4 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/packages/analytics/amplify_analytics_pinpoint/example/android/build.gradle b/packages/analytics/amplify_analytics_pinpoint/example/android/build.gradle index 070b4ffbfd..bc157bd1a1 100644 --- a/packages/analytics/amplify_analytics_pinpoint/example/android/build.gradle +++ b/packages/analytics/amplify_analytics_pinpoint/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/packages/analytics/amplify_analytics_pinpoint/example/android/settings.gradle b/packages/analytics/amplify_analytics_pinpoint/example/android/settings.gradle index 44e62bcf06..276cdabf9c 100644 --- a/packages/analytics/amplify_analytics_pinpoint/example/android/settings.gradle +++ b/packages/analytics/amplify_analytics_pinpoint/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.10" apply false +} + +include ":app" diff --git a/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml index a1954ecb47..57e000a218 100644 --- a/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml +++ b/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml @@ -7,8 +7,8 @@ version: 0.1.0 publish_to: "none" # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_analytics_pinpoint: ">=1.0.0-next.8 <1.0.0-next.9" diff --git a/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/data_provider.android.dart b/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/data_provider.android.dart index 3808dd6201..6c49805036 100644 --- a/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/data_provider.android.dart +++ b/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/data_provider.android.dart @@ -4,16 +4,15 @@ import 'dart:async'; import 'package:amplify_analytics_pinpoint/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart'; - // ignore: implementation_imports import 'package:amplify_analytics_pinpoint_dart/src/impl/flutter_provider_interfaces/legacy_native_data_provider.dart'; /// {@macro amplify_analytics_pinpoint.flutter_legacy_native_data_provider} class DataProviderAndroid implements LegacyNativeDataProvider { /// {@macro amplify_analytics_pinpoint.flutter_legacy_native_data_provider} - DataProviderAndroid() : _pigeonDataProvider = PigeonLegacyDataProvider(); + DataProviderAndroid() : _pigeonDataProvider = PinpointLegacyDataProvider(); - final PigeonLegacyDataProvider _pigeonDataProvider; + final PinpointLegacyDataProvider _pigeonDataProvider; @override Future getEndpointId(String pinpointAppId) { diff --git a/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart b/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart index 8d0fcb92e3..aa21b12551 100644 --- a/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart @@ -1,8 +1,8 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; @@ -10,36 +10,70 @@ import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; -class PigeonLegacyDataProvider { - /// Constructor for [PigeonLegacyDataProvider]. The [binaryMessenger] named argument is +PlatformException _createConnectionError(String channelName) { + return PlatformException( + code: 'channel-error', + message: 'Unable to establish connection on channel: "$channelName".', + ); +} + +class _PigeonCodec extends StandardMessageCodec { + const _PigeonCodec(); + @override + void writeValue(WriteBuffer buffer, Object? value) { + if (value is int) { + buffer.putUint8(4); + buffer.putInt64(value); + } else { + super.writeValue(buffer, value); + } + } + + @override + Object? readValueOfType(int type, ReadBuffer buffer) { + switch (type) { + default: + return super.readValueOfType(type, buffer); + } + } +} + +class PinpointLegacyDataProvider { + /// Constructor for [PinpointLegacyDataProvider]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - PigeonLegacyDataProvider({BinaryMessenger? binaryMessenger}) - : _binaryMessenger = binaryMessenger; - final BinaryMessenger? _binaryMessenger; - - static const MessageCodec codec = StandardMessageCodec(); - - Future getEndpointId(String arg_pinpointAppId) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_analytics_pinpoint.PigeonLegacyDataProvider.getEndpointId', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_pinpointAppId]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + PinpointLegacyDataProvider( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + final BinaryMessenger? pigeonVar_binaryMessenger; + + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); + + final String pigeonVar_messageChannelSuffix; + + Future getEndpointId(String pinpointAppId) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_analytics_pinpoint.PinpointLegacyDataProvider.getEndpointId$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([pinpointAppId]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { - return (replyList[0] as String?); + return (pigeonVar_replyList[0] as String?); } } } diff --git a/packages/analytics/amplify_analytics_pinpoint/pigeons/pigeon_config_android.dart b/packages/analytics/amplify_analytics_pinpoint/pigeons/pigeon_config_android.dart index 52426d6e6c..48162f217a 100644 --- a/packages/analytics/amplify_analytics_pinpoint/pigeons/pigeon_config_android.dart +++ b/packages/analytics/amplify_analytics_pinpoint/pigeons/pigeon_config_android.dart @@ -19,7 +19,7 @@ import 'package:pigeon/pigeon.dart'; ), ) @HostApi() -abstract class PigeonLegacyDataProvider { +abstract class PinpointLegacyDataProvider { @async String? getEndpointId(String pinpointAppId); } diff --git a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml index 23321de5b6..03dd97d042 100644 --- a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml +++ b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/an issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" # Helps `pana` since we do not use Flutter plugins for most platforms platforms: @@ -35,7 +35,7 @@ dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" flutter_test: sdk: flutter - pigeon: ^11.0.0 + pigeon: ^22.6.2 flutter: plugin: diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/drift/drift_queued_item_store.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/drift/drift_queued_item_store.g.dart index 6b83c0e9a9..05eb825427 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/drift/drift_queued_item_store.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/drift/drift_queued_item_store.g.dart @@ -109,6 +109,13 @@ class DriftQueuedItem extends DataClass implements Insertable { id: id ?? this.id, value: value ?? this.value, ); + DriftQueuedItem copyWithCompanion(DriftQueuedItemsCompanion data) { + return DriftQueuedItem( + id: data.id.present ? data.id.value : this.id, + value: data.value.present ? data.value.value : this.value, + ); + } + @override String toString() { return (StringBuffer('DriftQueuedItem(') @@ -180,8 +187,8 @@ class DriftQueuedItemsCompanion extends UpdateCompanion { abstract class _$DriftQueuedItemStore extends GeneratedDatabase { _$DriftQueuedItemStore(QueryExecutor e) : super(e); - _$DriftQueuedItemStoreManager get managers => - _$DriftQueuedItemStoreManager(this); + $DriftQueuedItemStoreManager get managers => + $DriftQueuedItemStoreManager(this); late final $DriftQueuedItemsTable driftQueuedItems = $DriftQueuedItemsTable(this); @override @@ -191,7 +198,7 @@ abstract class _$DriftQueuedItemStore extends GeneratedDatabase { List get allSchemaEntities => [driftQueuedItems]; } -typedef $$DriftQueuedItemsTableInsertCompanionBuilder +typedef $$DriftQueuedItemsTableCreateCompanionBuilder = DriftQueuedItemsCompanion Function({ Value id, required String value, @@ -202,27 +209,82 @@ typedef $$DriftQueuedItemsTableUpdateCompanionBuilder Value value, }); +class $$DriftQueuedItemsTableFilterComposer + extends Composer<_$DriftQueuedItemStore, $DriftQueuedItemsTable> { + $$DriftQueuedItemsTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnFilters get value => $composableBuilder( + column: $table.value, builder: (column) => ColumnFilters(column)); +} + +class $$DriftQueuedItemsTableOrderingComposer + extends Composer<_$DriftQueuedItemStore, $DriftQueuedItemsTable> { + $$DriftQueuedItemsTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get value => $composableBuilder( + column: $table.value, builder: (column) => ColumnOrderings(column)); +} + +class $$DriftQueuedItemsTableAnnotationComposer + extends Composer<_$DriftQueuedItemStore, $DriftQueuedItemsTable> { + $$DriftQueuedItemsTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get value => + $composableBuilder(column: $table.value, builder: (column) => column); +} + class $$DriftQueuedItemsTableTableManager extends RootTableManager< _$DriftQueuedItemStore, $DriftQueuedItemsTable, DriftQueuedItem, $$DriftQueuedItemsTableFilterComposer, $$DriftQueuedItemsTableOrderingComposer, - $$DriftQueuedItemsTableProcessedTableManager, - $$DriftQueuedItemsTableInsertCompanionBuilder, - $$DriftQueuedItemsTableUpdateCompanionBuilder> { + $$DriftQueuedItemsTableAnnotationComposer, + $$DriftQueuedItemsTableCreateCompanionBuilder, + $$DriftQueuedItemsTableUpdateCompanionBuilder, + ( + DriftQueuedItem, + BaseReferences<_$DriftQueuedItemStore, $DriftQueuedItemsTable, + DriftQueuedItem> + ), + DriftQueuedItem, + PrefetchHooks Function()> { $$DriftQueuedItemsTableTableManager( _$DriftQueuedItemStore db, $DriftQueuedItemsTable table) : super(TableManagerState( db: db, table: table, - filteringComposer: - $$DriftQueuedItemsTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$DriftQueuedItemsTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$DriftQueuedItemsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + createFilteringComposer: () => + $$DriftQueuedItemsTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$DriftQueuedItemsTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$DriftQueuedItemsTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ Value id = const Value.absent(), Value value = const Value.absent(), }) => @@ -230,7 +292,7 @@ class $$DriftQueuedItemsTableTableManager extends RootTableManager< id: id, value: value, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String value, }) => @@ -238,53 +300,33 @@ class $$DriftQueuedItemsTableTableManager extends RootTableManager< id: id, value: value, ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, )); } -class $$DriftQueuedItemsTableProcessedTableManager - extends ProcessedTableManager< - _$DriftQueuedItemStore, - $DriftQueuedItemsTable, - DriftQueuedItem, - $$DriftQueuedItemsTableFilterComposer, - $$DriftQueuedItemsTableOrderingComposer, - $$DriftQueuedItemsTableProcessedTableManager, - $$DriftQueuedItemsTableInsertCompanionBuilder, - $$DriftQueuedItemsTableUpdateCompanionBuilder> { - $$DriftQueuedItemsTableProcessedTableManager(super.$state); -} - -class $$DriftQueuedItemsTableFilterComposer - extends FilterComposer<_$DriftQueuedItemStore, $DriftQueuedItemsTable> { - $$DriftQueuedItemsTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get value => $state.composableBuilder( - column: $state.table.value, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); -} - -class $$DriftQueuedItemsTableOrderingComposer - extends OrderingComposer<_$DriftQueuedItemStore, $DriftQueuedItemsTable> { - $$DriftQueuedItemsTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get value => $state.composableBuilder( - column: $state.table.value, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); -} +typedef $$DriftQueuedItemsTableProcessedTableManager = ProcessedTableManager< + _$DriftQueuedItemStore, + $DriftQueuedItemsTable, + DriftQueuedItem, + $$DriftQueuedItemsTableFilterComposer, + $$DriftQueuedItemsTableOrderingComposer, + $$DriftQueuedItemsTableAnnotationComposer, + $$DriftQueuedItemsTableCreateCompanionBuilder, + $$DriftQueuedItemsTableUpdateCompanionBuilder, + ( + DriftQueuedItem, + BaseReferences<_$DriftQueuedItemStore, $DriftQueuedItemsTable, + DriftQueuedItem> + ), + DriftQueuedItem, + PrefetchHooks Function()>; -class _$DriftQueuedItemStoreManager { +class $DriftQueuedItemStoreManager { final _$DriftQueuedItemStore _db; - _$DriftQueuedItemStoreManager(this._db); + $DriftQueuedItemStoreManager(this._db); $$DriftQueuedItemsTableTableManager get driftQueuedItems => $$DriftQueuedItemsTableTableManager(_db, _db.driftQueuedItems); } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/index_db/indexed_db_adapter.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/index_db/indexed_db_adapter.dart index 137731a46c..d1b8ff78c4 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/index_db/indexed_db_adapter.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/index_db/indexed_db_adapter.dart @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import 'dart:async'; +//ignore: deprecated_member_use import 'dart:js_util'; import 'package:amplify_analytics_pinpoint_dart/src/impl/analytics_client/event_client/queued_item_store/queued_item_store.dart'; diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/version.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/version.dart index 8193e3ca48..402f21dc1b 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/version.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '0.4.5'; +const packageVersion = '0.4.7'; diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml index a748608fa0..a16b98ac0d 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml +++ b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/an issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_core: ">=2.6.0 <2.7.0" @@ -17,7 +17,7 @@ dependencies: built_collection: ^5.0.0 built_value: ^8.6.0 collection: ^1.15.0 - drift: ">=2.18.0 <2.19.0" + drift: ^2.25.0 intl: ">=0.18.0 <1.0.0" meta: ^1.7.0 path: ">=1.8.0 <2.0.0" @@ -32,8 +32,8 @@ dev_dependencies: build_verify: ^3.0.0 build_version: ^2.0.0 build_web_compilers: ^4.0.0 - built_value_generator: 8.8.1 - drift_dev: ">=2.18.0 <2.19.0" + built_value_generator: 8.9.3 + drift_dev: ^2.25.1 mocktail: ^1.0.0 test: ^1.22.1 diff --git a/packages/api/amplify_api/example/android/app/build.gradle b/packages/api/amplify_api/example/android/app/build.gradle index 1455df62c8..6aa77ce899 100644 --- a/packages/api/amplify_api/example/android/app/build.gradle +++ b/packages/api/amplify_api/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace 'com.amazonaws.amplify.amplify_api_example' compileSdk flutter.compileSdkVersion @@ -67,8 +64,6 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test:runner:1.2.0' diff --git a/packages/api/amplify_api/example/android/build.gradle b/packages/api/amplify_api/example/android/build.gradle index 24d8637a29..bc157bd1a1 100644 --- a/packages/api/amplify_api/example/android/build.gradle +++ b/packages/api/amplify_api/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() @@ -26,6 +13,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/api/amplify_api/example/android/settings.gradle b/packages/api/amplify_api/example/android/settings.gradle index 44e62bcf06..276cdabf9c 100644 --- a/packages/api/amplify_api/example/android/settings.gradle +++ b/packages/api/amplify_api/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.10" apply false +} + +include ":app" diff --git a/packages/api/amplify_api/example/pubspec.yaml b/packages/api/amplify_api/example/pubspec.yaml index 1137e6ed07..7d9866cae2 100644 --- a/packages/api/amplify_api/example/pubspec.yaml +++ b/packages/api/amplify_api/example/pubspec.yaml @@ -6,8 +6,8 @@ description: Demonstrates how to use the amplify_api plugin. publish_to: "none" # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_api: ">=1.0.0-next.8 <1.0.0-next.9" diff --git a/packages/api/amplify_api/pubspec.yaml b/packages/api/amplify_api/pubspec.yaml index bf9cb18d38..c52a47331a 100644 --- a/packages/api/amplify_api/pubspec.yaml +++ b/packages/api/amplify_api/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/ap issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" # Helps `pana` since we do not use Flutter plugins for most platforms platforms: diff --git a/packages/api/amplify_api_dart/pubspec.yaml b/packages/api/amplify_api_dart/pubspec.yaml index 2a799fc1e6..0cb12c15b2 100644 --- a/packages/api/amplify_api_dart/pubspec.yaml +++ b/packages/api/amplify_api_dart/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/ap issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_core: ">=2.6.0 <2.7.0" diff --git a/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt b/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt index adb9547218..00be62a8d1 100644 --- a/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt +++ b/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt @@ -1,8 +1,9 @@ -// +// // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.1), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon +@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") package com.amazonaws.amplify.amplify_auth_cognito @@ -19,14 +20,14 @@ private fun wrapResult(result: Any?): List { } private fun wrapError(exception: Throwable): List { - if (exception is FlutterError) { - return listOf( + return if (exception is FlutterError) { + listOf( exception.code, exception.message, exception.details ) } else { - return listOf( + listOf( exception.javaClass.simpleName, exception.toString(), "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception) @@ -34,6 +35,9 @@ private fun wrapError(exception: Throwable): List { } } +private fun createConnectionError(channelName: String): FlutterError { + return FlutterError("channel-error", "Unable to establish connection on channel: '$channelName'.", "")} + /** * Error class for passing custom error details to Flutter via a thrown PlatformException. * @property code The error code. @@ -57,25 +61,24 @@ data class NativeUserContextData ( val deviceOsReleaseVersion: String? = null, val screenHeightPixels: Long? = null, val screenWidthPixels: Long? = null - -) { +) + { companion object { - @Suppress("UNCHECKED_CAST") - fun fromList(list: List): NativeUserContextData { - val deviceName = list[0] as String? - val thirdPartyDeviceId = list[1] as String? - val deviceFingerprint = list[2] as String? - val applicationName = list[3] as String? - val applicationVersion = list[4] as String? - val deviceLanguage = list[5] as String? - val deviceOsReleaseVersion = list[6] as String? - val screenHeightPixels = list[7].let { if (it is Int) it.toLong() else it as Long? } - val screenWidthPixels = list[8].let { if (it is Int) it.toLong() else it as Long? } + fun fromList(pigeonVar_list: List): NativeUserContextData { + val deviceName = pigeonVar_list[0] as String? + val thirdPartyDeviceId = pigeonVar_list[1] as String? + val deviceFingerprint = pigeonVar_list[2] as String? + val applicationName = pigeonVar_list[3] as String? + val applicationVersion = pigeonVar_list[4] as String? + val deviceLanguage = pigeonVar_list[5] as String? + val deviceOsReleaseVersion = pigeonVar_list[6] as String? + val screenHeightPixels = pigeonVar_list[7] as Long? + val screenWidthPixels = pigeonVar_list[8] as Long? return NativeUserContextData(deviceName, thirdPartyDeviceId, deviceFingerprint, applicationName, applicationVersion, deviceLanguage, deviceOsReleaseVersion, screenHeightPixels, screenWidthPixels) } } fun toList(): List { - return listOf( + return listOf( deviceName, thirdPartyDeviceId, deviceFingerprint, @@ -99,24 +102,23 @@ data class LegacyCredentialStoreData ( val accessToken: String? = null, val refreshToken: String? = null, val idToken: String? = null - -) { +) + { companion object { - @Suppress("UNCHECKED_CAST") - fun fromList(list: List): LegacyCredentialStoreData { - val identityId = list[0] as String? - val accessKeyId = list[1] as String? - val secretAccessKey = list[2] as String? - val sessionToken = list[3] as String? - val expirationMsSinceEpoch = list[4].let { if (it is Int) it.toLong() else it as Long? } - val accessToken = list[5] as String? - val refreshToken = list[6] as String? - val idToken = list[7] as String? + fun fromList(pigeonVar_list: List): LegacyCredentialStoreData { + val identityId = pigeonVar_list[0] as String? + val accessKeyId = pigeonVar_list[1] as String? + val secretAccessKey = pigeonVar_list[2] as String? + val sessionToken = pigeonVar_list[3] as String? + val expirationMsSinceEpoch = pigeonVar_list[4] as Long? + val accessToken = pigeonVar_list[5] as String? + val refreshToken = pigeonVar_list[6] as String? + val idToken = pigeonVar_list[7] as String? return LegacyCredentialStoreData(identityId, accessKeyId, secretAccessKey, sessionToken, expirationMsSinceEpoch, accessToken, refreshToken, idToken) } } fun toList(): List { - return listOf( + return listOf( identityId, accessKeyId, secretAccessKey, @@ -135,20 +137,19 @@ data class LegacyDeviceDetailsSecret ( val deviceGroupKey: String? = null, val devicePassword: String? = null, val asfDeviceId: String? = null - -) { +) + { companion object { - @Suppress("UNCHECKED_CAST") - fun fromList(list: List): LegacyDeviceDetailsSecret { - val deviceKey = list[0] as String? - val deviceGroupKey = list[1] as String? - val devicePassword = list[2] as String? - val asfDeviceId = list[3] as String? + fun fromList(pigeonVar_list: List): LegacyDeviceDetailsSecret { + val deviceKey = pigeonVar_list[0] as String? + val deviceGroupKey = pigeonVar_list[1] as String? + val devicePassword = pigeonVar_list[2] as String? + val asfDeviceId = pigeonVar_list[3] as String? return LegacyDeviceDetailsSecret(deviceKey, deviceGroupKey, devicePassword, asfDeviceId) } } fun toList(): List { - return listOf( + return listOf( deviceKey, deviceGroupKey, devicePassword, @@ -156,45 +157,22 @@ data class LegacyDeviceDetailsSecret ( ) } } - -/** Generated class from Pigeon that represents Flutter messages that can be called from Kotlin. */ -@Suppress("UNCHECKED_CAST") -class NativeAuthPlugin(private val binaryMessenger: BinaryMessenger) { - companion object { - /** The codec used by NativeAuthPlugin. */ - val codec: MessageCodec by lazy { - StandardMessageCodec() - } - } - /** - * Exchanges the route parameters used to launch the app, i.e. if the app - * was closed and a redirect happened to the custom URI scheme (iOS) or an - * intent was launched with the redirect parameters (Android). - */ - fun exchange(paramsArg: Map, callback: () -> Unit) { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange", codec) - channel.send(listOf(paramsArg)) { - callback() - } - } -} -@Suppress("UNCHECKED_CAST") -private object NativeAuthBridgeCodec : StandardMessageCodec() { +private open class NativeAuthPluginBindingsPigeonPigeonCodec : StandardMessageCodec() { override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? { return when (type) { - 128.toByte() -> { + 129.toByte() -> { return (readValue(buffer) as? List)?.let { - LegacyCredentialStoreData.fromList(it) + NativeUserContextData.fromList(it) } } - 129.toByte() -> { + 130.toByte() -> { return (readValue(buffer) as? List)?.let { - LegacyDeviceDetailsSecret.fromList(it) + LegacyCredentialStoreData.fromList(it) } } - 130.toByte() -> { + 131.toByte() -> { return (readValue(buffer) as? List)?.let { - NativeUserContextData.fromList(it) + LegacyDeviceDetailsSecret.fromList(it) } } else -> super.readValueOfType(type, buffer) @@ -202,23 +180,55 @@ private object NativeAuthBridgeCodec : StandardMessageCodec() { } override fun writeValue(stream: ByteArrayOutputStream, value: Any?) { when (value) { - is LegacyCredentialStoreData -> { - stream.write(128) - writeValue(stream, value.toList()) - } - is LegacyDeviceDetailsSecret -> { + is NativeUserContextData -> { stream.write(129) writeValue(stream, value.toList()) } - is NativeUserContextData -> { + is LegacyCredentialStoreData -> { stream.write(130) writeValue(stream, value.toList()) } + is LegacyDeviceDetailsSecret -> { + stream.write(131) + writeValue(stream, value.toList()) + } else -> super.writeValue(stream, value) } } } + +/** Generated class from Pigeon that represents Flutter messages that can be called from Kotlin. */ +class NativeAuthPlugin(private val binaryMessenger: BinaryMessenger, private val messageChannelSuffix: String = "") { + companion object { + /** The codec used by NativeAuthPlugin. */ + val codec: MessageCodec by lazy { + NativeAuthPluginBindingsPigeonPigeonCodec() + } + } + /** + * Exchanges the route parameters used to launch the app, i.e. if the app + * was closed and a redirect happened to the custom URI scheme (iOS) or an + * intent was launched with the redirect parameters (Android). + */ + fun exchange(paramsArg: Map, callback: (Result) -> Unit) +{ + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange$separatedMessageChannelSuffix" + val channel = BasicMessageChannel(binaryMessenger, channelName, codec) + channel.send(listOf(paramsArg)) { + if (it is List<*>) { + if (it.size > 1) { + callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?))) + } else { + callback(Result.success(Unit)) + } + } else { + callback(Result.failure(createConnectionError(channelName))) + } + } + } +} /** Generated interface from Pigeon that represents a handler of messages from Flutter. */ interface NativeAuthBridge { /** @@ -250,13 +260,14 @@ interface NativeAuthBridge { companion object { /** The codec used by NativeAuthBridge. */ val codec: MessageCodec by lazy { - NativeAuthBridgeCodec + NativeAuthPluginBindingsPigeonPigeonCodec() } /** Sets up an instance of `NativeAuthBridge` to handle messages through the `binaryMessenger`. */ - @Suppress("UNCHECKED_CAST") - fun setUp(binaryMessenger: BinaryMessenger, api: NativeAuthBridge?) { + @JvmOverloads + fun setUp(binaryMessenger: BinaryMessenger, api: NativeAuthBridge?, messageChannelSuffix: String = "") { + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signInWithUrl", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signInWithUrl$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -279,7 +290,7 @@ interface NativeAuthBridge { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signOutWithUrl", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signOutWithUrl$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -301,14 +312,13 @@ interface NativeAuthBridge { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getValidationData", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getValidationData$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped: List - try { - wrapped = listOf(api.getValidationData()) + val wrapped: List = try { + listOf(api.getValidationData()) } catch (exception: Throwable) { - wrapped = wrapError(exception) + wrapError(exception) } reply.reply(wrapped) } @@ -317,14 +327,13 @@ interface NativeAuthBridge { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getContextData", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getContextData$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped: List - try { - wrapped = listOf(api.getContextData()) + val wrapped: List = try { + listOf(api.getContextData()) } catch (exception: Throwable) { - wrapped = wrapError(exception) + wrapError(exception) } reply.reply(wrapped) } @@ -333,14 +342,13 @@ interface NativeAuthBridge { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getBundleId", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getBundleId$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> - var wrapped: List - try { - wrapped = listOf(api.getBundleId()) + val wrapped: List = try { + listOf(api.getBundleId()) } catch (exception: Throwable) { - wrapped = wrapError(exception) + wrapError(exception) } reply.reply(wrapped) } @@ -349,7 +357,7 @@ interface NativeAuthBridge { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getLegacyCredentials", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getLegacyCredentials$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -370,10 +378,10 @@ interface NativeAuthBridge { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.clearLegacyCredentials", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.clearLegacyCredentials$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> - api.clearLegacyCredentials() { result: Result -> + api.clearLegacyCredentials{ result: Result -> val error = result.exceptionOrNull() if (error != null) { reply.reply(wrapError(error)) @@ -387,7 +395,7 @@ interface NativeAuthBridge { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.fetchLegacyDeviceSecrets", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.fetchLegacyDeviceSecrets$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -408,7 +416,7 @@ interface NativeAuthBridge { } } run { - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.deleteLegacyDeviceSecrets", codec) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.deleteLegacyDeviceSecrets$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List diff --git a/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift b/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift index a029d4fe45..5ad64a8343 100644 --- a/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift +++ b/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift @@ -1,20 +1,35 @@ -// +// // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.1), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation + #if os(iOS) -import Flutter + import Flutter #elseif os(macOS) -import FlutterMacOS + import FlutterMacOS #else -#error("Unsupported platform.") + #error("Unsupported platform.") #endif -private func isNullish(_ value: Any?) -> Bool { - return value is NSNull || value == nil +/// Error class for passing custom error details to Dart side. +final class PigeonError: Error { + let code: String + let message: String? + let details: Any? + + init(code: String, message: String?, details: Any?) { + self.code = code + self.message = message + self.details = details + } + + var localizedDescription: String { + return + "PigeonError(code: \(code), message: \(message ?? ""), details: \(details ?? "")" + } } private func wrapResult(_ result: Any?) -> [Any?] { @@ -22,20 +37,35 @@ private func wrapResult(_ result: Any?) -> [Any?] { } private func wrapError(_ error: Any) -> [Any?] { + if let pigeonError = error as? PigeonError { + return [ + pigeonError.code, + pigeonError.message, + pigeonError.details, + ] + } if let flutterError = error as? FlutterError { return [ flutterError.code, flutterError.message, - flutterError.details + flutterError.details, ] } return [ "\(error)", "\(type(of: error))", - "Stacktrace: \(Thread.callStackSymbols)" + "Stacktrace: \(Thread.callStackSymbols)", ] } +private func createConnectionError(withChannelName channelName: String) -> PigeonError { + return PigeonError(code: "channel-error", message: "Unable to establish connection on channel: '\(channelName)'.", details: "") +} + +private func isNullish(_ value: Any?) -> Bool { + return value is NSNull || value == nil +} + private func nilOrValue(_ value: Any?) -> T? { if value is NSNull { return nil } return value as! T? @@ -53,16 +83,19 @@ struct NativeUserContextData { var screenHeightPixels: Int64? = nil var screenWidthPixels: Int64? = nil - static func fromList(_ list: [Any?]) -> NativeUserContextData? { - let deviceName: String? = nilOrValue(list[0]) - let thirdPartyDeviceId: String? = nilOrValue(list[1]) - let deviceFingerprint: String? = nilOrValue(list[2]) - let applicationName: String? = nilOrValue(list[3]) - let applicationVersion: String? = nilOrValue(list[4]) - let deviceLanguage: String? = nilOrValue(list[5]) - let deviceOsReleaseVersion: String? = nilOrValue(list[6]) - let screenHeightPixels: Int64? = isNullish(list[7]) ? nil : (list[7] is Int64? ? list[7] as! Int64? : Int64(list[7] as! Int32)) - let screenWidthPixels: Int64? = isNullish(list[8]) ? nil : (list[8] is Int64? ? list[8] as! Int64? : Int64(list[8] as! Int32)) + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> NativeUserContextData? { + let deviceName: String? = nilOrValue(pigeonVar_list[0]) + let thirdPartyDeviceId: String? = nilOrValue(pigeonVar_list[1]) + let deviceFingerprint: String? = nilOrValue(pigeonVar_list[2]) + let applicationName: String? = nilOrValue(pigeonVar_list[3]) + let applicationVersion: String? = nilOrValue(pigeonVar_list[4]) + let deviceLanguage: String? = nilOrValue(pigeonVar_list[5]) + let deviceOsReleaseVersion: String? = nilOrValue(pigeonVar_list[6]) + let screenHeightPixels: Int64? = nilOrValue(pigeonVar_list[7]) + let screenWidthPixels: Int64? = nilOrValue(pigeonVar_list[8]) return NativeUserContextData( deviceName: deviceName, @@ -102,15 +135,18 @@ struct LegacyCredentialStoreData { var refreshToken: String? = nil var idToken: String? = nil - static func fromList(_ list: [Any?]) -> LegacyCredentialStoreData? { - let identityId: String? = nilOrValue(list[0]) - let accessKeyId: String? = nilOrValue(list[1]) - let secretAccessKey: String? = nilOrValue(list[2]) - let sessionToken: String? = nilOrValue(list[3]) - let expirationMsSinceEpoch: Int64? = isNullish(list[4]) ? nil : (list[4] is Int64? ? list[4] as! Int64? : Int64(list[4] as! Int32)) - let accessToken: String? = nilOrValue(list[5]) - let refreshToken: String? = nilOrValue(list[6]) - let idToken: String? = nilOrValue(list[7]) + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> LegacyCredentialStoreData? { + let identityId: String? = nilOrValue(pigeonVar_list[0]) + let accessKeyId: String? = nilOrValue(pigeonVar_list[1]) + let secretAccessKey: String? = nilOrValue(pigeonVar_list[2]) + let sessionToken: String? = nilOrValue(pigeonVar_list[3]) + let expirationMsSinceEpoch: Int64? = nilOrValue(pigeonVar_list[4]) + let accessToken: String? = nilOrValue(pigeonVar_list[5]) + let refreshToken: String? = nilOrValue(pigeonVar_list[6]) + let idToken: String? = nilOrValue(pigeonVar_list[7]) return LegacyCredentialStoreData( identityId: identityId, @@ -144,11 +180,14 @@ struct LegacyDeviceDetailsSecret { var devicePassword: String? = nil var asfDeviceId: String? = nil - static func fromList(_ list: [Any?]) -> LegacyDeviceDetailsSecret? { - let deviceKey: String? = nilOrValue(list[0]) - let deviceGroupKey: String? = nilOrValue(list[1]) - let devicePassword: String? = nilOrValue(list[2]) - let asfDeviceId: String? = nilOrValue(list[3]) + + + // swift-format-ignore: AlwaysUseLowerCamelCase + static func fromList(_ pigeonVar_list: [Any?]) -> LegacyDeviceDetailsSecret? { + let deviceKey: String? = nilOrValue(pigeonVar_list[0]) + let deviceGroupKey: String? = nilOrValue(pigeonVar_list[1]) + let devicePassword: String? = nilOrValue(pigeonVar_list[2]) + let asfDeviceId: String? = nilOrValue(pigeonVar_list[3]) return LegacyDeviceDetailsSecret( deviceKey: deviceKey, @@ -167,68 +206,92 @@ struct LegacyDeviceDetailsSecret { } } -/// Generated class from Pigeon that represents Flutter messages that can be called from Swift. -class NativeAuthPlugin { - private let binaryMessenger: FlutterBinaryMessenger - init(binaryMessenger: FlutterBinaryMessenger){ - self.binaryMessenger = binaryMessenger - } - /// Exchanges the route parameters used to launch the app, i.e. if the app - /// was closed and a redirect happened to the custom URI scheme (iOS) or an - /// intent was launched with the redirect parameters (Android). - func exchange(params paramsArg: [String: String], completion: @escaping () -> Void) { - let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange", binaryMessenger: binaryMessenger) - channel.sendMessage([paramsArg] as [Any?]) { _ in - completion() - } - } -} -private class NativeAuthBridgeCodecReader: FlutterStandardReader { +private class messagesPigeonCodecReader: FlutterStandardReader { override func readValue(ofType type: UInt8) -> Any? { switch type { - case 128: - return LegacyCredentialStoreData.fromList(self.readValue() as! [Any?]) - case 129: - return LegacyDeviceDetailsSecret.fromList(self.readValue() as! [Any?]) - case 130: - return NativeUserContextData.fromList(self.readValue() as! [Any?]) - default: - return super.readValue(ofType: type) + case 129: + return NativeUserContextData.fromList(self.readValue() as! [Any?]) + case 130: + return LegacyCredentialStoreData.fromList(self.readValue() as! [Any?]) + case 131: + return LegacyDeviceDetailsSecret.fromList(self.readValue() as! [Any?]) + default: + return super.readValue(ofType: type) } } } -private class NativeAuthBridgeCodecWriter: FlutterStandardWriter { +private class messagesPigeonCodecWriter: FlutterStandardWriter { override func writeValue(_ value: Any) { - if let value = value as? LegacyCredentialStoreData { - super.writeByte(128) - super.writeValue(value.toList()) - } else if let value = value as? LegacyDeviceDetailsSecret { + if let value = value as? NativeUserContextData { super.writeByte(129) super.writeValue(value.toList()) - } else if let value = value as? NativeUserContextData { + } else if let value = value as? LegacyCredentialStoreData { super.writeByte(130) super.writeValue(value.toList()) + } else if let value = value as? LegacyDeviceDetailsSecret { + super.writeByte(131) + super.writeValue(value.toList()) } else { super.writeValue(value) } } } -private class NativeAuthBridgeCodecReaderWriter: FlutterStandardReaderWriter { +private class messagesPigeonCodecReaderWriter: FlutterStandardReaderWriter { override func reader(with data: Data) -> FlutterStandardReader { - return NativeAuthBridgeCodecReader(data: data) + return messagesPigeonCodecReader(data: data) } override func writer(with data: NSMutableData) -> FlutterStandardWriter { - return NativeAuthBridgeCodecWriter(data: data) + return messagesPigeonCodecWriter(data: data) } } -class NativeAuthBridgeCodec: FlutterStandardMessageCodec { - static let shared = NativeAuthBridgeCodec(readerWriter: NativeAuthBridgeCodecReaderWriter()) +class messagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable { + static let shared = messagesPigeonCodec(readerWriter: messagesPigeonCodecReaderWriter()) } + +/// Generated protocol from Pigeon that represents Flutter messages that can be called from Swift. +protocol NativeAuthPluginProtocol { + /// Exchanges the route parameters used to launch the app, i.e. if the app + /// was closed and a redirect happened to the custom URI scheme (iOS) or an + /// intent was launched with the redirect parameters (Android). + func exchange(params paramsArg: [String: String], completion: @escaping (Result) -> Void) +} +class NativeAuthPlugin: NativeAuthPluginProtocol { + private let binaryMessenger: FlutterBinaryMessenger + private let messageChannelSuffix: String + init(binaryMessenger: FlutterBinaryMessenger, messageChannelSuffix: String = "") { + self.binaryMessenger = binaryMessenger + self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" + } + var codec: messagesPigeonCodec { + return messagesPigeonCodec.shared + } + /// Exchanges the route parameters used to launch the app, i.e. if the app + /// was closed and a redirect happened to the custom URI scheme (iOS) or an + /// intent was launched with the redirect parameters (Android). + func exchange(params paramsArg: [String: String], completion: @escaping (Result) -> Void) { + let channelName: String = "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange\(messageChannelSuffix)" + let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger, codec: codec) + channel.sendMessage([paramsArg] as [Any?]) { response in + guard let listResponse = response as? [Any?] else { + completion(.failure(createConnectionError(withChannelName: channelName))) + return + } + if listResponse.count > 1 { + let code: String = listResponse[0] as! String + let message: String? = nilOrValue(listResponse[1]) + let details: String? = nilOrValue(listResponse[2]) + completion(.failure(PigeonError(code: code, message: message, details: details))) + } else { + completion(.success(Void())) + } + } + } +} /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol NativeAuthBridge { /// Sign in by presenting [url] and waiting for a response to a URL with @@ -256,15 +319,15 @@ protocol NativeAuthBridge { /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. class NativeAuthBridgeSetup { - /// The codec used by NativeAuthBridge. - static var codec: FlutterStandardMessageCodec { NativeAuthBridgeCodec.shared } + static var codec: FlutterStandardMessageCodec { messagesPigeonCodec.shared } /// Sets up an instance of `NativeAuthBridge` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NativeAuthBridge?) { + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NativeAuthBridge?, messageChannelSuffix: String = "") { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" /// Sign in by presenting [url] and waiting for a response to a URL with /// [callbackUrlScheme]. /// /// If [preferPrivateSession] is `true`, do not persist session cookies. - let signInWithUrlChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signInWithUrl", binaryMessenger: binaryMessenger, codec: codec) + let signInWithUrlChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signInWithUrl\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { signInWithUrlChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -274,10 +337,10 @@ class NativeAuthBridgeSetup { let browserPackageNameArg: String? = nilOrValue(args[3]) api.signInWithUrl(url: urlArg, callbackUrlScheme: callbackUrlSchemeArg, preferPrivateSession: preferPrivateSessionArg, browserPackageName: browserPackageNameArg) { result in switch result { - case .success(let res): - reply(wrapResult(res)) - case .failure(let error): - reply(wrapError(error)) + case .success(let res): + reply(wrapResult(res)) + case .failure(let error): + reply(wrapError(error)) } } } @@ -286,7 +349,7 @@ class NativeAuthBridgeSetup { } /// Sign out by presenting [url] and waiting for a response to a URL with /// [callbackUrlScheme]. - let signOutWithUrlChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signOutWithUrl", binaryMessenger: binaryMessenger, codec: codec) + let signOutWithUrlChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signOutWithUrl\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { signOutWithUrlChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -296,10 +359,10 @@ class NativeAuthBridgeSetup { let browserPackageNameArg: String? = nilOrValue(args[3]) api.signOutWithUrl(url: urlArg, callbackUrlScheme: callbackUrlSchemeArg, preferPrivateSession: preferPrivateSessionArg, browserPackageName: browserPackageNameArg) { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } @@ -307,7 +370,7 @@ class NativeAuthBridgeSetup { signOutWithUrlChannel.setMessageHandler(nil) } /// Retrieves the validation data for the current iOS/Android device. - let getValidationDataChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getValidationData", binaryMessenger: binaryMessenger, codec: codec) + let getValidationDataChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getValidationData\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { getValidationDataChannel.setMessageHandler { _, reply in do { @@ -321,7 +384,7 @@ class NativeAuthBridgeSetup { getValidationDataChannel.setMessageHandler(nil) } /// Retrieves context data as required for advanced security features (ASF). - let getContextDataChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getContextData", binaryMessenger: binaryMessenger, codec: codec) + let getContextDataChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getContextData\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { getContextDataChannel.setMessageHandler { _, reply in do { @@ -334,7 +397,7 @@ class NativeAuthBridgeSetup { } else { getContextDataChannel.setMessageHandler(nil) } - let getBundleIdChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getBundleId", binaryMessenger: binaryMessenger, codec: codec) + let getBundleIdChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getBundleId\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { getBundleIdChannel.setMessageHandler { _, reply in do { @@ -348,7 +411,7 @@ class NativeAuthBridgeSetup { getBundleIdChannel.setMessageHandler(nil) } /// Fetch legacy credentials stored by native SDKs. - let getLegacyCredentialsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getLegacyCredentials", binaryMessenger: binaryMessenger, codec: codec) + let getLegacyCredentialsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getLegacyCredentials\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { getLegacyCredentialsChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -356,10 +419,10 @@ class NativeAuthBridgeSetup { let appClientIdArg: String? = nilOrValue(args[1]) api.getLegacyCredentials(identityPoolId: identityPoolIdArg, appClientId: appClientIdArg) { result in switch result { - case .success(let res): - reply(wrapResult(res)) - case .failure(let error): - reply(wrapError(error)) + case .success(let res): + reply(wrapResult(res)) + case .failure(let error): + reply(wrapError(error)) } } } @@ -367,15 +430,15 @@ class NativeAuthBridgeSetup { getLegacyCredentialsChannel.setMessageHandler(nil) } /// Clears the legacy credential store data. - let clearLegacyCredentialsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.clearLegacyCredentials", binaryMessenger: binaryMessenger, codec: codec) + let clearLegacyCredentialsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.clearLegacyCredentials\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { clearLegacyCredentialsChannel.setMessageHandler { _, reply in - api.clearLegacyCredentials() { result in + api.clearLegacyCredentials { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } @@ -383,7 +446,7 @@ class NativeAuthBridgeSetup { clearLegacyCredentialsChannel.setMessageHandler(nil) } /// Fetch legacy device secrets stored by native SDKs. - let fetchLegacyDeviceSecretsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.fetchLegacyDeviceSecrets", binaryMessenger: binaryMessenger, codec: codec) + let fetchLegacyDeviceSecretsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.fetchLegacyDeviceSecrets\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { fetchLegacyDeviceSecretsChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -391,10 +454,10 @@ class NativeAuthBridgeSetup { let userPoolIdArg = args[1] as! String api.fetchLegacyDeviceSecrets(username: usernameArg, userPoolId: userPoolIdArg) { result in switch result { - case .success(let res): - reply(wrapResult(res)) - case .failure(let error): - reply(wrapError(error)) + case .success(let res): + reply(wrapResult(res)) + case .failure(let error): + reply(wrapError(error)) } } } @@ -402,7 +465,7 @@ class NativeAuthBridgeSetup { fetchLegacyDeviceSecretsChannel.setMessageHandler(nil) } /// Clears the legacy device secrets. - let deleteLegacyDeviceSecretsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.deleteLegacyDeviceSecrets", binaryMessenger: binaryMessenger, codec: codec) + let deleteLegacyDeviceSecretsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.deleteLegacyDeviceSecrets\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { deleteLegacyDeviceSecretsChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -410,10 +473,10 @@ class NativeAuthBridgeSetup { let userPoolIdArg = args[1] as! String api.deleteLegacyDeviceSecrets(username: usernameArg, userPoolId: userPoolIdArg) { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } diff --git a/packages/auth/amplify_auth_cognito/example/android/app/build.gradle b/packages/auth/amplify_auth_cognito/example/android/app/build.gradle index cd2c7b0722..f99934a941 100644 --- a/packages/auth/amplify_auth_cognito/example/android/app/build.gradle +++ b/packages/auth/amplify_auth_cognito/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace 'com.amazonaws.amplify.amplify_auth_cognito_example' compileSdk flutter.compileSdkVersion @@ -69,8 +66,6 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.13.2' // These versions must exactly match the ones supported by Flutter, which may not always be diff --git a/packages/auth/amplify_auth_cognito/example/android/build.gradle b/packages/auth/amplify_auth_cognito/example/android/build.gradle index 070b4ffbfd..bc157bd1a1 100644 --- a/packages/auth/amplify_auth_cognito/example/android/build.gradle +++ b/packages/auth/amplify_auth_cognito/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/packages/auth/amplify_auth_cognito/example/android/settings.gradle b/packages/auth/amplify_auth_cognito/example/android/settings.gradle index 44e62bcf06..276cdabf9c 100644 --- a/packages/auth/amplify_auth_cognito/example/android/settings.gradle +++ b/packages/auth/amplify_auth_cognito/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.10" apply false +} + +include ":app" diff --git a/packages/auth/amplify_auth_cognito/example/integration_test/native_auth_bridge_test.dart b/packages/auth/amplify_auth_cognito/example/integration_test/native_auth_bridge_test.dart index 7ff9a0ca6c..5bee21a3e3 100644 --- a/packages/auth/amplify_auth_cognito/example/integration_test/native_auth_bridge_test.dart +++ b/packages/auth/amplify_auth_cognito/example/integration_test/native_auth_bridge_test.dart @@ -114,16 +114,16 @@ typedef SignInOutFn = Future Function( class MockNativeAuthBridge extends Fake implements NativeAuthBridge { MockNativeAuthBridge({ - SignInOutFn>? signInWithUrl, + SignInOutFn>? signInWithUrl, SignInOutFn? signOutWithUrl, }) : _signInWithUrl = signInWithUrl, _signOutWithUrl = signOutWithUrl; - final SignInOutFn>? _signInWithUrl; + final SignInOutFn>? _signInWithUrl; final SignInOutFn? _signOutWithUrl; @override - Future> signInWithUrl( + Future> signInWithUrl( String argUrl, String argCallbackurlscheme, bool argPreferprivatesession, diff --git a/packages/auth/amplify_auth_cognito/example/pubspec.yaml b/packages/auth/amplify_auth_cognito/example/pubspec.yaml index 0da314f0dc..fadb891bdb 100644 --- a/packages/auth/amplify_auth_cognito/example/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito/example/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_api: any diff --git a/packages/auth/amplify_auth_cognito/lib/src/auth_plugin_impl.dart b/packages/auth/amplify_auth_cognito/lib/src/auth_plugin_impl.dart index 7b9889f309..15cb606344 100644 --- a/packages/auth/amplify_auth_cognito/lib/src/auth_plugin_impl.dart +++ b/packages/auth/amplify_auth_cognito/lib/src/auth_plugin_impl.dart @@ -60,7 +60,7 @@ class AmplifyAuthCognito extends AmplifyAuthCognitoDart with AWSDebuggable { // Configure this plugin to act as a native iOS/Android plugin. final nativePlugin = _NativeAmplifyAuthCognito(stateMachine); - NativeAuthPlugin.setup(nativePlugin); + NativeAuthPlugin.setUp(nativePlugin); final nativeBridge = NativeAuthBridge(); stateMachine diff --git a/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart b/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart index 0cde16746c..9cd7791034 100644 --- a/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart +++ b/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart @@ -1,9 +1,9 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.1), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; @@ -11,6 +11,24 @@ import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +PlatformException _createConnectionError(String channelName) { + return PlatformException( + code: 'channel-error', + message: 'Unable to establish connection on channel: "$channelName".', + ); +} + +List wrapResponse( + {Object? result, PlatformException? error, bool empty = false}) { + if (empty) { + return []; + } + if (error == null) { + return [result]; + } + return [error.code, error.message, error.details]; +} + class NativeUserContextData { NativeUserContextData({ this.deviceName, @@ -164,52 +182,22 @@ class LegacyDeviceDetailsSecret { } } -abstract class NativeAuthPlugin { - static const MessageCodec codec = StandardMessageCodec(); - - /// Exchanges the route parameters used to launch the app, i.e. if the app - /// was closed and a redirect happened to the custom URI scheme (iOS) or an - /// intent was launched with the redirect parameters (Android). - void exchange(Map params); - - static void setup(NativeAuthPlugin? api, {BinaryMessenger? binaryMessenger}) { - { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange', - codec, - binaryMessenger: binaryMessenger); - if (api == null) { - channel.setMessageHandler(null); - } else { - channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange was null.'); - final List args = (message as List?)!; - final Map? arg_params = - (args[0] as Map?)?.cast(); - assert(arg_params != null, - 'Argument for dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange was null, expected non-null Map.'); - api.exchange(arg_params!); - return; - }); - } - } - } -} - -class _NativeAuthBridgeCodec extends StandardMessageCodec { - const _NativeAuthBridgeCodec(); +class _PigeonCodec extends StandardMessageCodec { + const _PigeonCodec(); @override void writeValue(WriteBuffer buffer, Object? value) { - if (value is LegacyCredentialStoreData) { - buffer.putUint8(128); - writeValue(buffer, value.encode()); - } else if (value is LegacyDeviceDetailsSecret) { + if (value is int) { + buffer.putUint8(4); + buffer.putInt64(value); + } else if (value is NativeUserContextData) { buffer.putUint8(129); writeValue(buffer, value.encode()); - } else if (value is NativeUserContextData) { + } else if (value is LegacyCredentialStoreData) { buffer.putUint8(130); writeValue(buffer, value.encode()); + } else if (value is LegacyDeviceDetailsSecret) { + buffer.putUint8(131); + writeValue(buffer, value.encode()); } else { super.writeValue(buffer, value); } @@ -218,92 +206,150 @@ class _NativeAuthBridgeCodec extends StandardMessageCodec { @override Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { - case 128: - return LegacyCredentialStoreData.decode(readValue(buffer)!); case 129: - return LegacyDeviceDetailsSecret.decode(readValue(buffer)!); - case 130: return NativeUserContextData.decode(readValue(buffer)!); + case 130: + return LegacyCredentialStoreData.decode(readValue(buffer)!); + case 131: + return LegacyDeviceDetailsSecret.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); } } } +abstract class NativeAuthPlugin { + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); + + /// Exchanges the route parameters used to launch the app, i.e. if the app + /// was closed and a redirect happened to the custom URI scheme (iOS) or an + /// intent was launched with the redirect parameters (Android). + void exchange(Map params); + + static void setUp( + NativeAuthPlugin? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + { + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< + Object?>( + 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger); + if (api == null) { + pigeonVar_channel.setMessageHandler(null); + } else { + pigeonVar_channel.setMessageHandler((Object? message) async { + assert(message != null, + 'Argument for dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange was null.'); + final List args = (message as List?)!; + final Map? arg_params = + (args[0] as Map?)?.cast(); + assert(arg_params != null, + 'Argument for dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange was null, expected non-null Map.'); + try { + api.exchange(arg_params!); + return wrapResponse(empty: true); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString())); + } + }); + } + } + } +} + class NativeAuthBridge { /// Constructor for [NativeAuthBridge]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - NativeAuthBridge({BinaryMessenger? binaryMessenger}) - : _binaryMessenger = binaryMessenger; - final BinaryMessenger? _binaryMessenger; + NativeAuthBridge( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + final BinaryMessenger? pigeonVar_binaryMessenger; - static const MessageCodec codec = _NativeAuthBridgeCodec(); + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); + + final String pigeonVar_messageChannelSuffix; /// Sign in by presenting [url] and waiting for a response to a URL with /// [callbackUrlScheme]. /// /// If [preferPrivateSession] is `true`, do not persist session cookies. - Future> signInWithUrl( - String arg_url, - String arg_callbackUrlScheme, - bool arg_preferPrivateSession, - String? arg_browserPackageName) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signInWithUrl', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send([ - arg_url, - arg_callbackUrlScheme, - arg_preferPrivateSession, - arg_browserPackageName + Future> signInWithUrl( + String url, + String callbackUrlScheme, + bool preferPrivateSession, + String? browserPackageName) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signInWithUrl$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([ + url, + callbackUrlScheme, + preferPrivateSession, + browserPackageName ]) as List?; - if (replyList == null) { + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (replyList.length > 1) { - throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], - ); - } else if (replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (replyList[0] as Map?)!.cast(); + return (pigeonVar_replyList[0] as Map?)! + .cast(); } } /// Sign out by presenting [url] and waiting for a response to a URL with /// [callbackUrlScheme]. - Future signOutWithUrl(String arg_url, String arg_callbackUrlScheme, - bool arg_preferPrivateSession, String? arg_browserPackageName) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signOutWithUrl', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send([ - arg_url, - arg_callbackUrlScheme, - arg_preferPrivateSession, - arg_browserPackageName + Future signOutWithUrl(String url, String callbackUrlScheme, + bool preferPrivateSession, String? browserPackageName) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signOutWithUrl$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([ + url, + callbackUrlScheme, + preferPrivateSession, + browserPackageName ]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -311,135 +357,145 @@ class NativeAuthBridge { } /// Retrieves the validation data for the current iOS/Android device. - Future> getValidationData() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getValidationData', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send(null) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + Future> getValidationData() async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getValidationData$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (replyList[0] as Map?)!.cast(); + return (pigeonVar_replyList[0] as Map?)! + .cast(); } } /// Retrieves context data as required for advanced security features (ASF). Future getContextData() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getContextData', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send(null) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getContextData$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (replyList[0] as NativeUserContextData?)!; + return (pigeonVar_replyList[0] as NativeUserContextData?)!; } } Future getBundleId() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getBundleId', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send(null) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getBundleId$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (replyList[0] as String?)!; + return (pigeonVar_replyList[0] as String?)!; } } /// Fetch legacy credentials stored by native SDKs. Future getLegacyCredentials( - String? arg_identityPoolId, String? arg_appClientId) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getLegacyCredentials', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel - .send([arg_identityPoolId, arg_appClientId]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + String? identityPoolId, String? appClientId) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getLegacyCredentials$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([identityPoolId, appClientId]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (replyList[0] as LegacyCredentialStoreData?)!; + return (pigeonVar_replyList[0] as LegacyCredentialStoreData?)!; } } /// Clears the legacy credential store data. Future clearLegacyCredentials() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.clearLegacyCredentials', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send(null) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.clearLegacyCredentials$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -448,48 +504,50 @@ class NativeAuthBridge { /// Fetch legacy device secrets stored by native SDKs. Future fetchLegacyDeviceSecrets( - String arg_username, String arg_userPoolId) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.fetchLegacyDeviceSecrets', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel - .send([arg_username, arg_userPoolId]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + String username, String userPoolId) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.fetchLegacyDeviceSecrets$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([username, userPoolId]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { - return (replyList[0] as LegacyDeviceDetailsSecret?); + return (pigeonVar_replyList[0] as LegacyDeviceDetailsSecret?); } } /// Clears the legacy device secrets. Future deleteLegacyDeviceSecrets( - String arg_username, String arg_userPoolId) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.deleteLegacyDeviceSecrets', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel - .send([arg_username, arg_userPoolId]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + String username, String userPoolId) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.deleteLegacyDeviceSecrets$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([username, userPoolId]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; diff --git a/packages/auth/amplify_auth_cognito/pubspec.yaml b/packages/auth/amplify_auth_cognito/pubspec.yaml index 9e8ed727dd..50d97001c5 100644 --- a/packages/auth/amplify_auth_cognito/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/au issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" # Helps `pana` since we do not use Flutter plugins for most platforms platforms: @@ -38,7 +38,7 @@ dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" flutter_test: sdk: flutter - pigeon: ^11.0.0 + pigeon: ^22.6.2 flutter: plugin: diff --git a/packages/auth/amplify_auth_cognito/test/hosted_ui_platform_flutter_test.dart b/packages/auth/amplify_auth_cognito/test/hosted_ui_platform_flutter_test.dart index 92546d2163..3ee187f4f9 100644 --- a/packages/auth/amplify_auth_cognito/test/hosted_ui_platform_flutter_test.dart +++ b/packages/auth/amplify_auth_cognito/test/hosted_ui_platform_flutter_test.dart @@ -79,7 +79,7 @@ void main() { final class ThrowingNativeBridge extends Fake implements NativeAuthBridge { @override - Future> signInWithUrl( + Future> signInWithUrl( String arg_url, String arg_callbackUrlScheme, bool arg_preferPrivateSession, diff --git a/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml b/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml index 98b9611bce..089f80f5d1 100644 --- a/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_auth_cognito_dart: any diff --git a/packages/auth/amplify_auth_cognito_dart/example/web/components/user_component.dart b/packages/auth/amplify_auth_cognito_dart/example/web/components/user_component.dart index a086b98445..ab72cc21cf 100644 --- a/packages/auth/amplify_auth_cognito_dart/example/web/components/user_component.dart +++ b/packages/auth/amplify_auth_cognito_dart/example/web/components/user_component.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; import 'package:amplify_auth_cognito_dart/amplify_auth_cognito_dart.dart'; diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_context_data.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_context_data.g.dart index 47122f3d9e..712825149e 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_context_data.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_context_data.g.dart @@ -337,16 +337,17 @@ class ASFContextDataBuilder _$ASFContextData _build() { final _$result = _$v ?? new _$ASFContextData._( - deviceName: deviceName, - thirdPartyDeviceId: thirdPartyDeviceId, - deviceFingerprint: deviceFingerprint, - clientTimezone: clientTimezone, - applicationName: applicationName, - applicationVersion: applicationVersion, - deviceLanguage: deviceLanguage, - deviceOsReleaseVersion: deviceOsReleaseVersion, - screenHeightPixels: screenHeightPixels, - screenWidthPixels: screenWidthPixels); + deviceName: deviceName, + thirdPartyDeviceId: thirdPartyDeviceId, + deviceFingerprint: deviceFingerprint, + clientTimezone: clientTimezone, + applicationName: applicationName, + applicationVersion: applicationVersion, + deviceLanguage: deviceLanguage, + deviceOsReleaseVersion: deviceOsReleaseVersion, + screenHeightPixels: screenHeightPixels, + screenWidthPixels: screenWidthPixels, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_device_info_collector.js.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_device_info_collector.js.dart index 61c109b249..644a500243 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_device_info_collector.js.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_device_info_collector.js.dart @@ -12,6 +12,7 @@ import 'package:async/async.dart'; import 'package:aws_common/aws_common.dart'; // ignore: implementation_imports import 'package:aws_common/src/js/common.dart'; +//ignore: deprecated_member_use import 'package:js/js.dart'; import 'package:path/path.dart'; diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.g.dart index cf950ecbd1..7dccce1157 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.g.dart @@ -297,17 +297,18 @@ class ASFWorkerRequestBuilder try { _$result = _$v ?? new _$ASFWorkerRequest._( - requestId: BuiltValueNullFieldError.checkNotNull( - requestId, r'ASFWorkerRequest', 'requestId'), - userPoolId: BuiltValueNullFieldError.checkNotNull( - userPoolId, r'ASFWorkerRequest', 'userPoolId'), - clientId: BuiltValueNullFieldError.checkNotNull( - clientId, r'ASFWorkerRequest', 'clientId'), - username: BuiltValueNullFieldError.checkNotNull( - username, r'ASFWorkerRequest', 'username'), - deviceId: BuiltValueNullFieldError.checkNotNull( - deviceId, r'ASFWorkerRequest', 'deviceId'), - nativeContextData: nativeContextData.build()); + requestId: BuiltValueNullFieldError.checkNotNull( + requestId, r'ASFWorkerRequest', 'requestId'), + userPoolId: BuiltValueNullFieldError.checkNotNull( + userPoolId, r'ASFWorkerRequest', 'userPoolId'), + clientId: BuiltValueNullFieldError.checkNotNull( + clientId, r'ASFWorkerRequest', 'clientId'), + username: BuiltValueNullFieldError.checkNotNull( + username, r'ASFWorkerRequest', 'username'), + deviceId: BuiltValueNullFieldError.checkNotNull( + deviceId, r'ASFWorkerRequest', 'deviceId'), + nativeContextData: nativeContextData.build(), + ); } catch (_) { late String _$failedField; try { @@ -422,9 +423,10 @@ class ASFWorkerResponseBuilder try { _$result = _$v ?? new _$ASFWorkerResponse._( - requestId: BuiltValueNullFieldError.checkNotNull( - requestId, r'ASFWorkerResponse', 'requestId'), - userContextData: userContextData.build()); + requestId: BuiltValueNullFieldError.checkNotNull( + requestId, r'ASFWorkerResponse', 'requestId'), + userContextData: userContextData.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.g.dart index 860aa3cfb2..bedb37768f 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.g.dart @@ -222,9 +222,10 @@ class ConfirmDeviceMessageBuilder try { _$result = _$v ?? new _$ConfirmDeviceMessage._( - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'ConfirmDeviceMessage', 'accessToken'), - newDeviceMetadata: newDeviceMetadata.build()); + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'ConfirmDeviceMessage', 'accessToken'), + newDeviceMetadata: newDeviceMetadata.build(), + ); } catch (_) { late String _$failedField; try { @@ -341,9 +342,10 @@ class ConfirmDeviceResponseBuilder try { _$result = _$v ?? new _$ConfirmDeviceResponse._( - devicePassword: BuiltValueNullFieldError.checkNotNull( - devicePassword, r'ConfirmDeviceResponse', 'devicePassword'), - request: request.build()); + devicePassword: BuiltValueNullFieldError.checkNotNull( + devicePassword, r'ConfirmDeviceResponse', 'devicePassword'), + request: request.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.g.dart index 96ce5526ca..77f21f20ba 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.g.dart @@ -241,17 +241,18 @@ class SrpDevicePasswordVerifierMessageBuilder _$SrpDevicePasswordVerifierMessage _build() { final _$result = _$v ?? new _$SrpDevicePasswordVerifierMessage._( - initResult: BuiltValueNullFieldError.checkNotNull( - initResult, r'SrpDevicePasswordVerifierMessage', 'initResult'), - clientId: BuiltValueNullFieldError.checkNotNull( - clientId, r'SrpDevicePasswordVerifierMessage', 'clientId'), - clientSecret: clientSecret, - deviceSecrets: BuiltValueNullFieldError.checkNotNull(deviceSecrets, - r'SrpDevicePasswordVerifierMessage', 'deviceSecrets'), - challengeParameters: BuiltValueNullFieldError.checkNotNull( - challengeParameters, - r'SrpDevicePasswordVerifierMessage', - 'challengeParameters')); + initResult: BuiltValueNullFieldError.checkNotNull( + initResult, r'SrpDevicePasswordVerifierMessage', 'initResult'), + clientId: BuiltValueNullFieldError.checkNotNull( + clientId, r'SrpDevicePasswordVerifierMessage', 'clientId'), + clientSecret: clientSecret, + deviceSecrets: BuiltValueNullFieldError.checkNotNull(deviceSecrets, + r'SrpDevicePasswordVerifierMessage', 'deviceSecrets'), + challengeParameters: BuiltValueNullFieldError.checkNotNull( + challengeParameters, + r'SrpDevicePasswordVerifierMessage', + 'challengeParameters'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_result.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_result.g.dart index 4e8376f8aa..0d37f5b14b 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_result.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_result.g.dart @@ -147,10 +147,11 @@ class SrpInitResultBuilder _$SrpInitResult _build() { final _$result = _$v ?? new _$SrpInitResult._( - privateA: BuiltValueNullFieldError.checkNotNull( - privateA, r'SrpInitResult', 'privateA'), - publicA: BuiltValueNullFieldError.checkNotNull( - publicA, r'SrpInitResult', 'publicA')); + privateA: BuiltValueNullFieldError.checkNotNull( + privateA, r'SrpInitResult', 'privateA'), + publicA: BuiltValueNullFieldError.checkNotNull( + publicA, r'SrpInitResult', 'publicA'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.g.dart index 6cac6d0a58..9435283544 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.g.dart @@ -301,22 +301,23 @@ class SrpPasswordVerifierMessageBuilder SrpPasswordVerifierMessage._init(this); final _$result = _$v ?? new _$SrpPasswordVerifierMessage._( - initResult: BuiltValueNullFieldError.checkNotNull( - initResult, r'SrpPasswordVerifierMessage', 'initResult'), - clientId: BuiltValueNullFieldError.checkNotNull( - clientId, r'SrpPasswordVerifierMessage', 'clientId'), - clientSecret: clientSecret, - poolId: BuiltValueNullFieldError.checkNotNull( - poolId, r'SrpPasswordVerifierMessage', 'poolId'), - deviceKey: deviceKey, - parameters: BuiltValueNullFieldError.checkNotNull( - parameters, r'SrpPasswordVerifierMessage', 'parameters'), - challengeParameters: BuiltValueNullFieldError.checkNotNull( - challengeParameters, - r'SrpPasswordVerifierMessage', - 'challengeParameters'), - timestamp: BuiltValueNullFieldError.checkNotNull( - timestamp, r'SrpPasswordVerifierMessage', 'timestamp')); + initResult: BuiltValueNullFieldError.checkNotNull( + initResult, r'SrpPasswordVerifierMessage', 'initResult'), + clientId: BuiltValueNullFieldError.checkNotNull( + clientId, r'SrpPasswordVerifierMessage', 'clientId'), + clientSecret: clientSecret, + poolId: BuiltValueNullFieldError.checkNotNull( + poolId, r'SrpPasswordVerifierMessage', 'poolId'), + deviceKey: deviceKey, + parameters: BuiltValueNullFieldError.checkNotNull( + parameters, r'SrpPasswordVerifierMessage', 'parameters'), + challengeParameters: BuiltValueNullFieldError.checkNotNull( + challengeParameters, + r'SrpPasswordVerifierMessage', + 'challengeParameters'), + timestamp: BuiltValueNullFieldError.checkNotNull( + timestamp, r'SrpPasswordVerifierMessage', 'timestamp'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/cognito_device_secrets.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/cognito_device_secrets.g.dart index 108f693f8a..ec12550100 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/cognito_device_secrets.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/cognito_device_secrets.g.dart @@ -203,14 +203,15 @@ class CognitoDeviceSecretsBuilder CognitoDeviceSecrets._init(this); final _$result = _$v ?? new _$CognitoDeviceSecrets._( - deviceGroupKey: BuiltValueNullFieldError.checkNotNull( - deviceGroupKey, r'CognitoDeviceSecrets', 'deviceGroupKey'), - deviceKey: BuiltValueNullFieldError.checkNotNull( - deviceKey, r'CognitoDeviceSecrets', 'deviceKey'), - devicePassword: BuiltValueNullFieldError.checkNotNull( - devicePassword, r'CognitoDeviceSecrets', 'devicePassword'), - deviceStatus: BuiltValueNullFieldError.checkNotNull( - deviceStatus, r'CognitoDeviceSecrets', 'deviceStatus')); + deviceGroupKey: BuiltValueNullFieldError.checkNotNull( + deviceGroupKey, r'CognitoDeviceSecrets', 'deviceGroupKey'), + deviceKey: BuiltValueNullFieldError.checkNotNull( + deviceKey, r'CognitoDeviceSecrets', 'deviceKey'), + devicePassword: BuiltValueNullFieldError.checkNotNull( + devicePassword, r'CognitoDeviceSecrets', 'devicePassword'), + deviceStatus: BuiltValueNullFieldError.checkNotNull( + deviceStatus, r'CognitoDeviceSecrets', 'deviceStatus'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/cognito_user.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/cognito_user.g.dart index 25e9644506..5d387df654 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/cognito_user.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/cognito_user.g.dart @@ -176,17 +176,18 @@ class CognitoUserBuilder implements Builder { try { _$result = _$v ?? new _$CognitoUser._( - identityId: identityId, - awsCredentials: awsCredentials, - userPoolTokens: _userPoolTokens?.build(), - deviceSecrets: _deviceSecrets?.build(), - userId: BuiltValueNullFieldError.checkNotNull( - userId, r'CognitoUser', 'userId'), - username: BuiltValueNullFieldError.checkNotNull( - username, r'CognitoUser', 'username'), - signInDetails: BuiltValueNullFieldError.checkNotNull( - signInDetails, r'CognitoUser', 'signInDetails'), - attributes: attributes.build()); + identityId: identityId, + awsCredentials: awsCredentials, + userPoolTokens: _userPoolTokens?.build(), + deviceSecrets: _deviceSecrets?.build(), + userId: BuiltValueNullFieldError.checkNotNull( + userId, r'CognitoUser', 'userId'), + username: BuiltValueNullFieldError.checkNotNull( + username, r'CognitoUser', 'username'), + signInDetails: BuiltValueNullFieldError.checkNotNull( + signInDetails, r'CognitoUser', 'signInDetails'), + attributes: attributes.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/hosted_ui/oauth_parameters.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/hosted_ui/oauth_parameters.g.dart index 051055f555..86524b94e0 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/hosted_ui/oauth_parameters.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/hosted_ui/oauth_parameters.g.dart @@ -371,12 +371,13 @@ class OAuthParametersBuilder OAuthParameters._finalize(this); final _$result = _$v ?? new _$OAuthParameters._( - state: BuiltValueNullFieldError.checkNotNull( - state, r'OAuthParameters', 'state'), - code: code, - error: error, - errorDescription: errorDescription, - errorUri: errorUri); + state: BuiltValueNullFieldError.checkNotNull( + state, r'OAuthParameters', 'state'), + code: code, + error: error, + errorDescription: errorDescription, + errorUri: errorUri, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_user_pool_tokens.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_user_pool_tokens.g.dart index cb043c9fe2..f92152a2d4 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_user_pool_tokens.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_user_pool_tokens.g.dart @@ -121,14 +121,15 @@ class CognitoUserPoolTokensBuilder CognitoUserPoolTokens._finalize(this); final _$result = _$v ?? new _$CognitoUserPoolTokens._( - signInMethod: BuiltValueNullFieldError.checkNotNull( - signInMethod, r'CognitoUserPoolTokens', 'signInMethod'), - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'CognitoUserPoolTokens', 'accessToken'), - refreshToken: BuiltValueNullFieldError.checkNotNull( - refreshToken, r'CognitoUserPoolTokens', 'refreshToken'), - idToken: BuiltValueNullFieldError.checkNotNull( - idToken, r'CognitoUserPoolTokens', 'idToken')); + signInMethod: BuiltValueNullFieldError.checkNotNull( + signInMethod, r'CognitoUserPoolTokens', 'signInMethod'), + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'CognitoUserPoolTokens', 'accessToken'), + refreshToken: BuiltValueNullFieldError.checkNotNull( + refreshToken, r'CognitoUserPoolTokens', 'refreshToken'), + idToken: BuiltValueNullFieldError.checkNotNull( + idToken, r'CognitoUserPoolTokens', 'idToken'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/sign_in_parameters.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/sign_in_parameters.g.dart index 61730d36a9..e5077bd291 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/sign_in_parameters.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/sign_in_parameters.g.dart @@ -152,9 +152,10 @@ class SignInParametersBuilder _$SignInParameters _build() { final _$result = _$v ?? new _$SignInParameters._( - username: BuiltValueNullFieldError.checkNotNull( - username, r'SignInParameters', 'username'), - password: password); + username: BuiltValueNullFieldError.checkNotNull( + username, r'SignInParameters', 'username'), + password: password, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/sign_up_parameters.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/sign_up_parameters.g.dart index c72725c51c..167b6dfc91 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/sign_up_parameters.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/sign_up_parameters.g.dart @@ -99,10 +99,11 @@ class SignUpParametersBuilder _$SignUpParameters _build() { final _$result = _$v ?? new _$SignUpParameters._( - username: BuiltValueNullFieldError.checkNotNull( - username, r'SignUpParameters', 'username'), - password: BuiltValueNullFieldError.checkNotNull( - password, r'SignUpParameters', 'password')); + username: BuiltValueNullFieldError.checkNotNull( + username, r'SignUpParameters', 'username'), + password: BuiltValueNullFieldError.checkNotNull( + password, r'SignUpParameters', 'password'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/credentials.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/credentials.g.dart index 2375c465fc..934ccb7447 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/credentials.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/credentials.g.dart @@ -102,10 +102,11 @@ class CredentialsBuilder implements Builder { _$Credentials _build() { final _$result = _$v ?? new _$Credentials._( - accessKeyId: accessKeyId, - secretKey: secretKey, - sessionToken: sessionToken, - expiration: expiration); + accessKeyId: accessKeyId, + secretKey: secretKey, + sessionToken: sessionToken, + expiration: expiration, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/external_service_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/external_service_exception.g.dart index 9ca1229600..00a7dc4ec7 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/external_service_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/external_service_exception.g.dart @@ -83,7 +83,10 @@ class ExternalServiceExceptionBuilder _$ExternalServiceException _build() { final _$result = _$v ?? - new _$ExternalServiceException._(message: message, headers: headers); + new _$ExternalServiceException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_credentials_for_identity_input.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_credentials_for_identity_input.g.dart index 1185ed4091..676cb8a007 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_credentials_for_identity_input.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_credentials_for_identity_input.g.dart @@ -106,10 +106,11 @@ class GetCredentialsForIdentityInputBuilder try { _$result = _$v ?? new _$GetCredentialsForIdentityInput._( - identityId: BuiltValueNullFieldError.checkNotNull( - identityId, r'GetCredentialsForIdentityInput', 'identityId'), - logins: _logins?.build(), - customRoleArn: customRoleArn); + identityId: BuiltValueNullFieldError.checkNotNull( + identityId, r'GetCredentialsForIdentityInput', 'identityId'), + logins: _logins?.build(), + customRoleArn: customRoleArn, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_credentials_for_identity_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_credentials_for_identity_response.g.dart index 158f644713..176de7706c 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_credentials_for_identity_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_credentials_for_identity_response.g.dart @@ -96,7 +96,9 @@ class GetCredentialsForIdentityResponseBuilder try { _$result = _$v ?? new _$GetCredentialsForIdentityResponse._( - identityId: identityId, credentials: _credentials?.build()); + identityId: identityId, + credentials: _credentials?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_id_input.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_id_input.g.dart index 22c086be9e..08e88365ba 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_id_input.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_id_input.g.dart @@ -99,10 +99,11 @@ class GetIdInputBuilder implements Builder { try { _$result = _$v ?? new _$GetIdInput._( - accountId: accountId, - identityPoolId: BuiltValueNullFieldError.checkNotNull( - identityPoolId, r'GetIdInput', 'identityPoolId'), - logins: _logins?.build()); + accountId: accountId, + identityPoolId: BuiltValueNullFieldError.checkNotNull( + identityPoolId, r'GetIdInput', 'identityPoolId'), + logins: _logins?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_id_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_id_response.g.dart index 865ff629f8..10d9d9e085 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_id_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/get_id_response.g.dart @@ -71,7 +71,10 @@ class GetIdResponseBuilder GetIdResponse build() => _build(); _$GetIdResponse _build() { - final _$result = _$v ?? new _$GetIdResponse._(identityId: identityId); + final _$result = _$v ?? + new _$GetIdResponse._( + identityId: identityId, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/internal_error_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/internal_error_exception.g.dart index 286b7810d2..90dfcf61a4 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/internal_error_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/internal_error_exception.g.dart @@ -91,7 +91,10 @@ class InternalErrorExceptionBuilder _$InternalErrorException _build() { final _$result = _$v ?? new _$InternalErrorException._( - message: message, statusCode: statusCode, headers: headers); + message: message, + statusCode: statusCode, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/invalid_identity_pool_configuration_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/invalid_identity_pool_configuration_exception.g.dart index 4dee698986..6925a3907a 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/invalid_identity_pool_configuration_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/invalid_identity_pool_configuration_exception.g.dart @@ -93,7 +93,9 @@ class InvalidIdentityPoolConfigurationExceptionBuilder _$InvalidIdentityPoolConfigurationException _build() { final _$result = _$v ?? new _$InvalidIdentityPoolConfigurationException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/invalid_parameter_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/invalid_parameter_exception.g.dart index 210aa914f2..db2586e8b4 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/invalid_parameter_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/invalid_parameter_exception.g.dart @@ -83,7 +83,10 @@ class InvalidParameterExceptionBuilder _$InvalidParameterException _build() { final _$result = _$v ?? - new _$InvalidParameterException._(message: message, headers: headers); + new _$InvalidParameterException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/limit_exceeded_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/limit_exceeded_exception.g.dart index 862b352a99..afd0112ce7 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/limit_exceeded_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/limit_exceeded_exception.g.dart @@ -82,7 +82,10 @@ class LimitExceededExceptionBuilder _$LimitExceededException _build() { final _$result = _$v ?? - new _$LimitExceededException._(message: message, headers: headers); + new _$LimitExceededException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/not_authorized_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/not_authorized_exception.g.dart index 8e506ee78b..5aa5cfb60d 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/not_authorized_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/not_authorized_exception.g.dart @@ -82,7 +82,10 @@ class NotAuthorizedExceptionBuilder _$NotAuthorizedException _build() { final _$result = _$v ?? - new _$NotAuthorizedException._(message: message, headers: headers); + new _$NotAuthorizedException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/resource_conflict_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/resource_conflict_exception.g.dart index 4f1eebebf0..5e087f4366 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/resource_conflict_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/resource_conflict_exception.g.dart @@ -83,7 +83,10 @@ class ResourceConflictExceptionBuilder _$ResourceConflictException _build() { final _$result = _$v ?? - new _$ResourceConflictException._(message: message, headers: headers); + new _$ResourceConflictException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/resource_not_found_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/resource_not_found_exception.g.dart index 5e76a50207..464b20c64f 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/resource_not_found_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/resource_not_found_exception.g.dart @@ -83,7 +83,10 @@ class ResourceNotFoundExceptionBuilder _$ResourceNotFoundException _build() { final _$result = _$v ?? - new _$ResourceNotFoundException._(message: message, headers: headers); + new _$ResourceNotFoundException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/too_many_requests_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/too_many_requests_exception.g.dart index b6f2e89d8e..b292bcbca4 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/too_many_requests_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity/model/too_many_requests_exception.g.dart @@ -83,7 +83,10 @@ class TooManyRequestsExceptionBuilder _$TooManyRequestsException _build() { final _$result = _$v ?? - new _$TooManyRequestsException._(message: message, headers: headers); + new _$TooManyRequestsException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/alias_exists_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/alias_exists_exception.g.dart index c0c77d7be6..f0cb048bb2 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/alias_exists_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/alias_exists_exception.g.dart @@ -81,8 +81,11 @@ class AliasExistsExceptionBuilder AliasExistsException build() => _build(); _$AliasExistsException _build() { - final _$result = - _$v ?? new _$AliasExistsException._(message: message, headers: headers); + final _$result = _$v ?? + new _$AliasExistsException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/analytics_metadata_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/analytics_metadata_type.g.dart index b0baf4af8d..1c0cfa1795 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/analytics_metadata_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/analytics_metadata_type.g.dart @@ -77,7 +77,9 @@ class AnalyticsMetadataTypeBuilder _$AnalyticsMetadataType _build() { final _$result = _$v ?? - new _$AnalyticsMetadataType._(analyticsEndpointId: analyticsEndpointId); + new _$AnalyticsMetadataType._( + analyticsEndpointId: analyticsEndpointId, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/associate_software_token_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/associate_software_token_request.g.dart index 584ad5f7c7..0a5b9d6410 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/associate_software_token_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/associate_software_token_request.g.dart @@ -89,7 +89,9 @@ class AssociateSoftwareTokenRequestBuilder _$AssociateSoftwareTokenRequest _build() { final _$result = _$v ?? new _$AssociateSoftwareTokenRequest._( - accessToken: accessToken, session: session); + accessToken: accessToken, + session: session, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/associate_software_token_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/associate_software_token_response.g.dart index a1f6a93e89..7017f4294e 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/associate_software_token_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/associate_software_token_response.g.dart @@ -89,7 +89,9 @@ class AssociateSoftwareTokenResponseBuilder _$AssociateSoftwareTokenResponse _build() { final _$result = _$v ?? new _$AssociateSoftwareTokenResponse._( - secretCode: secretCode, session: session); + secretCode: secretCode, + session: session, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/attribute_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/attribute_type.g.dart index a39ac87dd8..f94f28fff5 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/attribute_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/attribute_type.g.dart @@ -83,9 +83,10 @@ class AttributeTypeBuilder _$AttributeType _build() { final _$result = _$v ?? new _$AttributeType._( - name: BuiltValueNullFieldError.checkNotNull( - name, r'AttributeType', 'name'), - value: value); + name: BuiltValueNullFieldError.checkNotNull( + name, r'AttributeType', 'name'), + value: value, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/authentication_result_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/authentication_result_type.g.dart index 0c0d70cd83..dfe6461515 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/authentication_result_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/authentication_result_type.g.dart @@ -139,13 +139,14 @@ class AuthenticationResultTypeBuilder try { _$result = _$v ?? new _$AuthenticationResultType._( - accessToken: accessToken, - expiresIn: BuiltValueNullFieldError.checkNotNull( - expiresIn, r'AuthenticationResultType', 'expiresIn'), - tokenType: tokenType, - refreshToken: refreshToken, - idToken: idToken, - newDeviceMetadata: _newDeviceMetadata?.build()); + accessToken: accessToken, + expiresIn: BuiltValueNullFieldError.checkNotNull( + expiresIn, r'AuthenticationResultType', 'expiresIn'), + tokenType: tokenType, + refreshToken: refreshToken, + idToken: idToken, + newDeviceMetadata: _newDeviceMetadata?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/change_password_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/change_password_request.g.dart index 8db2af3548..cdb9eb68c3 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/change_password_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/change_password_request.g.dart @@ -108,12 +108,13 @@ class ChangePasswordRequestBuilder _$ChangePasswordRequest _build() { final _$result = _$v ?? new _$ChangePasswordRequest._( - previousPassword: BuiltValueNullFieldError.checkNotNull( - previousPassword, r'ChangePasswordRequest', 'previousPassword'), - proposedPassword: BuiltValueNullFieldError.checkNotNull( - proposedPassword, r'ChangePasswordRequest', 'proposedPassword'), - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'ChangePasswordRequest', 'accessToken')); + previousPassword: BuiltValueNullFieldError.checkNotNull( + previousPassword, r'ChangePasswordRequest', 'previousPassword'), + proposedPassword: BuiltValueNullFieldError.checkNotNull( + proposedPassword, r'ChangePasswordRequest', 'proposedPassword'), + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'ChangePasswordRequest', 'accessToken'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_delivery_details_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_delivery_details_type.g.dart index 468140edb3..71bdc6c091 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_delivery_details_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_delivery_details_type.g.dart @@ -100,9 +100,10 @@ class CodeDeliveryDetailsTypeBuilder _$CodeDeliveryDetailsType _build() { final _$result = _$v ?? new _$CodeDeliveryDetailsType._( - destination: destination, - deliveryMedium: deliveryMedium, - attributeName: attributeName); + destination: destination, + deliveryMedium: deliveryMedium, + attributeName: attributeName, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_delivery_failure_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_delivery_failure_exception.g.dart index 1d16162f01..2a2df53f42 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_delivery_failure_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_delivery_failure_exception.g.dart @@ -85,7 +85,9 @@ class CodeDeliveryFailureExceptionBuilder _$CodeDeliveryFailureException _build() { final _$result = _$v ?? new _$CodeDeliveryFailureException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_mismatch_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_mismatch_exception.g.dart index 2899161023..b1d3245492 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_mismatch_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/code_mismatch_exception.g.dart @@ -82,7 +82,10 @@ class CodeMismatchExceptionBuilder _$CodeMismatchException _build() { final _$result = _$v ?? - new _$CodeMismatchException._(message: message, headers: headers); + new _$CodeMismatchException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/concurrent_modification_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/concurrent_modification_exception.g.dart index 79c08bd9e1..3e5e195e88 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/concurrent_modification_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/concurrent_modification_exception.g.dart @@ -86,7 +86,9 @@ class ConcurrentModificationExceptionBuilder _$ConcurrentModificationException _build() { final _$result = _$v ?? new _$ConcurrentModificationException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_device_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_device_request.g.dart index d09a99e258..8b0ad926a8 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_device_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_device_request.g.dart @@ -120,12 +120,13 @@ class ConfirmDeviceRequestBuilder try { _$result = _$v ?? new _$ConfirmDeviceRequest._( - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'ConfirmDeviceRequest', 'accessToken'), - deviceKey: BuiltValueNullFieldError.checkNotNull( - deviceKey, r'ConfirmDeviceRequest', 'deviceKey'), - deviceSecretVerifierConfig: _deviceSecretVerifierConfig?.build(), - deviceName: deviceName); + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'ConfirmDeviceRequest', 'accessToken'), + deviceKey: BuiltValueNullFieldError.checkNotNull( + deviceKey, r'ConfirmDeviceRequest', 'deviceKey'), + deviceSecretVerifierConfig: _deviceSecretVerifierConfig?.build(), + deviceName: deviceName, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_device_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_device_response.g.dart index 477962a815..f8b554048b 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_device_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_device_response.g.dart @@ -84,10 +84,11 @@ class ConfirmDeviceResponseBuilder _$ConfirmDeviceResponse _build() { final _$result = _$v ?? new _$ConfirmDeviceResponse._( - userConfirmationNecessary: BuiltValueNullFieldError.checkNotNull( - userConfirmationNecessary, - r'ConfirmDeviceResponse', - 'userConfirmationNecessary')); + userConfirmationNecessary: BuiltValueNullFieldError.checkNotNull( + userConfirmationNecessary, + r'ConfirmDeviceResponse', + 'userConfirmationNecessary'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_forgot_password_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_forgot_password_request.g.dart index bac98326ce..5c90d45570 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_forgot_password_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_forgot_password_request.g.dart @@ -169,20 +169,21 @@ class ConfirmForgotPasswordRequestBuilder try { _$result = _$v ?? new _$ConfirmForgotPasswordRequest._( - clientId: BuiltValueNullFieldError.checkNotNull( - clientId, r'ConfirmForgotPasswordRequest', 'clientId'), - secretHash: secretHash, - username: BuiltValueNullFieldError.checkNotNull( - username, r'ConfirmForgotPasswordRequest', 'username'), - confirmationCode: BuiltValueNullFieldError.checkNotNull( - confirmationCode, - r'ConfirmForgotPasswordRequest', - 'confirmationCode'), - password: BuiltValueNullFieldError.checkNotNull( - password, r'ConfirmForgotPasswordRequest', 'password'), - analyticsMetadata: _analyticsMetadata?.build(), - userContextData: _userContextData?.build(), - clientMetadata: _clientMetadata?.build()); + clientId: BuiltValueNullFieldError.checkNotNull( + clientId, r'ConfirmForgotPasswordRequest', 'clientId'), + secretHash: secretHash, + username: BuiltValueNullFieldError.checkNotNull( + username, r'ConfirmForgotPasswordRequest', 'username'), + confirmationCode: BuiltValueNullFieldError.checkNotNull( + confirmationCode, + r'ConfirmForgotPasswordRequest', + 'confirmationCode'), + password: BuiltValueNullFieldError.checkNotNull( + password, r'ConfirmForgotPasswordRequest', 'password'), + analyticsMetadata: _analyticsMetadata?.build(), + userContextData: _userContextData?.build(), + clientMetadata: _clientMetadata?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_sign_up_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_sign_up_request.g.dart index a32fa3ccdd..4da146077b 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_sign_up_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/confirm_sign_up_request.g.dart @@ -170,22 +170,21 @@ class ConfirmSignUpRequestBuilder try { _$result = _$v ?? new _$ConfirmSignUpRequest._( - clientId: BuiltValueNullFieldError.checkNotNull( - clientId, r'ConfirmSignUpRequest', 'clientId'), - secretHash: secretHash, - username: BuiltValueNullFieldError.checkNotNull( - username, r'ConfirmSignUpRequest', 'username'), - confirmationCode: BuiltValueNullFieldError.checkNotNull( - confirmationCode, - r'ConfirmSignUpRequest', - 'confirmationCode'), - forceAliasCreation: BuiltValueNullFieldError.checkNotNull( - forceAliasCreation, - r'ConfirmSignUpRequest', - 'forceAliasCreation'), - analyticsMetadata: _analyticsMetadata?.build(), - userContextData: _userContextData?.build(), - clientMetadata: _clientMetadata?.build()); + clientId: BuiltValueNullFieldError.checkNotNull( + clientId, r'ConfirmSignUpRequest', 'clientId'), + secretHash: secretHash, + username: BuiltValueNullFieldError.checkNotNull( + username, r'ConfirmSignUpRequest', 'username'), + confirmationCode: BuiltValueNullFieldError.checkNotNull( + confirmationCode, r'ConfirmSignUpRequest', 'confirmationCode'), + forceAliasCreation: BuiltValueNullFieldError.checkNotNull( + forceAliasCreation, + r'ConfirmSignUpRequest', + 'forceAliasCreation'), + analyticsMetadata: _analyticsMetadata?.build(), + userContextData: _userContextData?.build(), + clientMetadata: _clientMetadata?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/delete_user_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/delete_user_request.g.dart index d4f879eafb..fdeec45210 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/delete_user_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/delete_user_request.g.dart @@ -78,8 +78,9 @@ class DeleteUserRequestBuilder _$DeleteUserRequest _build() { final _$result = _$v ?? new _$DeleteUserRequest._( - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'DeleteUserRequest', 'accessToken')); + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'DeleteUserRequest', 'accessToken'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/device_secret_verifier_config_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/device_secret_verifier_config_type.g.dart index c22d60b97c..04c1dbf8da 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/device_secret_verifier_config_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/device_secret_verifier_config_type.g.dart @@ -90,7 +90,9 @@ class DeviceSecretVerifierConfigTypeBuilder _$DeviceSecretVerifierConfigType _build() { final _$result = _$v ?? new _$DeviceSecretVerifierConfigType._( - passwordVerifier: passwordVerifier, salt: salt); + passwordVerifier: passwordVerifier, + salt: salt, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/device_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/device_type.g.dart index 281e58e62d..23c5df2d42 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/device_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/device_type.g.dart @@ -123,11 +123,12 @@ class DeviceTypeBuilder implements Builder { try { _$result = _$v ?? new _$DeviceType._( - deviceKey: deviceKey, - deviceAttributes: _deviceAttributes?.build(), - deviceCreateDate: deviceCreateDate, - deviceLastModifiedDate: deviceLastModifiedDate, - deviceLastAuthenticatedDate: deviceLastAuthenticatedDate); + deviceKey: deviceKey, + deviceAttributes: _deviceAttributes?.build(), + deviceCreateDate: deviceCreateDate, + deviceLastModifiedDate: deviceLastModifiedDate, + deviceLastAuthenticatedDate: deviceLastAuthenticatedDate, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/email_mfa_settings_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/email_mfa_settings_type.g.dart index 9be203c737..c6e182d5de 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/email_mfa_settings_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/email_mfa_settings_type.g.dart @@ -94,10 +94,11 @@ class EmailMfaSettingsTypeBuilder _$EmailMfaSettingsType _build() { final _$result = _$v ?? new _$EmailMfaSettingsType._( - enabled: BuiltValueNullFieldError.checkNotNull( - enabled, r'EmailMfaSettingsType', 'enabled'), - preferredMfa: BuiltValueNullFieldError.checkNotNull( - preferredMfa, r'EmailMfaSettingsType', 'preferredMfa')); + enabled: BuiltValueNullFieldError.checkNotNull( + enabled, r'EmailMfaSettingsType', 'enabled'), + preferredMfa: BuiltValueNullFieldError.checkNotNull( + preferredMfa, r'EmailMfaSettingsType', 'preferredMfa'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/enable_software_token_mfa_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/enable_software_token_mfa_exception.g.dart index 3827481df9..596afca4b9 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/enable_software_token_mfa_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/enable_software_token_mfa_exception.g.dart @@ -86,7 +86,9 @@ class EnableSoftwareTokenMfaExceptionBuilder _$EnableSoftwareTokenMfaException _build() { final _$result = _$v ?? new _$EnableSoftwareTokenMfaException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/expired_code_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/expired_code_exception.g.dart index d304c0f9fc..596b4afc4d 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/expired_code_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/expired_code_exception.g.dart @@ -81,8 +81,11 @@ class ExpiredCodeExceptionBuilder ExpiredCodeException build() => _build(); _$ExpiredCodeException _build() { - final _$result = - _$v ?? new _$ExpiredCodeException._(message: message, headers: headers); + final _$result = _$v ?? + new _$ExpiredCodeException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forbidden_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forbidden_exception.g.dart index c433176b0d..d8910466b5 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forbidden_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forbidden_exception.g.dart @@ -81,8 +81,11 @@ class ForbiddenExceptionBuilder ForbiddenException build() => _build(); _$ForbiddenException _build() { - final _$result = - _$v ?? new _$ForbiddenException._(message: message, headers: headers); + final _$result = _$v ?? + new _$ForbiddenException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forget_device_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forget_device_request.g.dart index 6a56ad86aa..149e492489 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forget_device_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forget_device_request.g.dart @@ -90,9 +90,10 @@ class ForgetDeviceRequestBuilder _$ForgetDeviceRequest _build() { final _$result = _$v ?? new _$ForgetDeviceRequest._( - accessToken: accessToken, - deviceKey: BuiltValueNullFieldError.checkNotNull( - deviceKey, r'ForgetDeviceRequest', 'deviceKey')); + accessToken: accessToken, + deviceKey: BuiltValueNullFieldError.checkNotNull( + deviceKey, r'ForgetDeviceRequest', 'deviceKey'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forgot_password_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forgot_password_request.g.dart index f614513768..58134a80a3 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forgot_password_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forgot_password_request.g.dart @@ -142,14 +142,15 @@ class ForgotPasswordRequestBuilder try { _$result = _$v ?? new _$ForgotPasswordRequest._( - clientId: BuiltValueNullFieldError.checkNotNull( - clientId, r'ForgotPasswordRequest', 'clientId'), - secretHash: secretHash, - userContextData: _userContextData?.build(), - username: BuiltValueNullFieldError.checkNotNull( - username, r'ForgotPasswordRequest', 'username'), - analyticsMetadata: _analyticsMetadata?.build(), - clientMetadata: _clientMetadata?.build()); + clientId: BuiltValueNullFieldError.checkNotNull( + clientId, r'ForgotPasswordRequest', 'clientId'), + secretHash: secretHash, + userContextData: _userContextData?.build(), + username: BuiltValueNullFieldError.checkNotNull( + username, r'ForgotPasswordRequest', 'username'), + analyticsMetadata: _analyticsMetadata?.build(), + clientMetadata: _clientMetadata?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forgot_password_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forgot_password_response.g.dart index 0712458a53..33e20e1291 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forgot_password_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/forgot_password_response.g.dart @@ -82,7 +82,8 @@ class ForgotPasswordResponseBuilder try { _$result = _$v ?? new _$ForgotPasswordResponse._( - codeDeliveryDetails: _codeDeliveryDetails?.build()); + codeDeliveryDetails: _codeDeliveryDetails?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_device_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_device_request.g.dart index 578bb563d4..cf728f0daa 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_device_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_device_request.g.dart @@ -89,9 +89,10 @@ class GetDeviceRequestBuilder _$GetDeviceRequest _build() { final _$result = _$v ?? new _$GetDeviceRequest._( - deviceKey: BuiltValueNullFieldError.checkNotNull( - deviceKey, r'GetDeviceRequest', 'deviceKey'), - accessToken: accessToken); + deviceKey: BuiltValueNullFieldError.checkNotNull( + deviceKey, r'GetDeviceRequest', 'deviceKey'), + accessToken: accessToken, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_device_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_device_response.g.dart index 6a1bc6d2a7..19469cc543 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_device_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_device_response.g.dart @@ -78,7 +78,10 @@ class GetDeviceResponseBuilder _$GetDeviceResponse _build() { _$GetDeviceResponse _$result; try { - _$result = _$v ?? new _$GetDeviceResponse._(device: device.build()); + _$result = _$v ?? + new _$GetDeviceResponse._( + device: device.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_attribute_verification_code_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_attribute_verification_code_request.g.dart index 538db9d004..184f8d1516 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_attribute_verification_code_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_attribute_verification_code_request.g.dart @@ -116,13 +116,12 @@ class GetUserAttributeVerificationCodeRequestBuilder try { _$result = _$v ?? new _$GetUserAttributeVerificationCodeRequest._( - accessToken: BuiltValueNullFieldError.checkNotNull(accessToken, - r'GetUserAttributeVerificationCodeRequest', 'accessToken'), - attributeName: BuiltValueNullFieldError.checkNotNull( - attributeName, - r'GetUserAttributeVerificationCodeRequest', - 'attributeName'), - clientMetadata: _clientMetadata?.build()); + accessToken: BuiltValueNullFieldError.checkNotNull(accessToken, + r'GetUserAttributeVerificationCodeRequest', 'accessToken'), + attributeName: BuiltValueNullFieldError.checkNotNull(attributeName, + r'GetUserAttributeVerificationCodeRequest', 'attributeName'), + clientMetadata: _clientMetadata?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_attribute_verification_code_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_attribute_verification_code_response.g.dart index eecb376a9d..466cb6b8ed 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_attribute_verification_code_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_attribute_verification_code_response.g.dart @@ -90,7 +90,8 @@ class GetUserAttributeVerificationCodeResponseBuilder try { _$result = _$v ?? new _$GetUserAttributeVerificationCodeResponse._( - codeDeliveryDetails: _codeDeliveryDetails?.build()); + codeDeliveryDetails: _codeDeliveryDetails?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_request.g.dart index ce22f708b0..8b4a2d2c5c 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_request.g.dart @@ -77,8 +77,9 @@ class GetUserRequestBuilder _$GetUserRequest _build() { final _$result = _$v ?? new _$GetUserRequest._( - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'GetUserRequest', 'accessToken')); + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'GetUserRequest', 'accessToken'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_response.g.dart index 7365e052f1..c8958749e1 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/get_user_response.g.dart @@ -131,12 +131,13 @@ class GetUserResponseBuilder try { _$result = _$v ?? new _$GetUserResponse._( - username: BuiltValueNullFieldError.checkNotNull( - username, r'GetUserResponse', 'username'), - userAttributes: userAttributes.build(), - mfaOptions: _mfaOptions?.build(), - preferredMfaSetting: preferredMfaSetting, - userMfaSettingList: _userMfaSettingList?.build()); + username: BuiltValueNullFieldError.checkNotNull( + username, r'GetUserResponse', 'username'), + userAttributes: userAttributes.build(), + mfaOptions: _mfaOptions?.build(), + preferredMfaSetting: preferredMfaSetting, + userMfaSettingList: _userMfaSettingList?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/global_sign_out_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/global_sign_out_request.g.dart index c3dd969ac2..5de84c566e 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/global_sign_out_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/global_sign_out_request.g.dart @@ -79,8 +79,9 @@ class GlobalSignOutRequestBuilder _$GlobalSignOutRequest _build() { final _$result = _$v ?? new _$GlobalSignOutRequest._( - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'GlobalSignOutRequest', 'accessToken')); + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'GlobalSignOutRequest', 'accessToken'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/initiate_auth_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/initiate_auth_request.g.dart index b82ea9f199..7bd8e6571e 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/initiate_auth_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/initiate_auth_request.g.dart @@ -144,14 +144,15 @@ class InitiateAuthRequestBuilder try { _$result = _$v ?? new _$InitiateAuthRequest._( - authFlow: BuiltValueNullFieldError.checkNotNull( - authFlow, r'InitiateAuthRequest', 'authFlow'), - authParameters: _authParameters?.build(), - clientMetadata: _clientMetadata?.build(), - clientId: BuiltValueNullFieldError.checkNotNull( - clientId, r'InitiateAuthRequest', 'clientId'), - analyticsMetadata: _analyticsMetadata?.build(), - userContextData: _userContextData?.build()); + authFlow: BuiltValueNullFieldError.checkNotNull( + authFlow, r'InitiateAuthRequest', 'authFlow'), + authParameters: _authParameters?.build(), + clientMetadata: _clientMetadata?.build(), + clientId: BuiltValueNullFieldError.checkNotNull( + clientId, r'InitiateAuthRequest', 'clientId'), + analyticsMetadata: _analyticsMetadata?.build(), + userContextData: _userContextData?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/initiate_auth_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/initiate_auth_response.g.dart index 233ba4a804..1ce1d84a6a 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/initiate_auth_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/initiate_auth_response.g.dart @@ -118,10 +118,11 @@ class InitiateAuthResponseBuilder try { _$result = _$v ?? new _$InitiateAuthResponse._( - challengeName: challengeName, - session: session, - challengeParameters: _challengeParameters?.build(), - authenticationResult: _authenticationResult?.build()); + challengeName: challengeName, + session: session, + challengeParameters: _challengeParameters?.build(), + authenticationResult: _authenticationResult?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/internal_error_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/internal_error_exception.g.dart index 286b7810d2..90dfcf61a4 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/internal_error_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/internal_error_exception.g.dart @@ -91,7 +91,10 @@ class InternalErrorExceptionBuilder _$InternalErrorException _build() { final _$result = _$v ?? new _$InternalErrorException._( - message: message, statusCode: statusCode, headers: headers); + message: message, + statusCode: statusCode, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_email_role_access_policy_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_email_role_access_policy_exception.g.dart index 8f5bd0de62..2793b49633 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_email_role_access_policy_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_email_role_access_policy_exception.g.dart @@ -92,7 +92,9 @@ class InvalidEmailRoleAccessPolicyExceptionBuilder _$InvalidEmailRoleAccessPolicyException _build() { final _$result = _$v ?? new _$InvalidEmailRoleAccessPolicyException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_lambda_response_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_lambda_response_exception.g.dart index f5e144c7ed..f87751b387 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_lambda_response_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_lambda_response_exception.g.dart @@ -85,7 +85,9 @@ class InvalidLambdaResponseExceptionBuilder _$InvalidLambdaResponseException _build() { final _$result = _$v ?? new _$InvalidLambdaResponseException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_parameter_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_parameter_exception.g.dart index 210aa914f2..db2586e8b4 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_parameter_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_parameter_exception.g.dart @@ -83,7 +83,10 @@ class InvalidParameterExceptionBuilder _$InvalidParameterException _build() { final _$result = _$v ?? - new _$InvalidParameterException._(message: message, headers: headers); + new _$InvalidParameterException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_password_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_password_exception.g.dart index 697fdbc2b8..04a72b0f96 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_password_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_password_exception.g.dart @@ -83,7 +83,10 @@ class InvalidPasswordExceptionBuilder _$InvalidPasswordException _build() { final _$result = _$v ?? - new _$InvalidPasswordException._(message: message, headers: headers); + new _$InvalidPasswordException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_sms_role_access_policy_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_sms_role_access_policy_exception.g.dart index 57f590676f..5fa5dde39b 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_sms_role_access_policy_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_sms_role_access_policy_exception.g.dart @@ -91,7 +91,9 @@ class InvalidSmsRoleAccessPolicyExceptionBuilder _$InvalidSmsRoleAccessPolicyException _build() { final _$result = _$v ?? new _$InvalidSmsRoleAccessPolicyException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_sms_role_trust_relationship_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_sms_role_trust_relationship_exception.g.dart index 32c47e69ab..bb65b805e5 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_sms_role_trust_relationship_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_sms_role_trust_relationship_exception.g.dart @@ -92,7 +92,9 @@ class InvalidSmsRoleTrustRelationshipExceptionBuilder _$InvalidSmsRoleTrustRelationshipException _build() { final _$result = _$v ?? new _$InvalidSmsRoleTrustRelationshipException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_user_pool_configuration_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_user_pool_configuration_exception.g.dart index ceb0c57c84..26c5511d8b 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_user_pool_configuration_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/invalid_user_pool_configuration_exception.g.dart @@ -92,7 +92,9 @@ class InvalidUserPoolConfigurationExceptionBuilder _$InvalidUserPoolConfigurationException _build() { final _$result = _$v ?? new _$InvalidUserPoolConfigurationException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/limit_exceeded_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/limit_exceeded_exception.g.dart index 862b352a99..afd0112ce7 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/limit_exceeded_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/limit_exceeded_exception.g.dart @@ -82,7 +82,10 @@ class LimitExceededExceptionBuilder _$LimitExceededException _build() { final _$result = _$v ?? - new _$LimitExceededException._(message: message, headers: headers); + new _$LimitExceededException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/list_devices_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/list_devices_request.g.dart index 705d0452dd..c6dddc5400 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/list_devices_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/list_devices_request.g.dart @@ -101,10 +101,11 @@ class ListDevicesRequestBuilder _$ListDevicesRequest _build() { final _$result = _$v ?? new _$ListDevicesRequest._( - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'ListDevicesRequest', 'accessToken'), - limit: limit, - paginationToken: paginationToken); + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'ListDevicesRequest', 'accessToken'), + limit: limit, + paginationToken: paginationToken, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/list_devices_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/list_devices_response.g.dart index f5d618e371..304d5292d1 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/list_devices_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/list_devices_response.g.dart @@ -91,7 +91,9 @@ class ListDevicesResponseBuilder try { _$result = _$v ?? new _$ListDevicesResponse._( - devices: _devices?.build(), paginationToken: paginationToken); + devices: _devices?.build(), + paginationToken: paginationToken, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/mfa_method_not_found_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/mfa_method_not_found_exception.g.dart index cd4fbd0b8d..a1f2837c1e 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/mfa_method_not_found_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/mfa_method_not_found_exception.g.dart @@ -83,7 +83,10 @@ class MfaMethodNotFoundExceptionBuilder _$MfaMethodNotFoundException _build() { final _$result = _$v ?? - new _$MfaMethodNotFoundException._(message: message, headers: headers); + new _$MfaMethodNotFoundException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/mfa_option_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/mfa_option_type.g.dart index 9f973881b9..b672235f82 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/mfa_option_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/mfa_option_type.g.dart @@ -85,7 +85,9 @@ class MfaOptionTypeBuilder _$MfaOptionType _build() { final _$result = _$v ?? new _$MfaOptionType._( - deliveryMedium: deliveryMedium, attributeName: attributeName); + deliveryMedium: deliveryMedium, + attributeName: attributeName, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/new_device_metadata_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/new_device_metadata_type.g.dart index 3843936896..4aeb99bde1 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/new_device_metadata_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/new_device_metadata_type.g.dart @@ -87,7 +87,9 @@ class NewDeviceMetadataTypeBuilder _$NewDeviceMetadataType _build() { final _$result = _$v ?? new _$NewDeviceMetadataType._( - deviceKey: deviceKey, deviceGroupKey: deviceGroupKey); + deviceKey: deviceKey, + deviceGroupKey: deviceGroupKey, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/not_authorized_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/not_authorized_exception.g.dart index 8e506ee78b..5aa5cfb60d 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/not_authorized_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/not_authorized_exception.g.dart @@ -82,7 +82,10 @@ class NotAuthorizedExceptionBuilder _$NotAuthorizedException _build() { final _$result = _$v ?? - new _$NotAuthorizedException._(message: message, headers: headers); + new _$NotAuthorizedException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/password_history_policy_violation_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/password_history_policy_violation_exception.g.dart index 14462c7c57..91b1e8ece9 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/password_history_policy_violation_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/password_history_policy_violation_exception.g.dart @@ -92,7 +92,9 @@ class PasswordHistoryPolicyViolationExceptionBuilder _$PasswordHistoryPolicyViolationException _build() { final _$result = _$v ?? new _$PasswordHistoryPolicyViolationException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/password_reset_required_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/password_reset_required_exception.g.dart index 1be46262f1..3562724f54 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/password_reset_required_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/password_reset_required_exception.g.dart @@ -85,7 +85,9 @@ class PasswordResetRequiredExceptionBuilder _$PasswordResetRequiredException _build() { final _$result = _$v ?? new _$PasswordResetRequiredException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resend_confirmation_code_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resend_confirmation_code_request.g.dart index 92856a9251..71e23db8ff 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resend_confirmation_code_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resend_confirmation_code_request.g.dart @@ -144,14 +144,15 @@ class ResendConfirmationCodeRequestBuilder try { _$result = _$v ?? new _$ResendConfirmationCodeRequest._( - clientId: BuiltValueNullFieldError.checkNotNull( - clientId, r'ResendConfirmationCodeRequest', 'clientId'), - secretHash: secretHash, - userContextData: _userContextData?.build(), - username: BuiltValueNullFieldError.checkNotNull( - username, r'ResendConfirmationCodeRequest', 'username'), - analyticsMetadata: _analyticsMetadata?.build(), - clientMetadata: _clientMetadata?.build()); + clientId: BuiltValueNullFieldError.checkNotNull( + clientId, r'ResendConfirmationCodeRequest', 'clientId'), + secretHash: secretHash, + userContextData: _userContextData?.build(), + username: BuiltValueNullFieldError.checkNotNull( + username, r'ResendConfirmationCodeRequest', 'username'), + analyticsMetadata: _analyticsMetadata?.build(), + clientMetadata: _clientMetadata?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resend_confirmation_code_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resend_confirmation_code_response.g.dart index b26ed97b0c..14a91502b9 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resend_confirmation_code_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resend_confirmation_code_response.g.dart @@ -84,7 +84,8 @@ class ResendConfirmationCodeResponseBuilder try { _$result = _$v ?? new _$ResendConfirmationCodeResponse._( - codeDeliveryDetails: _codeDeliveryDetails?.build()); + codeDeliveryDetails: _codeDeliveryDetails?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resource_not_found_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resource_not_found_exception.g.dart index 5e76a50207..464b20c64f 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resource_not_found_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/resource_not_found_exception.g.dart @@ -83,7 +83,10 @@ class ResourceNotFoundExceptionBuilder _$ResourceNotFoundException _build() { final _$result = _$v ?? - new _$ResourceNotFoundException._(message: message, headers: headers); + new _$ResourceNotFoundException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/respond_to_auth_challenge_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/respond_to_auth_challenge_request.g.dart index dc4d62405e..94f22a664a 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/respond_to_auth_challenge_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/respond_to_auth_challenge_request.g.dart @@ -157,17 +157,16 @@ class RespondToAuthChallengeRequestBuilder try { _$result = _$v ?? new _$RespondToAuthChallengeRequest._( - clientId: BuiltValueNullFieldError.checkNotNull( - clientId, r'RespondToAuthChallengeRequest', 'clientId'), - challengeName: BuiltValueNullFieldError.checkNotNull( - challengeName, - r'RespondToAuthChallengeRequest', - 'challengeName'), - session: session, - challengeResponses: _challengeResponses?.build(), - analyticsMetadata: _analyticsMetadata?.build(), - userContextData: _userContextData?.build(), - clientMetadata: _clientMetadata?.build()); + clientId: BuiltValueNullFieldError.checkNotNull( + clientId, r'RespondToAuthChallengeRequest', 'clientId'), + challengeName: BuiltValueNullFieldError.checkNotNull(challengeName, + r'RespondToAuthChallengeRequest', 'challengeName'), + session: session, + challengeResponses: _challengeResponses?.build(), + analyticsMetadata: _analyticsMetadata?.build(), + userContextData: _userContextData?.build(), + clientMetadata: _clientMetadata?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/respond_to_auth_challenge_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/respond_to_auth_challenge_response.g.dart index 7323a96f51..a3ceeb7cfe 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/respond_to_auth_challenge_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/respond_to_auth_challenge_response.g.dart @@ -120,10 +120,11 @@ class RespondToAuthChallengeResponseBuilder try { _$result = _$v ?? new _$RespondToAuthChallengeResponse._( - challengeName: challengeName, - session: session, - challengeParameters: _challengeParameters?.build(), - authenticationResult: _authenticationResult?.build()); + challengeName: challengeName, + session: session, + challengeParameters: _challengeParameters?.build(), + authenticationResult: _authenticationResult?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/revoke_token_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/revoke_token_request.g.dart index 0f9b96b138..7eaeff9237 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/revoke_token_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/revoke_token_request.g.dart @@ -102,11 +102,12 @@ class RevokeTokenRequestBuilder _$RevokeTokenRequest _build() { final _$result = _$v ?? new _$RevokeTokenRequest._( - token: BuiltValueNullFieldError.checkNotNull( - token, r'RevokeTokenRequest', 'token'), - clientId: BuiltValueNullFieldError.checkNotNull( - clientId, r'RevokeTokenRequest', 'clientId'), - clientSecret: clientSecret); + token: BuiltValueNullFieldError.checkNotNull( + token, r'RevokeTokenRequest', 'token'), + clientId: BuiltValueNullFieldError.checkNotNull( + clientId, r'RevokeTokenRequest', 'clientId'), + clientSecret: clientSecret, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/set_user_mfa_preference_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/set_user_mfa_preference_request.g.dart index fec5ce2c1e..ba29d4a4b5 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/set_user_mfa_preference_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/set_user_mfa_preference_request.g.dart @@ -124,11 +124,12 @@ class SetUserMfaPreferenceRequestBuilder try { _$result = _$v ?? new _$SetUserMfaPreferenceRequest._( - smsMfaSettings: _smsMfaSettings?.build(), - softwareTokenMfaSettings: _softwareTokenMfaSettings?.build(), - emailMfaSettings: _emailMfaSettings?.build(), - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'SetUserMfaPreferenceRequest', 'accessToken')); + smsMfaSettings: _smsMfaSettings?.build(), + softwareTokenMfaSettings: _softwareTokenMfaSettings?.build(), + emailMfaSettings: _emailMfaSettings?.build(), + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'SetUserMfaPreferenceRequest', 'accessToken'), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sign_up_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sign_up_request.g.dart index 5222ac1d3e..f7ce7220fa 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sign_up_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sign_up_request.g.dart @@ -175,18 +175,19 @@ class SignUpRequestBuilder try { _$result = _$v ?? new _$SignUpRequest._( - clientId: BuiltValueNullFieldError.checkNotNull( - clientId, r'SignUpRequest', 'clientId'), - secretHash: secretHash, - username: BuiltValueNullFieldError.checkNotNull( - username, r'SignUpRequest', 'username'), - password: BuiltValueNullFieldError.checkNotNull( - password, r'SignUpRequest', 'password'), - userAttributes: _userAttributes?.build(), - validationData: _validationData?.build(), - analyticsMetadata: _analyticsMetadata?.build(), - userContextData: _userContextData?.build(), - clientMetadata: _clientMetadata?.build()); + clientId: BuiltValueNullFieldError.checkNotNull( + clientId, r'SignUpRequest', 'clientId'), + secretHash: secretHash, + username: BuiltValueNullFieldError.checkNotNull( + username, r'SignUpRequest', 'username'), + password: BuiltValueNullFieldError.checkNotNull( + password, r'SignUpRequest', 'password'), + userAttributes: _userAttributes?.build(), + validationData: _validationData?.build(), + analyticsMetadata: _analyticsMetadata?.build(), + userContextData: _userContextData?.build(), + clientMetadata: _clientMetadata?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sign_up_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sign_up_response.g.dart index de214fc038..2ce1fd7e65 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sign_up_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sign_up_response.g.dart @@ -110,11 +110,12 @@ class SignUpResponseBuilder try { _$result = _$v ?? new _$SignUpResponse._( - userConfirmed: BuiltValueNullFieldError.checkNotNull( - userConfirmed, r'SignUpResponse', 'userConfirmed'), - codeDeliveryDetails: _codeDeliveryDetails?.build(), - userSub: BuiltValueNullFieldError.checkNotNull( - userSub, r'SignUpResponse', 'userSub')); + userConfirmed: BuiltValueNullFieldError.checkNotNull( + userConfirmed, r'SignUpResponse', 'userConfirmed'), + codeDeliveryDetails: _codeDeliveryDetails?.build(), + userSub: BuiltValueNullFieldError.checkNotNull( + userSub, r'SignUpResponse', 'userSub'), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sms_mfa_settings_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sms_mfa_settings_type.g.dart index 6a00225872..8db38f091f 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sms_mfa_settings_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/sms_mfa_settings_type.g.dart @@ -94,10 +94,11 @@ class SmsMfaSettingsTypeBuilder _$SmsMfaSettingsType _build() { final _$result = _$v ?? new _$SmsMfaSettingsType._( - enabled: BuiltValueNullFieldError.checkNotNull( - enabled, r'SmsMfaSettingsType', 'enabled'), - preferredMfa: BuiltValueNullFieldError.checkNotNull( - preferredMfa, r'SmsMfaSettingsType', 'preferredMfa')); + enabled: BuiltValueNullFieldError.checkNotNull( + enabled, r'SmsMfaSettingsType', 'enabled'), + preferredMfa: BuiltValueNullFieldError.checkNotNull( + preferredMfa, r'SmsMfaSettingsType', 'preferredMfa'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/software_token_mfa_not_found_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/software_token_mfa_not_found_exception.g.dart index 12d166b25b..40ed789227 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/software_token_mfa_not_found_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/software_token_mfa_not_found_exception.g.dart @@ -90,7 +90,9 @@ class SoftwareTokenMfaNotFoundExceptionBuilder _$SoftwareTokenMfaNotFoundException _build() { final _$result = _$v ?? new _$SoftwareTokenMfaNotFoundException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/software_token_mfa_settings_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/software_token_mfa_settings_type.g.dart index fdb2fa8bdd..20c7080da1 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/software_token_mfa_settings_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/software_token_mfa_settings_type.g.dart @@ -97,10 +97,11 @@ class SoftwareTokenMfaSettingsTypeBuilder _$SoftwareTokenMfaSettingsType _build() { final _$result = _$v ?? new _$SoftwareTokenMfaSettingsType._( - enabled: BuiltValueNullFieldError.checkNotNull( - enabled, r'SoftwareTokenMfaSettingsType', 'enabled'), - preferredMfa: BuiltValueNullFieldError.checkNotNull( - preferredMfa, r'SoftwareTokenMfaSettingsType', 'preferredMfa')); + enabled: BuiltValueNullFieldError.checkNotNull( + enabled, r'SoftwareTokenMfaSettingsType', 'enabled'), + preferredMfa: BuiltValueNullFieldError.checkNotNull( + preferredMfa, r'SoftwareTokenMfaSettingsType', 'preferredMfa'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/too_many_failed_attempts_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/too_many_failed_attempts_exception.g.dart index 0da9d8ef36..84f1f264a4 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/too_many_failed_attempts_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/too_many_failed_attempts_exception.g.dart @@ -85,7 +85,9 @@ class TooManyFailedAttemptsExceptionBuilder _$TooManyFailedAttemptsException _build() { final _$result = _$v ?? new _$TooManyFailedAttemptsException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/too_many_requests_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/too_many_requests_exception.g.dart index b6f2e89d8e..b292bcbca4 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/too_many_requests_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/too_many_requests_exception.g.dart @@ -83,7 +83,10 @@ class TooManyRequestsExceptionBuilder _$TooManyRequestsException _build() { final _$result = _$v ?? - new _$TooManyRequestsException._(message: message, headers: headers); + new _$TooManyRequestsException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unauthorized_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unauthorized_exception.g.dart index 0d1cee5ec0..c8c92dc5f8 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unauthorized_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unauthorized_exception.g.dart @@ -82,7 +82,10 @@ class UnauthorizedExceptionBuilder _$UnauthorizedException _build() { final _$result = _$v ?? - new _$UnauthorizedException._(message: message, headers: headers); + new _$UnauthorizedException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unexpected_lambda_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unexpected_lambda_exception.g.dart index 65aa053b97..c13bf21dea 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unexpected_lambda_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unexpected_lambda_exception.g.dart @@ -83,7 +83,10 @@ class UnexpectedLambdaExceptionBuilder _$UnexpectedLambdaException _build() { final _$result = _$v ?? - new _$UnexpectedLambdaException._(message: message, headers: headers); + new _$UnexpectedLambdaException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unsupported_operation_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unsupported_operation_exception.g.dart index 28638ea813..8156207597 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unsupported_operation_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unsupported_operation_exception.g.dart @@ -85,7 +85,9 @@ class UnsupportedOperationExceptionBuilder _$UnsupportedOperationException _build() { final _$result = _$v ?? new _$UnsupportedOperationException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unsupported_token_type_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unsupported_token_type_exception.g.dart index 59e8b91f10..603de3265f 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unsupported_token_type_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/unsupported_token_type_exception.g.dart @@ -85,7 +85,9 @@ class UnsupportedTokenTypeExceptionBuilder _$UnsupportedTokenTypeException _build() { final _$result = _$v ?? new _$UnsupportedTokenTypeException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_device_status_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_device_status_request.g.dart index db7854a2c9..1570e54a80 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_device_status_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_device_status_request.g.dart @@ -108,11 +108,12 @@ class UpdateDeviceStatusRequestBuilder _$UpdateDeviceStatusRequest _build() { final _$result = _$v ?? new _$UpdateDeviceStatusRequest._( - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'UpdateDeviceStatusRequest', 'accessToken'), - deviceKey: BuiltValueNullFieldError.checkNotNull( - deviceKey, r'UpdateDeviceStatusRequest', 'deviceKey'), - deviceRememberedStatus: deviceRememberedStatus); + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'UpdateDeviceStatusRequest', 'accessToken'), + deviceKey: BuiltValueNullFieldError.checkNotNull( + deviceKey, r'UpdateDeviceStatusRequest', 'deviceKey'), + deviceRememberedStatus: deviceRememberedStatus, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_user_attributes_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_user_attributes_request.g.dart index 31bed71277..8d7ba2976d 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_user_attributes_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_user_attributes_request.g.dart @@ -112,10 +112,11 @@ class UpdateUserAttributesRequestBuilder try { _$result = _$v ?? new _$UpdateUserAttributesRequest._( - userAttributes: userAttributes.build(), - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'UpdateUserAttributesRequest', 'accessToken'), - clientMetadata: _clientMetadata?.build()); + userAttributes: userAttributes.build(), + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'UpdateUserAttributesRequest', 'accessToken'), + clientMetadata: _clientMetadata?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_user_attributes_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_user_attributes_response.g.dart index 7dec13b393..9cbc40002f 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_user_attributes_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/update_user_attributes_response.g.dart @@ -85,7 +85,8 @@ class UpdateUserAttributesResponseBuilder try { _$result = _$v ?? new _$UpdateUserAttributesResponse._( - codeDeliveryDetailsList: _codeDeliveryDetailsList?.build()); + codeDeliveryDetailsList: _codeDeliveryDetailsList?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_context_data_type.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_context_data_type.g.dart index 79eb2c5031..6cde32416c 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_context_data_type.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_context_data_type.g.dart @@ -86,7 +86,9 @@ class UserContextDataTypeBuilder _$UserContextDataType _build() { final _$result = _$v ?? new _$UserContextDataType._( - ipAddress: ipAddress, encodedData: encodedData); + ipAddress: ipAddress, + encodedData: encodedData, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_lambda_validation_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_lambda_validation_exception.g.dart index 4f9f974c15..021a7e34b0 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_lambda_validation_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_lambda_validation_exception.g.dart @@ -85,7 +85,9 @@ class UserLambdaValidationExceptionBuilder _$UserLambdaValidationException _build() { final _$result = _$v ?? new _$UserLambdaValidationException._( - message: message, headers: headers); + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_not_confirmed_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_not_confirmed_exception.g.dart index 724892538c..83f7b29c5d 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_not_confirmed_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_not_confirmed_exception.g.dart @@ -83,7 +83,10 @@ class UserNotConfirmedExceptionBuilder _$UserNotConfirmedException _build() { final _$result = _$v ?? - new _$UserNotConfirmedException._(message: message, headers: headers); + new _$UserNotConfirmedException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_not_found_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_not_found_exception.g.dart index 0a612417cb..660fbf1b5b 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_not_found_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/user_not_found_exception.g.dart @@ -82,7 +82,10 @@ class UserNotFoundExceptionBuilder _$UserNotFoundException _build() { final _$result = _$v ?? - new _$UserNotFoundException._(message: message, headers: headers); + new _$UserNotFoundException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/username_exists_exception.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/username_exists_exception.g.dart index 426d48b5cf..735225bbd7 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/username_exists_exception.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/username_exists_exception.g.dart @@ -83,7 +83,10 @@ class UsernameExistsExceptionBuilder _$UsernameExistsException _build() { final _$result = _$v ?? - new _$UsernameExistsException._(message: message, headers: headers); + new _$UsernameExistsException._( + message: message, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_software_token_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_software_token_request.g.dart index 08a1055323..6c60bf99c3 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_software_token_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_software_token_request.g.dart @@ -114,11 +114,12 @@ class VerifySoftwareTokenRequestBuilder _$VerifySoftwareTokenRequest _build() { final _$result = _$v ?? new _$VerifySoftwareTokenRequest._( - accessToken: accessToken, - session: session, - userCode: BuiltValueNullFieldError.checkNotNull( - userCode, r'VerifySoftwareTokenRequest', 'userCode'), - friendlyDeviceName: friendlyDeviceName); + accessToken: accessToken, + session: session, + userCode: BuiltValueNullFieldError.checkNotNull( + userCode, r'VerifySoftwareTokenRequest', 'userCode'), + friendlyDeviceName: friendlyDeviceName, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_software_token_response.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_software_token_response.g.dart index f2f309d83f..120a4f06cf 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_software_token_response.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_software_token_response.g.dart @@ -88,7 +88,10 @@ class VerifySoftwareTokenResponseBuilder _$VerifySoftwareTokenResponse _build() { final _$result = _$v ?? - new _$VerifySoftwareTokenResponse._(status: status, session: session); + new _$VerifySoftwareTokenResponse._( + status: status, + session: session, + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_user_attribute_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_user_attribute_request.g.dart index a64f8c49e4..cb6a2db6bb 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_user_attribute_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/src/cognito_identity_provider/model/verify_user_attribute_request.g.dart @@ -108,12 +108,13 @@ class VerifyUserAttributeRequestBuilder _$VerifyUserAttributeRequest _build() { final _$result = _$v ?? new _$VerifyUserAttributeRequest._( - accessToken: BuiltValueNullFieldError.checkNotNull( - accessToken, r'VerifyUserAttributeRequest', 'accessToken'), - attributeName: BuiltValueNullFieldError.checkNotNull( - attributeName, r'VerifyUserAttributeRequest', 'attributeName'), - code: BuiltValueNullFieldError.checkNotNull( - code, r'VerifyUserAttributeRequest', 'code')); + accessToken: BuiltValueNullFieldError.checkNotNull( + accessToken, r'VerifyUserAttributeRequest', 'accessToken'), + attributeName: BuiltValueNullFieldError.checkNotNull( + attributeName, r'VerifyUserAttributeRequest', 'attributeName'), + code: BuiltValueNullFieldError.checkNotNull( + code, r'VerifyUserAttributeRequest', 'code'), + ); replace(_$result); return _$result; } diff --git a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml b/packages/auth/amplify_auth_cognito_dart/pubspec.yaml index 50b9f6e3e7..bbf7c9f5b3 100644 --- a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito_dart/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/next/packages/au issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_analytics_pinpoint_dart: ">=0.4.7 <0.5.0" @@ -44,7 +44,7 @@ dev_dependencies: build_runner: ^2.4.9 build_verify: ^3.0.0 build_web_compilers: ^4.0.0 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 ffigen: ^9.0.0 json_serializable: 6.8.0 mockito: ^5.0.0 diff --git a/packages/auth/amplify_auth_cognito_test/pubspec.yaml b/packages/auth/amplify_auth_cognito_test/pubspec.yaml index 39d313e991..7c55a3a1c6 100644 --- a/packages/auth/amplify_auth_cognito_test/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito_test/pubspec.yaml @@ -3,7 +3,7 @@ description: Tests for the amplify_auth_cognito_dart package. publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_analytics_pinpoint_dart: any diff --git a/packages/authenticator/amplify_authenticator/example/android/app/build.gradle b/packages/authenticator/amplify_authenticator/example/android/app/build.gradle index b75df7f041..f4a3e75b74 100644 --- a/packages/authenticator/amplify_authenticator/example/android/app/build.gradle +++ b/packages/authenticator/amplify_authenticator/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace 'com.amazonaws.amplify.amplify_authenticator_example' compileSdk flutter.compileSdkVersion @@ -65,6 +62,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/packages/authenticator/amplify_authenticator/example/android/build.gradle b/packages/authenticator/amplify_authenticator/example/android/build.gradle index 070b4ffbfd..bc157bd1a1 100644 --- a/packages/authenticator/amplify_authenticator/example/android/build.gradle +++ b/packages/authenticator/amplify_authenticator/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/packages/authenticator/amplify_authenticator/example/android/settings.gradle b/packages/authenticator/amplify_authenticator/example/android/settings.gradle index 44e62bcf06..276cdabf9c 100644 --- a/packages/authenticator/amplify_authenticator/example/android/settings.gradle +++ b/packages/authenticator/amplify_authenticator/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.10" apply false +} + +include ":app" diff --git a/packages/authenticator/amplify_authenticator/example/pubspec.yaml b/packages/authenticator/amplify_authenticator/example/pubspec.yaml index 07e4c3db45..5dc44f3e2e 100644 --- a/packages/authenticator/amplify_authenticator/example/pubspec.yaml +++ b/packages/authenticator/amplify_authenticator/example/pubspec.yaml @@ -18,8 +18,8 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_auth_cognito: ">=1.0.0-next.8 <1.0.0-next.9" diff --git a/packages/authenticator/amplify_authenticator/pubspec.yaml b/packages/authenticator/amplify_authenticator/pubspec.yaml index 0889b90cb9..9f97f102a1 100644 --- a/packages/authenticator/amplify_authenticator/pubspec.yaml +++ b/packages/authenticator/amplify_authenticator/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/au issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_auth_cognito: ">=2.6.0 <2.7.0" diff --git a/packages/authenticator/amplify_authenticator_test/example/pubspec.yaml b/packages/authenticator/amplify_authenticator_test/example/pubspec.yaml index 39d1b058f5..7221ad617e 100644 --- a/packages/authenticator/amplify_authenticator_test/example/pubspec.yaml +++ b/packages/authenticator/amplify_authenticator_test/example/pubspec.yaml @@ -4,8 +4,8 @@ publish_to: "none" version: 0.1.0 environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_authenticator: any diff --git a/packages/authenticator/amplify_authenticator_test/pubspec.yaml b/packages/authenticator/amplify_authenticator_test/pubspec.yaml index cdc8d6c250..2d70087c99 100644 --- a/packages/authenticator/amplify_authenticator_test/pubspec.yaml +++ b/packages/authenticator/amplify_authenticator_test/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_authenticator: any diff --git a/packages/aws_common/lib/src/io/aws_file_platform_html.dart b/packages/aws_common/lib/src/io/aws_file_platform_html.dart index 11ecb408f9..af0bbc22f9 100644 --- a/packages/aws_common/lib/src/io/aws_file_platform_html.dart +++ b/packages/aws_common/lib/src/io/aws_file_platform_html.dart @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import 'dart:async'; +//ignore: deprecated_member_use import 'dart:html'; import 'package:async/async.dart'; diff --git a/packages/aws_common/lib/src/js/abort.dart b/packages/aws_common/lib/src/js/abort.dart index 98420752fa..9e45abeb7c 100644 --- a/packages/aws_common/lib/src/js/abort.dart +++ b/packages/aws_common/lib/src/js/abort.dart @@ -2,8 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // ignore_for_file: avoid_classes_with_only_static_members - +//ignore: deprecated_member_use import 'package:js/js.dart'; +//ignore: deprecated_member_use import 'package:js/js_util.dart' as js_util; /// {@template aws_http.js.abort_signal} diff --git a/packages/aws_common/lib/src/js/common.dart b/packages/aws_common/lib/src/js/common.dart index aeeb53d517..0a895cf776 100644 --- a/packages/aws_common/lib/src/js/common.dart +++ b/packages/aws_common/lib/src/js/common.dart @@ -4,9 +4,11 @@ // ignore_for_file: avoid_classes_with_only_static_members, prefer_void_to_null import 'dart:async'; +//ignore: deprecated_member_use import 'dart:js_util' as js_util; import 'package:aws_common/src/util/recase.dart'; +//ignore: deprecated_member_use import 'package:js/js.dart'; /// The JS `undefined`. diff --git a/packages/aws_common/lib/src/js/fetch.dart b/packages/aws_common/lib/src/js/fetch.dart index 352694b8b3..c9cd1e1530 100644 --- a/packages/aws_common/lib/src/js/fetch.dart +++ b/packages/aws_common/lib/src/js/fetch.dart @@ -6,7 +6,9 @@ import 'package:aws_common/src/js/abort.dart'; import 'package:aws_common/src/js/common.dart'; import 'package:aws_common/src/js/promise.dart'; import 'package:aws_common/src/js/readable_stream.dart'; +//ignore: deprecated_member_use import 'package:js/js.dart'; +//ignore: deprecated_member_use import 'package:js/js_util.dart' as js_util; /// How a [Request] will interact with the browser's HTTP cache. diff --git a/packages/aws_common/lib/src/js/indexed_db.dart b/packages/aws_common/lib/src/js/indexed_db.dart index 638ff4a77c..3f190b468e 100644 --- a/packages/aws_common/lib/src/js/indexed_db.dart +++ b/packages/aws_common/lib/src/js/indexed_db.dart @@ -2,9 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 import 'dart:async'; +//ignore: deprecated_member_use import 'dart:js_util' as js_util; import 'package:aws_common/src/js/common.dart'; +//ignore: deprecated_member_use import 'package:js/js.dart'; /// The global read-only [IDBFactory] instance. diff --git a/packages/aws_common/lib/src/js/promise.dart b/packages/aws_common/lib/src/js/promise.dart index 0bf3f328fd..9f71615d4b 100644 --- a/packages/aws_common/lib/src/js/promise.dart +++ b/packages/aws_common/lib/src/js/promise.dart @@ -3,7 +3,9 @@ import 'dart:async'; +//ignore: deprecated_member_use import 'package:js/js.dart'; +//ignore: deprecated_member_use import 'package:js/js_util.dart' as js_util; /// A [Promise] executor callback. diff --git a/packages/aws_common/lib/src/js/readable_stream.dart b/packages/aws_common/lib/src/js/readable_stream.dart index dc9241b65e..20f9943e88 100644 --- a/packages/aws_common/lib/src/js/readable_stream.dart +++ b/packages/aws_common/lib/src/js/readable_stream.dart @@ -7,7 +7,9 @@ import 'dart:typed_data'; import 'package:async/async.dart'; import 'package:aws_common/src/js/common.dart'; import 'package:aws_common/src/js/promise.dart'; +//ignore: deprecated_member_use import 'package:js/js.dart'; +//ignore: deprecated_member_use import 'package:js/js_util.dart' as js_util; /// {@template aws_common.js.readable_stream} diff --git a/packages/aws_common/lib/src/util/get_base_element_href_from_dom.dart b/packages/aws_common/lib/src/util/get_base_element_href_from_dom.dart index 587ef6abae..9b754526f0 100644 --- a/packages/aws_common/lib/src/util/get_base_element_href_from_dom.dart +++ b/packages/aws_common/lib/src/util/get_base_element_href_from_dom.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; /// Returns the href attribute of the base element if it is present. diff --git a/packages/aws_common/pubspec.yaml b/packages/aws_common/pubspec.yaml index 1717b5a964..697a8caa84 100644 --- a/packages/aws_common/pubspec.yaml +++ b/packages/aws_common/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/aw issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: async: ^2.10.0 @@ -29,7 +29,7 @@ dev_dependencies: build_runner: ^2.4.9 build_test: ^2.1.5 build_web_compilers: ^4.0.0 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 json_serializable: 6.8.0 stream_channel: ^2.1.0 test: ^1.22.1 diff --git a/packages/aws_common/test/io/aws_file_html_test.dart b/packages/aws_common/test/io/aws_file_html_test.dart index 6b146dc3c4..ffdeec7ed7 100644 --- a/packages/aws_common/test/io/aws_file_html_test.dart +++ b/packages/aws_common/test/io/aws_file_html_test.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'dart:convert'; +//ignore: deprecated_member_use import 'dart:html' as html; import 'dart:typed_data'; diff --git a/packages/aws_signature_v4/example/pubspec.yaml b/packages/aws_signature_v4/example/pubspec.yaml index 4c42b59dab..fbf65a5171 100644 --- a/packages/aws_signature_v4/example/pubspec.yaml +++ b/packages/aws_signature_v4/example/pubspec.yaml @@ -2,7 +2,7 @@ name: example publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: args: ^2.3.0 diff --git a/packages/aws_signature_v4/example/web/main.dart b/packages/aws_signature_v4/example/web/main.dart index a28969341c..c849a8dd6f 100644 --- a/packages/aws_signature_v4/example/web/main.dart +++ b/packages/aws_signature_v4/example/web/main.dart @@ -4,6 +4,7 @@ // ignore_for_file: omit_local_variable_types import 'dart:async'; +//ignore: deprecated_member_use import 'dart:html'; import 'dart:typed_data'; diff --git a/packages/aws_signature_v4/pubspec.yaml b/packages/aws_signature_v4/pubspec.yaml index 47eaca6968..ad5058a377 100644 --- a/packages/aws_signature_v4/pubspec.yaml +++ b/packages/aws_signature_v4/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/aw issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: async: ^2.10.0 diff --git a/packages/common/amplify_db_common/example/android/app/build.gradle b/packages/common/amplify_db_common/example/android/app/build.gradle index 3e89651cc2..ec1f37b255 100644 --- a/packages/common/amplify_db_common/example/android/app/build.gradle +++ b/packages/common/amplify_db_common/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace 'com.amazonaws.amplify.amplify_db_common_example' compileSdk flutter.compileSdkVersion @@ -67,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/packages/common/amplify_db_common/example/android/build.gradle b/packages/common/amplify_db_common/example/android/build.gradle index 24d8637a29..bc157bd1a1 100644 --- a/packages/common/amplify_db_common/example/android/build.gradle +++ b/packages/common/amplify_db_common/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() @@ -26,6 +13,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/common/amplify_db_common/example/android/settings.gradle b/packages/common/amplify_db_common/example/android/settings.gradle index 44e62bcf06..276cdabf9c 100644 --- a/packages/common/amplify_db_common/example/android/settings.gradle +++ b/packages/common/amplify_db_common/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.10" apply false +} + +include ":app" diff --git a/packages/common/amplify_db_common/example/lib/db.g.dart b/packages/common/amplify_db_common/example/lib/db.g.dart index ec5b9a35d1..8e89323eef 100644 --- a/packages/common/amplify_db_common/example/lib/db.g.dart +++ b/packages/common/amplify_db_common/example/lib/db.g.dart @@ -106,6 +106,13 @@ class CountTableData extends DataClass implements Insertable { id: id ?? this.id, count: count ?? this.count, ); + CountTableData copyWithCompanion(CountTableCompanion data) { + return CountTableData( + id: data.id.present ? data.id.value : this.id, + count: data.count.present ? data.count.value : this.count, + ); + } + @override String toString() { return (StringBuffer('CountTableData(') @@ -177,6 +184,7 @@ class CountTableCompanion extends UpdateCompanion { abstract class _$AppDb extends GeneratedDatabase { _$AppDb(QueryExecutor e) : super(e); + $AppDbManager get managers => $AppDbManager(this); late final $CountTableTable countTable = $CountTableTable(this); @override Iterable> get allTables => @@ -184,3 +192,125 @@ abstract class _$AppDb extends GeneratedDatabase { @override List get allSchemaEntities => [countTable]; } + +typedef $$CountTableTableCreateCompanionBuilder = CountTableCompanion Function({ + Value id, + required int count, +}); +typedef $$CountTableTableUpdateCompanionBuilder = CountTableCompanion Function({ + Value id, + Value count, +}); + +class $$CountTableTableFilterComposer + extends Composer<_$AppDb, $CountTableTable> { + $$CountTableTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnFilters get count => $composableBuilder( + column: $table.count, builder: (column) => ColumnFilters(column)); +} + +class $$CountTableTableOrderingComposer + extends Composer<_$AppDb, $CountTableTable> { + $$CountTableTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get count => $composableBuilder( + column: $table.count, builder: (column) => ColumnOrderings(column)); +} + +class $$CountTableTableAnnotationComposer + extends Composer<_$AppDb, $CountTableTable> { + $$CountTableTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get count => + $composableBuilder(column: $table.count, builder: (column) => column); +} + +class $$CountTableTableTableManager extends RootTableManager< + _$AppDb, + $CountTableTable, + CountTableData, + $$CountTableTableFilterComposer, + $$CountTableTableOrderingComposer, + $$CountTableTableAnnotationComposer, + $$CountTableTableCreateCompanionBuilder, + $$CountTableTableUpdateCompanionBuilder, + (CountTableData, BaseReferences<_$AppDb, $CountTableTable, CountTableData>), + CountTableData, + PrefetchHooks Function()> { + $$CountTableTableTableManager(_$AppDb db, $CountTableTable table) + : super(TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$CountTableTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$CountTableTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$CountTableTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ + Value id = const Value.absent(), + Value count = const Value.absent(), + }) => + CountTableCompanion( + id: id, + count: count, + ), + createCompanionCallback: ({ + Value id = const Value.absent(), + required int count, + }) => + CountTableCompanion.insert( + id: id, + count: count, + ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, + )); +} + +typedef $$CountTableTableProcessedTableManager = ProcessedTableManager< + _$AppDb, + $CountTableTable, + CountTableData, + $$CountTableTableFilterComposer, + $$CountTableTableOrderingComposer, + $$CountTableTableAnnotationComposer, + $$CountTableTableCreateCompanionBuilder, + $$CountTableTableUpdateCompanionBuilder, + (CountTableData, BaseReferences<_$AppDb, $CountTableTable, CountTableData>), + CountTableData, + PrefetchHooks Function()>; + +class $AppDbManager { + final _$AppDb _db; + $AppDbManager(this._db); + $$CountTableTableTableManager get countTable => + $$CountTableTableTableManager(_db, _db.countTable); +} diff --git a/packages/common/amplify_db_common/example/pubspec.yaml b/packages/common/amplify_db_common/example/pubspec.yaml index a5b6ab272c..5b08595e23 100644 --- a/packages/common/amplify_db_common/example/pubspec.yaml +++ b/packages/common/amplify_db_common/example/pubspec.yaml @@ -3,12 +3,12 @@ description: Demonstrates how to use the amplify_db_common plugin. publish_to: "none" environment: - flutter: ">=3.19.0" - sdk: ^3.3.0 + flutter: ">=3.27.0" + sdk: ^3.6.0 dependencies: amplify_db_common: ">=0.4.5 <0.5.0" - drift: ">=2.18.0 <2.19.0" + drift: ^2.25.0 flutter: sdk: flutter # Included to validate windows app will build when there is a downstream @@ -19,7 +19,7 @@ dependencies: dev_dependencies: amplify_lints: ^2.0.0 - drift_dev: ">=2.18.0 <2.19.0" + drift_dev: ^2.25.1 build_runner: ^2.4.9 flutter_test: sdk: flutter diff --git a/packages/common/amplify_db_common/pubspec.yaml b/packages/common/amplify_db_common/pubspec.yaml index 645adcd66e..a07cd90842 100644 --- a/packages/common/amplify_db_common/pubspec.yaml +++ b/packages/common/amplify_db_common/pubspec.yaml @@ -6,12 +6,12 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/co issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_db_common_dart: ">=0.4.8 <0.5.0" - drift: ">=2.18.0 <2.19.0" + drift: ^2.25.0 flutter: sdk: flutter path: ">=1.8.0 <2.0.0" diff --git a/packages/common/amplify_db_common_dart/example/bin/database.g.dart b/packages/common/amplify_db_common_dart/example/bin/database.g.dart index 3f9bc53dbb..42fcfa9428 100644 --- a/packages/common/amplify_db_common_dart/example/bin/database.g.dart +++ b/packages/common/amplify_db_common_dart/example/bin/database.g.dart @@ -159,6 +159,15 @@ class Todo extends DataClass implements Insertable { content: content ?? this.content, category: category.present ? category.value : this.category, ); + Todo copyWithCompanion(TodosCompanion data) { + return Todo( + id: data.id.present ? data.id.value : this.id, + title: data.title.present ? data.title.value : this.title, + content: data.content.present ? data.content.value : this.content, + category: data.category.present ? data.category.value : this.category, + ); + } + @override String toString() { return (StringBuffer('Todo(') @@ -363,6 +372,14 @@ class Category extends DataClass implements Insertable { id: id ?? this.id, description: description ?? this.description, ); + Category copyWithCompanion(CategoriesCompanion data) { + return Category( + id: data.id.present ? data.id.value : this.id, + description: + data.description.present ? data.description.value : this.description, + ); + } + @override String toString() { return (StringBuffer('Category(') @@ -434,6 +451,7 @@ class CategoriesCompanion extends UpdateCompanion { abstract class _$MyDatabase extends GeneratedDatabase { _$MyDatabase(QueryExecutor e) : super(e); + $MyDatabaseManager get managers => $MyDatabaseManager(this); late final $TodosTable todos = $TodosTable(this); late final $CategoriesTable categories = $CategoriesTable(this); @override @@ -442,3 +460,269 @@ abstract class _$MyDatabase extends GeneratedDatabase { @override List get allSchemaEntities => [todos, categories]; } + +typedef $$TodosTableCreateCompanionBuilder = TodosCompanion Function({ + Value id, + required String title, + required String content, + Value category, +}); +typedef $$TodosTableUpdateCompanionBuilder = TodosCompanion Function({ + Value id, + Value title, + Value content, + Value category, +}); + +class $$TodosTableFilterComposer extends Composer<_$MyDatabase, $TodosTable> { + $$TodosTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnFilters get title => $composableBuilder( + column: $table.title, builder: (column) => ColumnFilters(column)); + + ColumnFilters get content => $composableBuilder( + column: $table.content, builder: (column) => ColumnFilters(column)); + + ColumnFilters get category => $composableBuilder( + column: $table.category, builder: (column) => ColumnFilters(column)); +} + +class $$TodosTableOrderingComposer extends Composer<_$MyDatabase, $TodosTable> { + $$TodosTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get title => $composableBuilder( + column: $table.title, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get content => $composableBuilder( + column: $table.content, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get category => $composableBuilder( + column: $table.category, builder: (column) => ColumnOrderings(column)); +} + +class $$TodosTableAnnotationComposer + extends Composer<_$MyDatabase, $TodosTable> { + $$TodosTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get title => + $composableBuilder(column: $table.title, builder: (column) => column); + + GeneratedColumn get content => + $composableBuilder(column: $table.content, builder: (column) => column); + + GeneratedColumn get category => + $composableBuilder(column: $table.category, builder: (column) => column); +} + +class $$TodosTableTableManager extends RootTableManager< + _$MyDatabase, + $TodosTable, + Todo, + $$TodosTableFilterComposer, + $$TodosTableOrderingComposer, + $$TodosTableAnnotationComposer, + $$TodosTableCreateCompanionBuilder, + $$TodosTableUpdateCompanionBuilder, + (Todo, BaseReferences<_$MyDatabase, $TodosTable, Todo>), + Todo, + PrefetchHooks Function()> { + $$TodosTableTableManager(_$MyDatabase db, $TodosTable table) + : super(TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$TodosTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$TodosTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$TodosTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ + Value id = const Value.absent(), + Value title = const Value.absent(), + Value content = const Value.absent(), + Value category = const Value.absent(), + }) => + TodosCompanion( + id: id, + title: title, + content: content, + category: category, + ), + createCompanionCallback: ({ + Value id = const Value.absent(), + required String title, + required String content, + Value category = const Value.absent(), + }) => + TodosCompanion.insert( + id: id, + title: title, + content: content, + category: category, + ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, + )); +} + +typedef $$TodosTableProcessedTableManager = ProcessedTableManager< + _$MyDatabase, + $TodosTable, + Todo, + $$TodosTableFilterComposer, + $$TodosTableOrderingComposer, + $$TodosTableAnnotationComposer, + $$TodosTableCreateCompanionBuilder, + $$TodosTableUpdateCompanionBuilder, + (Todo, BaseReferences<_$MyDatabase, $TodosTable, Todo>), + Todo, + PrefetchHooks Function()>; +typedef $$CategoriesTableCreateCompanionBuilder = CategoriesCompanion Function({ + Value id, + required String description, +}); +typedef $$CategoriesTableUpdateCompanionBuilder = CategoriesCompanion Function({ + Value id, + Value description, +}); + +class $$CategoriesTableFilterComposer + extends Composer<_$MyDatabase, $CategoriesTable> { + $$CategoriesTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnFilters get description => $composableBuilder( + column: $table.description, builder: (column) => ColumnFilters(column)); +} + +class $$CategoriesTableOrderingComposer + extends Composer<_$MyDatabase, $CategoriesTable> { + $$CategoriesTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get description => $composableBuilder( + column: $table.description, builder: (column) => ColumnOrderings(column)); +} + +class $$CategoriesTableAnnotationComposer + extends Composer<_$MyDatabase, $CategoriesTable> { + $$CategoriesTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get description => $composableBuilder( + column: $table.description, builder: (column) => column); +} + +class $$CategoriesTableTableManager extends RootTableManager< + _$MyDatabase, + $CategoriesTable, + Category, + $$CategoriesTableFilterComposer, + $$CategoriesTableOrderingComposer, + $$CategoriesTableAnnotationComposer, + $$CategoriesTableCreateCompanionBuilder, + $$CategoriesTableUpdateCompanionBuilder, + (Category, BaseReferences<_$MyDatabase, $CategoriesTable, Category>), + Category, + PrefetchHooks Function()> { + $$CategoriesTableTableManager(_$MyDatabase db, $CategoriesTable table) + : super(TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$CategoriesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$CategoriesTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$CategoriesTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ + Value id = const Value.absent(), + Value description = const Value.absent(), + }) => + CategoriesCompanion( + id: id, + description: description, + ), + createCompanionCallback: ({ + Value id = const Value.absent(), + required String description, + }) => + CategoriesCompanion.insert( + id: id, + description: description, + ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, + )); +} + +typedef $$CategoriesTableProcessedTableManager = ProcessedTableManager< + _$MyDatabase, + $CategoriesTable, + Category, + $$CategoriesTableFilterComposer, + $$CategoriesTableOrderingComposer, + $$CategoriesTableAnnotationComposer, + $$CategoriesTableCreateCompanionBuilder, + $$CategoriesTableUpdateCompanionBuilder, + (Category, BaseReferences<_$MyDatabase, $CategoriesTable, Category>), + Category, + PrefetchHooks Function()>; + +class $MyDatabaseManager { + final _$MyDatabase _db; + $MyDatabaseManager(this._db); + $$TodosTableTableManager get todos => + $$TodosTableTableManager(_db, _db.todos); + $$CategoriesTableTableManager get categories => + $$CategoriesTableTableManager(_db, _db.categories); +} diff --git a/packages/common/amplify_db_common_dart/example/pubspec.yaml b/packages/common/amplify_db_common_dart/example/pubspec.yaml index db1a3ff203..4fd534d14e 100644 --- a/packages/common/amplify_db_common_dart/example/pubspec.yaml +++ b/packages/common/amplify_db_common_dart/example/pubspec.yaml @@ -7,11 +7,11 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_db_common_dart: ">=0.4.0 <0.5.0" - drift: ">=2.18.0 <2.19.0" + drift: ^2.25.0 example_common: path: ../../../example_common @@ -20,4 +20,4 @@ dev_dependencies: path: ../../../amplify_lints build_runner: ^2.4.9 build_web_compilers: ^4.0.0 - drift_dev: ">=2.18.0 <2.19.0" + drift_dev: ^2.25.1 diff --git a/packages/common/amplify_db_common_dart/example/web/database.g.dart b/packages/common/amplify_db_common_dart/example/web/database.g.dart index 3f9bc53dbb..42fcfa9428 100644 --- a/packages/common/amplify_db_common_dart/example/web/database.g.dart +++ b/packages/common/amplify_db_common_dart/example/web/database.g.dart @@ -159,6 +159,15 @@ class Todo extends DataClass implements Insertable { content: content ?? this.content, category: category.present ? category.value : this.category, ); + Todo copyWithCompanion(TodosCompanion data) { + return Todo( + id: data.id.present ? data.id.value : this.id, + title: data.title.present ? data.title.value : this.title, + content: data.content.present ? data.content.value : this.content, + category: data.category.present ? data.category.value : this.category, + ); + } + @override String toString() { return (StringBuffer('Todo(') @@ -363,6 +372,14 @@ class Category extends DataClass implements Insertable { id: id ?? this.id, description: description ?? this.description, ); + Category copyWithCompanion(CategoriesCompanion data) { + return Category( + id: data.id.present ? data.id.value : this.id, + description: + data.description.present ? data.description.value : this.description, + ); + } + @override String toString() { return (StringBuffer('Category(') @@ -434,6 +451,7 @@ class CategoriesCompanion extends UpdateCompanion { abstract class _$MyDatabase extends GeneratedDatabase { _$MyDatabase(QueryExecutor e) : super(e); + $MyDatabaseManager get managers => $MyDatabaseManager(this); late final $TodosTable todos = $TodosTable(this); late final $CategoriesTable categories = $CategoriesTable(this); @override @@ -442,3 +460,269 @@ abstract class _$MyDatabase extends GeneratedDatabase { @override List get allSchemaEntities => [todos, categories]; } + +typedef $$TodosTableCreateCompanionBuilder = TodosCompanion Function({ + Value id, + required String title, + required String content, + Value category, +}); +typedef $$TodosTableUpdateCompanionBuilder = TodosCompanion Function({ + Value id, + Value title, + Value content, + Value category, +}); + +class $$TodosTableFilterComposer extends Composer<_$MyDatabase, $TodosTable> { + $$TodosTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnFilters get title => $composableBuilder( + column: $table.title, builder: (column) => ColumnFilters(column)); + + ColumnFilters get content => $composableBuilder( + column: $table.content, builder: (column) => ColumnFilters(column)); + + ColumnFilters get category => $composableBuilder( + column: $table.category, builder: (column) => ColumnFilters(column)); +} + +class $$TodosTableOrderingComposer extends Composer<_$MyDatabase, $TodosTable> { + $$TodosTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get title => $composableBuilder( + column: $table.title, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get content => $composableBuilder( + column: $table.content, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get category => $composableBuilder( + column: $table.category, builder: (column) => ColumnOrderings(column)); +} + +class $$TodosTableAnnotationComposer + extends Composer<_$MyDatabase, $TodosTable> { + $$TodosTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get title => + $composableBuilder(column: $table.title, builder: (column) => column); + + GeneratedColumn get content => + $composableBuilder(column: $table.content, builder: (column) => column); + + GeneratedColumn get category => + $composableBuilder(column: $table.category, builder: (column) => column); +} + +class $$TodosTableTableManager extends RootTableManager< + _$MyDatabase, + $TodosTable, + Todo, + $$TodosTableFilterComposer, + $$TodosTableOrderingComposer, + $$TodosTableAnnotationComposer, + $$TodosTableCreateCompanionBuilder, + $$TodosTableUpdateCompanionBuilder, + (Todo, BaseReferences<_$MyDatabase, $TodosTable, Todo>), + Todo, + PrefetchHooks Function()> { + $$TodosTableTableManager(_$MyDatabase db, $TodosTable table) + : super(TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$TodosTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$TodosTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$TodosTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ + Value id = const Value.absent(), + Value title = const Value.absent(), + Value content = const Value.absent(), + Value category = const Value.absent(), + }) => + TodosCompanion( + id: id, + title: title, + content: content, + category: category, + ), + createCompanionCallback: ({ + Value id = const Value.absent(), + required String title, + required String content, + Value category = const Value.absent(), + }) => + TodosCompanion.insert( + id: id, + title: title, + content: content, + category: category, + ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, + )); +} + +typedef $$TodosTableProcessedTableManager = ProcessedTableManager< + _$MyDatabase, + $TodosTable, + Todo, + $$TodosTableFilterComposer, + $$TodosTableOrderingComposer, + $$TodosTableAnnotationComposer, + $$TodosTableCreateCompanionBuilder, + $$TodosTableUpdateCompanionBuilder, + (Todo, BaseReferences<_$MyDatabase, $TodosTable, Todo>), + Todo, + PrefetchHooks Function()>; +typedef $$CategoriesTableCreateCompanionBuilder = CategoriesCompanion Function({ + Value id, + required String description, +}); +typedef $$CategoriesTableUpdateCompanionBuilder = CategoriesCompanion Function({ + Value id, + Value description, +}); + +class $$CategoriesTableFilterComposer + extends Composer<_$MyDatabase, $CategoriesTable> { + $$CategoriesTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnFilters get description => $composableBuilder( + column: $table.description, builder: (column) => ColumnFilters(column)); +} + +class $$CategoriesTableOrderingComposer + extends Composer<_$MyDatabase, $CategoriesTable> { + $$CategoriesTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get description => $composableBuilder( + column: $table.description, builder: (column) => ColumnOrderings(column)); +} + +class $$CategoriesTableAnnotationComposer + extends Composer<_$MyDatabase, $CategoriesTable> { + $$CategoriesTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get description => $composableBuilder( + column: $table.description, builder: (column) => column); +} + +class $$CategoriesTableTableManager extends RootTableManager< + _$MyDatabase, + $CategoriesTable, + Category, + $$CategoriesTableFilterComposer, + $$CategoriesTableOrderingComposer, + $$CategoriesTableAnnotationComposer, + $$CategoriesTableCreateCompanionBuilder, + $$CategoriesTableUpdateCompanionBuilder, + (Category, BaseReferences<_$MyDatabase, $CategoriesTable, Category>), + Category, + PrefetchHooks Function()> { + $$CategoriesTableTableManager(_$MyDatabase db, $CategoriesTable table) + : super(TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$CategoriesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$CategoriesTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$CategoriesTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ + Value id = const Value.absent(), + Value description = const Value.absent(), + }) => + CategoriesCompanion( + id: id, + description: description, + ), + createCompanionCallback: ({ + Value id = const Value.absent(), + required String description, + }) => + CategoriesCompanion.insert( + id: id, + description: description, + ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, + )); +} + +typedef $$CategoriesTableProcessedTableManager = ProcessedTableManager< + _$MyDatabase, + $CategoriesTable, + Category, + $$CategoriesTableFilterComposer, + $$CategoriesTableOrderingComposer, + $$CategoriesTableAnnotationComposer, + $$CategoriesTableCreateCompanionBuilder, + $$CategoriesTableUpdateCompanionBuilder, + (Category, BaseReferences<_$MyDatabase, $CategoriesTable, Category>), + Category, + PrefetchHooks Function()>; + +class $MyDatabaseManager { + final _$MyDatabase _db; + $MyDatabaseManager(this._db); + $$TodosTableTableManager get todos => + $$TodosTableTableManager(_db, _db.todos); + $$CategoriesTableTableManager get categories => + $$CategoriesTableTableManager(_db, _db.categories); +} diff --git a/packages/common/amplify_db_common_dart/lib/src/connect_html.dart b/packages/common/amplify_db_common_dart/lib/src/connect_html.dart index a009260d08..50e95ca4be 100644 --- a/packages/common/amplify_db_common_dart/lib/src/connect_html.dart +++ b/packages/common/amplify_db_common_dart/lib/src/connect_html.dart @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import 'dart:async'; +//ignore: deprecated_member_use import 'dart:html'; import 'package:amplify_core/amplify_core.dart'; diff --git a/packages/common/amplify_db_common_dart/pubspec.yaml b/packages/common/amplify_db_common_dart/pubspec.yaml index e68c879b5a..7991a4d559 100644 --- a/packages/common/amplify_db_common_dart/pubspec.yaml +++ b/packages/common/amplify_db_common_dart/pubspec.yaml @@ -6,21 +6,21 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/co issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_core: ">=2.6.0 <2.7.0" async: ^2.10.0 aws_common: ">=0.7.3 <0.8.0" - drift: ">=2.18.0 <2.19.0" + drift: ^2.25.0 meta: ^1.7.0 path: ">=1.8.0 <2.0.0" - sqlite3: ">=2.0.0 <2.4.7" + sqlite3: ">=2.0.0 <2.7.0" dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" build_runner: ^2.4.9 build_test: ^2.0.0 build_web_compilers: ^4.0.0 - drift_dev: ">=2.18.0 <2.19.0" + drift_dev: ^2.25.1 test: ^1.22.1 diff --git a/packages/common/amplify_db_common_dart/test/database.g.dart b/packages/common/amplify_db_common_dart/test/database.g.dart index 92b53f4d0b..42fcfa9428 100644 --- a/packages/common/amplify_db_common_dart/test/database.g.dart +++ b/packages/common/amplify_db_common_dart/test/database.g.dart @@ -159,6 +159,15 @@ class Todo extends DataClass implements Insertable { content: content ?? this.content, category: category.present ? category.value : this.category, ); + Todo copyWithCompanion(TodosCompanion data) { + return Todo( + id: data.id.present ? data.id.value : this.id, + title: data.title.present ? data.title.value : this.title, + content: data.content.present ? data.content.value : this.content, + category: data.category.present ? data.category.value : this.category, + ); + } + @override String toString() { return (StringBuffer('Todo(') @@ -363,6 +372,14 @@ class Category extends DataClass implements Insertable { id: id ?? this.id, description: description ?? this.description, ); + Category copyWithCompanion(CategoriesCompanion data) { + return Category( + id: data.id.present ? data.id.value : this.id, + description: + data.description.present ? data.description.value : this.description, + ); + } + @override String toString() { return (StringBuffer('Category(') @@ -434,7 +451,7 @@ class CategoriesCompanion extends UpdateCompanion { abstract class _$MyDatabase extends GeneratedDatabase { _$MyDatabase(QueryExecutor e) : super(e); - _$MyDatabaseManager get managers => _$MyDatabaseManager(this); + $MyDatabaseManager get managers => $MyDatabaseManager(this); late final $TodosTable todos = $TodosTable(this); late final $CategoriesTable categories = $CategoriesTable(this); @override @@ -444,7 +461,7 @@ abstract class _$MyDatabase extends GeneratedDatabase { List get allSchemaEntities => [todos, categories]; } -typedef $$TodosTableInsertCompanionBuilder = TodosCompanion Function({ +typedef $$TodosTableCreateCompanionBuilder = TodosCompanion Function({ Value id, required String title, required String content, @@ -457,25 +474,93 @@ typedef $$TodosTableUpdateCompanionBuilder = TodosCompanion Function({ Value category, }); +class $$TodosTableFilterComposer extends Composer<_$MyDatabase, $TodosTable> { + $$TodosTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnFilters get title => $composableBuilder( + column: $table.title, builder: (column) => ColumnFilters(column)); + + ColumnFilters get content => $composableBuilder( + column: $table.content, builder: (column) => ColumnFilters(column)); + + ColumnFilters get category => $composableBuilder( + column: $table.category, builder: (column) => ColumnFilters(column)); +} + +class $$TodosTableOrderingComposer extends Composer<_$MyDatabase, $TodosTable> { + $$TodosTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get title => $composableBuilder( + column: $table.title, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get content => $composableBuilder( + column: $table.content, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get category => $composableBuilder( + column: $table.category, builder: (column) => ColumnOrderings(column)); +} + +class $$TodosTableAnnotationComposer + extends Composer<_$MyDatabase, $TodosTable> { + $$TodosTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get title => + $composableBuilder(column: $table.title, builder: (column) => column); + + GeneratedColumn get content => + $composableBuilder(column: $table.content, builder: (column) => column); + + GeneratedColumn get category => + $composableBuilder(column: $table.category, builder: (column) => column); +} + class $$TodosTableTableManager extends RootTableManager< _$MyDatabase, $TodosTable, Todo, $$TodosTableFilterComposer, $$TodosTableOrderingComposer, - $$TodosTableProcessedTableManager, - $$TodosTableInsertCompanionBuilder, - $$TodosTableUpdateCompanionBuilder> { + $$TodosTableAnnotationComposer, + $$TodosTableCreateCompanionBuilder, + $$TodosTableUpdateCompanionBuilder, + (Todo, BaseReferences<_$MyDatabase, $TodosTable, Todo>), + Todo, + PrefetchHooks Function()> { $$TodosTableTableManager(_$MyDatabase db, $TodosTable table) : super(TableManagerState( db: db, table: table, - filteringComposer: - $$TodosTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$TodosTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $$TodosTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + createFilteringComposer: () => + $$TodosTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$TodosTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$TodosTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ Value id = const Value.absent(), Value title = const Value.absent(), Value content = const Value.absent(), @@ -487,7 +572,7 @@ class $$TodosTableTableManager extends RootTableManager< content: content, category: category, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String title, required String content, @@ -499,70 +584,26 @@ class $$TodosTableTableManager extends RootTableManager< content: content, category: category, ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, )); } -class $$TodosTableProcessedTableManager extends ProcessedTableManager< +typedef $$TodosTableProcessedTableManager = ProcessedTableManager< _$MyDatabase, $TodosTable, Todo, $$TodosTableFilterComposer, $$TodosTableOrderingComposer, - $$TodosTableProcessedTableManager, - $$TodosTableInsertCompanionBuilder, - $$TodosTableUpdateCompanionBuilder> { - $$TodosTableProcessedTableManager(super.$state); -} - -class $$TodosTableFilterComposer - extends FilterComposer<_$MyDatabase, $TodosTable> { - $$TodosTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get title => $state.composableBuilder( - column: $state.table.title, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get content => $state.composableBuilder( - column: $state.table.content, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get category => $state.composableBuilder( - column: $state.table.category, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); -} - -class $$TodosTableOrderingComposer - extends OrderingComposer<_$MyDatabase, $TodosTable> { - $$TodosTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get title => $state.composableBuilder( - column: $state.table.title, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get content => $state.composableBuilder( - column: $state.table.content, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get category => $state.composableBuilder( - column: $state.table.category, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); -} - -typedef $$CategoriesTableInsertCompanionBuilder = CategoriesCompanion Function({ + $$TodosTableAnnotationComposer, + $$TodosTableCreateCompanionBuilder, + $$TodosTableUpdateCompanionBuilder, + (Todo, BaseReferences<_$MyDatabase, $TodosTable, Todo>), + Todo, + PrefetchHooks Function()>; +typedef $$CategoriesTableCreateCompanionBuilder = CategoriesCompanion Function({ Value id, required String description, }); @@ -571,26 +612,77 @@ typedef $$CategoriesTableUpdateCompanionBuilder = CategoriesCompanion Function({ Value description, }); +class $$CategoriesTableFilterComposer + extends Composer<_$MyDatabase, $CategoriesTable> { + $$CategoriesTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnFilters get description => $composableBuilder( + column: $table.description, builder: (column) => ColumnFilters(column)); +} + +class $$CategoriesTableOrderingComposer + extends Composer<_$MyDatabase, $CategoriesTable> { + $$CategoriesTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get description => $composableBuilder( + column: $table.description, builder: (column) => ColumnOrderings(column)); +} + +class $$CategoriesTableAnnotationComposer + extends Composer<_$MyDatabase, $CategoriesTable> { + $$CategoriesTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get description => $composableBuilder( + column: $table.description, builder: (column) => column); +} + class $$CategoriesTableTableManager extends RootTableManager< _$MyDatabase, $CategoriesTable, Category, $$CategoriesTableFilterComposer, $$CategoriesTableOrderingComposer, - $$CategoriesTableProcessedTableManager, - $$CategoriesTableInsertCompanionBuilder, - $$CategoriesTableUpdateCompanionBuilder> { + $$CategoriesTableAnnotationComposer, + $$CategoriesTableCreateCompanionBuilder, + $$CategoriesTableUpdateCompanionBuilder, + (Category, BaseReferences<_$MyDatabase, $CategoriesTable, Category>), + Category, + PrefetchHooks Function()> { $$CategoriesTableTableManager(_$MyDatabase db, $CategoriesTable table) : super(TableManagerState( db: db, table: table, - filteringComposer: - $$CategoriesTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$CategoriesTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$CategoriesTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + createFilteringComposer: () => + $$CategoriesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$CategoriesTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$CategoriesTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ Value id = const Value.absent(), Value description = const Value.absent(), }) => @@ -598,7 +690,7 @@ class $$CategoriesTableTableManager extends RootTableManager< id: id, description: description, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String description, }) => @@ -606,52 +698,29 @@ class $$CategoriesTableTableManager extends RootTableManager< id: id, description: description, ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, )); } -class $$CategoriesTableProcessedTableManager extends ProcessedTableManager< +typedef $$CategoriesTableProcessedTableManager = ProcessedTableManager< _$MyDatabase, $CategoriesTable, Category, $$CategoriesTableFilterComposer, $$CategoriesTableOrderingComposer, - $$CategoriesTableProcessedTableManager, - $$CategoriesTableInsertCompanionBuilder, - $$CategoriesTableUpdateCompanionBuilder> { - $$CategoriesTableProcessedTableManager(super.$state); -} - -class $$CategoriesTableFilterComposer - extends FilterComposer<_$MyDatabase, $CategoriesTable> { - $$CategoriesTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get description => $state.composableBuilder( - column: $state.table.description, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); -} - -class $$CategoriesTableOrderingComposer - extends OrderingComposer<_$MyDatabase, $CategoriesTable> { - $$CategoriesTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get description => $state.composableBuilder( - column: $state.table.description, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); -} + $$CategoriesTableAnnotationComposer, + $$CategoriesTableCreateCompanionBuilder, + $$CategoriesTableUpdateCompanionBuilder, + (Category, BaseReferences<_$MyDatabase, $CategoriesTable, Category>), + Category, + PrefetchHooks Function()>; -class _$MyDatabaseManager { +class $MyDatabaseManager { final _$MyDatabase _db; - _$MyDatabaseManager(this._db); + $MyDatabaseManager(this._db); $$TodosTableTableManager get todos => $$TodosTableTableManager(_db, _db.todos); $$CategoriesTableTableManager get categories => diff --git a/packages/example_common/example/pubspec.yaml b/packages/example_common/example/pubspec.yaml index 127f6b7456..5447e7a87f 100644 --- a/packages/example_common/example/pubspec.yaml +++ b/packages/example_common/example/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: example_common: diff --git a/packages/example_common/lib/src/components/button_component.dart b/packages/example_common/lib/src/components/button_component.dart index f9eb551d0a..cb64170b48 100644 --- a/packages/example_common/lib/src/components/button_component.dart +++ b/packages/example_common/lib/src/components/button_component.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; import 'package:example_common/src/components/component.dart'; diff --git a/packages/example_common/lib/src/components/center_component.dart b/packages/example_common/lib/src/components/center_component.dart index d0d3152108..50219e2a7e 100644 --- a/packages/example_common/lib/src/components/center_component.dart +++ b/packages/example_common/lib/src/components/center_component.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; import 'package:example_common/src/components/component.dart'; diff --git a/packages/example_common/lib/src/components/component.dart b/packages/example_common/lib/src/components/component.dart index 41b7ca4198..3575d1562f 100644 --- a/packages/example_common/lib/src/components/component.dart +++ b/packages/example_common/lib/src/components/component.dart @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import 'dart:async'; +//ignore: deprecated_member_use import 'dart:html'; import 'package:meta/meta.dart'; diff --git a/packages/example_common/lib/src/components/container_component.dart b/packages/example_common/lib/src/components/container_component.dart index d75a59545f..17ed19ea42 100644 --- a/packages/example_common/lib/src/components/container_component.dart +++ b/packages/example_common/lib/src/components/container_component.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; import 'package:example_common/src/components/component.dart'; diff --git a/packages/example_common/lib/src/components/flex_component.dart b/packages/example_common/lib/src/components/flex_component.dart index 28f5985396..ca04cb9d66 100644 --- a/packages/example_common/lib/src/components/flex_component.dart +++ b/packages/example_common/lib/src/components/flex_component.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; import 'package:example_common/src/components/component.dart'; diff --git a/packages/example_common/lib/src/components/form_component.dart b/packages/example_common/lib/src/components/form_component.dart index d8e4057031..613186c41d 100644 --- a/packages/example_common/lib/src/components/form_component.dart +++ b/packages/example_common/lib/src/components/form_component.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; import 'package:example_common/src/components/component.dart'; diff --git a/packages/example_common/lib/src/components/table_component.dart b/packages/example_common/lib/src/components/table_component.dart index eaf2ce08ce..0478b4b64a 100644 --- a/packages/example_common/lib/src/components/table_component.dart +++ b/packages/example_common/lib/src/components/table_component.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; import 'package:example_common/src/components/component.dart'; diff --git a/packages/example_common/lib/src/components/text_component.dart b/packages/example_common/lib/src/components/text_component.dart index 4f2003cee8..06f2be0dee 100644 --- a/packages/example_common/lib/src/components/text_component.dart +++ b/packages/example_common/lib/src/components/text_component.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; import 'package:example_common/src/components/component.dart'; diff --git a/packages/example_common/lib/src/components/text_form_field_component.dart b/packages/example_common/lib/src/components/text_form_field_component.dart index 3b49dadc5d..6a2f3b3bf7 100644 --- a/packages/example_common/lib/src/components/text_form_field_component.dart +++ b/packages/example_common/lib/src/components/text_form_field_component.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; import 'package:example_common/src/components/component.dart'; diff --git a/packages/example_common/lib/src/utils/render_app.dart b/packages/example_common/lib/src/utils/render_app.dart index 6e7ab78790..75168c8dee 100644 --- a/packages/example_common/lib/src/utils/render_app.dart +++ b/packages/example_common/lib/src/utils/render_app.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; import 'package:example_common/example_common.dart'; diff --git a/packages/example_common/pubspec.yaml b/packages/example_common/pubspec.yaml index e21fa2f0f0..f25f92104d 100644 --- a/packages/example_common/pubspec.yaml +++ b/packages/example_common/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: meta: ^1.7.0 diff --git a/packages/example_common/test/example_common_test.dart b/packages/example_common/test/example_common_test.dart index f931fc2920..2425d8baef 100644 --- a/packages/example_common/test/example_common_test.dart +++ b/packages/example_common/test/example_common_test.dart @@ -3,6 +3,7 @@ @TestOn('browser') +//ignore: deprecated_member_use import 'dart:html'; import 'package:example_common/example_common.dart'; diff --git a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/AmplifyLifecycleObserver.kt b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/AmplifyLifecycleObserver.kt index 8a750e6bd7..1faae83bdc 100644 --- a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/AmplifyLifecycleObserver.kt +++ b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/AmplifyLifecycleObserver.kt @@ -17,7 +17,7 @@ class AmplifyLifecycleObserver : DefaultLifecycleObserver { // Only set launchNotification to null when app resumes from background. if (!isAppLaunch) { AmplifyPushNotificationsPlugin.launchNotification = null - AmplifyPushNotificationsPlugin.flutterApi!!.nullifyLaunchNotification { } + AmplifyPushNotificationsPlugin.flutterApi!!.nullifyLaunchNotification(NoOpVoidResult()) } refreshToken() isAppLaunch = false diff --git a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/AmplifyPushNotificationsPlugin.kt b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/AmplifyPushNotificationsPlugin.kt index 731d93fd50..dfc4b3e4e0 100644 --- a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/AmplifyPushNotificationsPlugin.kt +++ b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/AmplifyPushNotificationsPlugin.kt @@ -104,7 +104,7 @@ class AmplifyPushNotificationsPlugin( // Force init stream handlers when the app is opened from killed state so old handlers are removed. StreamHandlers.initStreamHandlers(true) StreamHandlers.initEventChannels(mainBinaryMessenger!!) - PushNotificationsHostApi.setup(mainBinaryMessenger!!, this) + PushNotificationsHostApi.setUp(mainBinaryMessenger!!, this) flutterApi = PushNotificationsFlutterApi(mainBinaryMessenger!!) applicationContext = flutterPluginBinding.applicationContext sharedPreferences = applicationContext.getSharedPreferences( @@ -117,7 +117,7 @@ class AmplifyPushNotificationsPlugin( mainBinaryMessenger = null _flutterEngineCache.clear() StreamHandlers.deInit() - PushNotificationsHostApi.setup(binding.binaryMessenger, null) + PushNotificationsHostApi.setUp(binding.binaryMessenger, null) flutterApi = null } diff --git a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/NoOpVoidResult.kt b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/NoOpVoidResult.kt new file mode 100644 index 0000000000..1f64b0c8db --- /dev/null +++ b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/NoOpVoidResult.kt @@ -0,0 +1,10 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +package com.amazonaws.amplify.amplify_push_notifications + +class NoOpVoidResult : PushNotificationsHostApiBindings.VoidResult { + override fun success() {} + + override fun error(error: Throwable) {} +} diff --git a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationBackgroundService.kt b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationBackgroundService.kt index f4a73b1984..c4ce14bfa8 100644 --- a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationBackgroundService.kt +++ b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationBackgroundService.kt @@ -134,8 +134,9 @@ class PushNotificationBackgroundService : JobIntentService(), MethodChannel.Meth intent.extras?.let { bundle -> bundle.getNotificationPayload()?.let { AmplifyPushNotificationsPlugin.flutterApi!!.onNotificationReceivedInBackground( - it.toWritableMap() - ) {} + it.toWritableMap(), + NoOpVoidResult() + ) } } } diff --git a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationFirebaseMessagingService.kt b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationFirebaseMessagingService.kt index 24f7501c58..caef8f7124 100644 --- a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationFirebaseMessagingService.kt +++ b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationFirebaseMessagingService.kt @@ -100,8 +100,9 @@ class PushNotificationFirebaseMessagingService : FirebaseMessagingService() { } else { val notificationPayload = payload.toWritableMap() AmplifyPushNotificationsPlugin.flutterApi!!.onNotificationReceivedInBackground( - notificationPayload - ) {} + notificationPayload, + NoOpVoidResult() + ) } } diff --git a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java index e39bfea8bb..7404beee51 100644 --- a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java +++ b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java @@ -1,11 +1,14 @@ -// +// // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon package com.amazonaws.amplify.amplify_push_notifications; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.CLASS; + import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -14,6 +17,8 @@ import io.flutter.plugin.common.MessageCodec; import io.flutter.plugin.common.StandardMessageCodec; import java.io.ByteArrayOutputStream; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; @@ -21,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** Generated class from Pigeon. */ @SuppressWarnings({"unused", "unchecked", "CodeBlock2Expr", "RedundantSuppression", "serial"}) @@ -45,7 +51,7 @@ public FlutterError(@NonNull String code, @Nullable String message, @Nullable Ob @NonNull protected static ArrayList wrapError(@NonNull Throwable exception) { - ArrayList errorList = new ArrayList(3); + ArrayList errorList = new ArrayList<>(3); if (exception instanceof FlutterError) { FlutterError error = (FlutterError) exception; errorList.add(error.code); @@ -60,6 +66,15 @@ protected static ArrayList wrapError(@NonNull Throwable exception) { return errorList; } + @NonNull + protected static FlutterError createConnectionError(@NonNull String channelName) { + return new FlutterError("channel-error", "Unable to establish connection on channel: " + channelName + ".", ""); + } + + @Target(METHOD) + @Retention(CLASS) + @interface CanIgnoreReturnValue {} + public enum PermissionStatus { SHOULD_REQUEST(0), SHOULD_EXPLAIN_THEN_REQUEST(1), @@ -68,7 +83,7 @@ public enum PermissionStatus { final int index; - private PermissionStatus(final int index) { + PermissionStatus(final int index) { this.index = index; } } @@ -117,10 +132,24 @@ public void setBadge(@NonNull Boolean setterArg) { /** Constructor is non-public to enforce null safety; use Builder. */ PermissionsOptions() {} + @Override + public boolean equals(Object o) { + if (this == o) { return true; } + if (o == null || getClass() != o.getClass()) { return false; } + PermissionsOptions that = (PermissionsOptions) o; + return alert.equals(that.alert) && sound.equals(that.sound) && badge.equals(that.badge); + } + + @Override + public int hashCode() { + return Objects.hash(alert, sound, badge); + } + public static final class Builder { private @Nullable Boolean alert; + @CanIgnoreReturnValue public @NonNull Builder setAlert(@NonNull Boolean setterArg) { this.alert = setterArg; return this; @@ -128,6 +157,7 @@ public static final class Builder { private @Nullable Boolean sound; + @CanIgnoreReturnValue public @NonNull Builder setSound(@NonNull Boolean setterArg) { this.sound = setterArg; return this; @@ -135,6 +165,7 @@ public static final class Builder { private @Nullable Boolean badge; + @CanIgnoreReturnValue public @NonNull Builder setBadge(@NonNull Boolean setterArg) { this.badge = setterArg; return this; @@ -151,20 +182,20 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(3); + ArrayList toListResult = new ArrayList<>(3); toListResult.add(alert); toListResult.add(sound); toListResult.add(badge); return toListResult; } - static @NonNull PermissionsOptions fromList(@NonNull ArrayList list) { + static @NonNull PermissionsOptions fromList(@NonNull ArrayList pigeonVar_list) { PermissionsOptions pigeonResult = new PermissionsOptions(); - Object alert = list.get(0); + Object alert = pigeonVar_list.get(0); pigeonResult.setAlert((Boolean) alert); - Object sound = list.get(1); + Object sound = pigeonVar_list.get(1); pigeonResult.setSound((Boolean) sound); - Object badge = list.get(2); + Object badge = pigeonVar_list.get(2); pigeonResult.setBadge((Boolean) badge); return pigeonResult; } @@ -188,10 +219,24 @@ public void setStatus(@NonNull PermissionStatus setterArg) { /** Constructor is non-public to enforce null safety; use Builder. */ GetPermissionStatusResult() {} + @Override + public boolean equals(Object o) { + if (this == o) { return true; } + if (o == null || getClass() != o.getClass()) { return false; } + GetPermissionStatusResult that = (GetPermissionStatusResult) o; + return status.equals(that.status); + } + + @Override + public int hashCode() { + return Objects.hash(status); + } + public static final class Builder { private @Nullable PermissionStatus status; + @CanIgnoreReturnValue public @NonNull Builder setStatus(@NonNull PermissionStatus setterArg) { this.status = setterArg; return this; @@ -206,38 +251,35 @@ public static final class Builder { @NonNull ArrayList toList() { - ArrayList toListResult = new ArrayList(1); - toListResult.add(status == null ? null : status.index); + ArrayList toListResult = new ArrayList<>(1); + toListResult.add(status); return toListResult; } - static @NonNull GetPermissionStatusResult fromList(@NonNull ArrayList list) { + static @NonNull GetPermissionStatusResult fromList(@NonNull ArrayList pigeonVar_list) { GetPermissionStatusResult pigeonResult = new GetPermissionStatusResult(); - Object status = list.get(0); - pigeonResult.setStatus(PermissionStatus.values()[(int) status]); + Object status = pigeonVar_list.get(0); + pigeonResult.setStatus((PermissionStatus) status); return pigeonResult; } } - public interface Result { - @SuppressWarnings("UnknownNullness") - void success(T result); - - void error(@NonNull Throwable error); - } - - private static class PushNotificationsFlutterApiCodec extends StandardMessageCodec { - public static final PushNotificationsFlutterApiCodec INSTANCE = new PushNotificationsFlutterApiCodec(); + private static class PigeonCodec extends StandardMessageCodec { + public static final PigeonCodec INSTANCE = new PigeonCodec(); - private PushNotificationsFlutterApiCodec() {} + private PigeonCodec() {} @Override protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) { switch (type) { - case (byte) 128: - return GetPermissionStatusResult.fromList((ArrayList) readValue(buffer)); - case (byte) 129: + case (byte) 129: { + Object value = readValue(buffer); + return value == null ? null : PermissionStatus.values()[((Long) value).intValue()]; + } + case (byte) 130: return PermissionsOptions.fromList((ArrayList) readValue(buffer)); + case (byte) 131: + return GetPermissionStatusResult.fromList((ArrayList) readValue(buffer)); default: return super.readValueOfType(type, buffer); } @@ -245,84 +287,107 @@ protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) { @Override protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) { - if (value instanceof GetPermissionStatusResult) { - stream.write(128); - writeValue(stream, ((GetPermissionStatusResult) value).toList()); - } else if (value instanceof PermissionsOptions) { + if (value instanceof PermissionStatus) { stream.write(129); + writeValue(stream, value == null ? null : ((PermissionStatus) value).index); + } else if (value instanceof PermissionsOptions) { + stream.write(130); writeValue(stream, ((PermissionsOptions) value).toList()); + } else if (value instanceof GetPermissionStatusResult) { + stream.write(131); + writeValue(stream, ((GetPermissionStatusResult) value).toList()); } else { super.writeValue(stream, value); } } } + + /** Asynchronous error handling return type for non-nullable API method returns. */ + public interface Result { + /** Success case callback method for handling returns. */ + void success(@NonNull T result); + + /** Failure case callback method for handling errors. */ + void error(@NonNull Throwable error); + } + /** Asynchronous error handling return type for nullable API method returns. */ + public interface NullableResult { + /** Success case callback method for handling returns. */ + void success(@Nullable T result); + + /** Failure case callback method for handling errors. */ + void error(@NonNull Throwable error); + } + /** Asynchronous error handling return type for void API method returns. */ + public interface VoidResult { + /** Success case callback method for handling returns. */ + void success(); + + /** Failure case callback method for handling errors. */ + void error(@NonNull Throwable error); + } /** Generated class from Pigeon that represents Flutter messages that can be called from Java. */ public static class PushNotificationsFlutterApi { private final @NonNull BinaryMessenger binaryMessenger; + private final String messageChannelSuffix; public PushNotificationsFlutterApi(@NonNull BinaryMessenger argBinaryMessenger) { + this(argBinaryMessenger, ""); + } + public PushNotificationsFlutterApi(@NonNull BinaryMessenger argBinaryMessenger, @NonNull String messageChannelSuffix) { this.binaryMessenger = argBinaryMessenger; + this.messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix; } - /** Public interface for sending reply. */ - @SuppressWarnings("UnknownNullness") - public interface Reply { - void reply(T reply); - } - /** The codec used by PushNotificationsFlutterApi. */ + /** + * Public interface for sending reply. + * The codec used by PushNotificationsFlutterApi. + */ static @NonNull MessageCodec getCodec() { - return PushNotificationsFlutterApiCodec.INSTANCE; + return PigeonCodec.INSTANCE; } - public void onNotificationReceivedInBackground(@NonNull Map withPayloadArg, @NonNull Reply callback) { + public void onNotificationReceivedInBackground(@NonNull Map withPayloadArg, @NonNull VoidResult result) { + final String channelName = "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.onNotificationReceivedInBackground" + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.onNotificationReceivedInBackground", getCodec()); + binaryMessenger, channelName, getCodec()); channel.send( - new ArrayList(Collections.singletonList(withPayloadArg)), - channelReply -> callback.reply(null)); + new ArrayList<>(Collections.singletonList(withPayloadArg)), + channelReply -> { + if (channelReply instanceof List) { + List listReply = (List) channelReply; + if (listReply.size() > 1) { + result.error(new FlutterError((String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); + } else { + result.success(); + } + } else { + result.error(createConnectionError(channelName)); + } + }); } - public void nullifyLaunchNotification(@NonNull Reply callback) { + public void nullifyLaunchNotification(@NonNull VoidResult result) { + final String channelName = "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.nullifyLaunchNotification" + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.nullifyLaunchNotification", getCodec()); + binaryMessenger, channelName, getCodec()); channel.send( null, - channelReply -> callback.reply(null)); - } - } - - private static class PushNotificationsHostApiCodec extends StandardMessageCodec { - public static final PushNotificationsHostApiCodec INSTANCE = new PushNotificationsHostApiCodec(); - - private PushNotificationsHostApiCodec() {} - - @Override - protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) { - switch (type) { - case (byte) 128: - return GetPermissionStatusResult.fromList((ArrayList) readValue(buffer)); - case (byte) 129: - return PermissionsOptions.fromList((ArrayList) readValue(buffer)); - default: - return super.readValueOfType(type, buffer); - } - } - - @Override - protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) { - if (value instanceof GetPermissionStatusResult) { - stream.write(128); - writeValue(stream, ((GetPermissionStatusResult) value).toList()); - } else if (value instanceof PermissionsOptions) { - stream.write(129); - writeValue(stream, ((PermissionsOptions) value).toList()); - } else { - super.writeValue(stream, value); - } + channelReply -> { + if (channelReply instanceof List) { + List listReply = (List) channelReply; + if (listReply.size() > 1) { + result.error(new FlutterError((String) listReply.get(0), (String) listReply.get(1), listReply.get(2))); + } else { + result.success(); + } + } else { + result.error(createConnectionError(channelName)); + } + }); } } - /** Generated interface from Pigeon that represents a handler of messages from Flutter. */ public interface PushNotificationsHostApi { @@ -344,25 +409,28 @@ public interface PushNotificationsHostApi { /** The codec used by PushNotificationsHostApi. */ static @NonNull MessageCodec getCodec() { - return PushNotificationsHostApiCodec.INSTANCE; + return PigeonCodec.INSTANCE; } /**Sets up an instance of `PushNotificationsHostApi` to handle messages through the `binaryMessenger`. */ - static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable PushNotificationsHostApi api) { + static void setUp(@NonNull BinaryMessenger binaryMessenger, @Nullable PushNotificationsHostApi api) { + setUp(binaryMessenger, "", api); + } + static void setUp(@NonNull BinaryMessenger binaryMessenger, @NonNull String messageChannelSuffix, @Nullable PushNotificationsHostApi api) { + messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix; { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestInitialToken", getCodec()); + binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestInitialToken" + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { api.requestInitialToken(); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -373,11 +441,11 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable PushNotifi { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getPermissionStatus", getCodec()); + binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getPermissionStatus" + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); Result resultCallback = new Result() { public void success(GetPermissionStatusResult result) { @@ -400,11 +468,11 @@ public void error(Throwable error) { { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestPermissions", getCodec()); + binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestPermissions" + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; PermissionsOptions withPermissionOptionsArg = (PermissionsOptions) args.get(0); Result resultCallback = @@ -429,18 +497,17 @@ public void error(Throwable error) { { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getLaunchNotification", getCodec()); + binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getLaunchNotification" + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Map output = api.getLaunchNotification(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -451,18 +518,17 @@ public void error(Throwable error) { { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getBadgeCount", getCodec()); + binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getBadgeCount" + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); try { Long output = api.getBadgeCount(); wrapped.add(0, output); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -473,20 +539,19 @@ public void error(Throwable error) { { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.setBadgeCount", getCodec()); + binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.setBadgeCount" + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - Number withBadgeCountArg = (Number) args.get(0); + Long withBadgeCountArg = (Long) args.get(0); try { - api.setBadgeCount((withBadgeCountArg == null) ? null : withBadgeCountArg.longValue()); + api.setBadgeCount(withBadgeCountArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); @@ -497,20 +562,19 @@ public void error(Throwable error) { { BasicMessageChannel channel = new BasicMessageChannel<>( - binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.registerCallbackFunction", getCodec()); + binaryMessenger, "dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.registerCallbackFunction" + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( (message, reply) -> { - ArrayList wrapped = new ArrayList(); + ArrayList wrapped = new ArrayList<>(); ArrayList args = (ArrayList) message; - Number callbackHandleArg = (Number) args.get(0); + Long callbackHandleArg = (Long) args.get(0); try { - api.registerCallbackFunction((callbackHandleArg == null) ? null : callbackHandleArg.longValue()); + api.registerCallbackFunction(callbackHandleArg); wrapped.add(0, null); } catch (Throwable exception) { - ArrayList wrappedError = wrapError(exception); - wrapped = wrappedError; + wrapped = wrapError(exception); } reply.reply(wrapped); }); diff --git a/packages/notifications/push/amplify_push_notifications/example/android/app/build.gradle b/packages/notifications/push/amplify_push_notifications/example/android/app/build.gradle index bf2dc66b65..d616df91cf 100644 --- a/packages/notifications/push/amplify_push_notifications/example/android/app/build.gradle +++ b/packages/notifications/push/amplify_push_notifications/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace 'com.amazonaws.amplify.amplify_push_notifications_example' compileSdk flutter.compileSdkVersion @@ -67,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/packages/notifications/push/amplify_push_notifications/example/android/build.gradle b/packages/notifications/push/amplify_push_notifications/example/android/build.gradle index 070b4ffbfd..bc157bd1a1 100644 --- a/packages/notifications/push/amplify_push_notifications/example/android/build.gradle +++ b/packages/notifications/push/amplify_push_notifications/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/packages/notifications/push/amplify_push_notifications/example/android/settings.gradle b/packages/notifications/push/amplify_push_notifications/example/android/settings.gradle index 44e62bcf06..276cdabf9c 100644 --- a/packages/notifications/push/amplify_push_notifications/example/android/settings.gradle +++ b/packages/notifications/push/amplify_push_notifications/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.10" apply false +} + +include ":app" diff --git a/packages/notifications/push/amplify_push_notifications/example/pubspec.yaml b/packages/notifications/push/amplify_push_notifications/example/pubspec.yaml index bb4b2eddd4..c3c6e26913 100644 --- a/packages/notifications/push/amplify_push_notifications/example/pubspec.yaml +++ b/packages/notifications/push/amplify_push_notifications/example/pubspec.yaml @@ -4,8 +4,8 @@ publish_to: "none" version: 0.1.0 environment: - flutter: ">=3.19.0" - sdk: ^3.3.0 + flutter: ">=3.27.0" + sdk: ^3.6.0 dependencies: amplify_push_notifications: diff --git a/packages/notifications/push/amplify_push_notifications/ios/Classes/AmplifyPushNotificationsPlugin.swift b/packages/notifications/push/amplify_push_notifications/ios/Classes/AmplifyPushNotificationsPlugin.swift index 42a7435510..bee3a69a85 100644 --- a/packages/notifications/push/amplify_push_notifications/ios/Classes/AmplifyPushNotificationsPlugin.swift +++ b/packages/notifications/push/amplify_push_notifications/ios/Classes/AmplifyPushNotificationsPlugin.swift @@ -27,7 +27,7 @@ public class AmplifyPushNotificationsPlugin: NSObject, FlutterPlugin, PushNotifi flutterApi: PushNotificationsFlutterApi(binaryMessenger: messenger) ) - PushNotificationsHostApiSetup(messenger, pluginInstance) + SetUpPushNotificationsHostApi(messenger, pluginInstance) registrar.addApplicationDelegate(pluginInstance) } @@ -57,15 +57,15 @@ public class AmplifyPushNotificationsPlugin: NSObject, FlutterPlugin, PushNotifi Task { var options: UNAuthorizationOptions = [] - if withPermissionOptions.alert.boolValue { + if withPermissionOptions.alert { options.insert(.alert) } - if withPermissionOptions.badge.boolValue { + if withPermissionOptions.badge { options.insert(.badge) } - if withPermissionOptions.sound.boolValue { + if withPermissionOptions.sound { options.insert(.sound) } @@ -95,11 +95,11 @@ public class AmplifyPushNotificationsPlugin: NSObject, FlutterPlugin, PushNotifi return UIApplication.shared.applicationIconBadgeNumber as NSNumber } - public func setBadgeCountWithBadgeCount(_ withBadgeCount: NSNumber, error: AutoreleasingUnsafeMutablePointer) { - UIApplication.shared.applicationIconBadgeNumber = withBadgeCount.intValue + public func setBadgeCountWithBadgeCount(_ withBadgeCount: NSInteger, error: AutoreleasingUnsafeMutablePointer) { + UIApplication.shared.applicationIconBadgeNumber = withBadgeCount } - public func registerCallbackFunctionCallbackHandle(_ callbackHandle: NSNumber, error: AutoreleasingUnsafeMutablePointer) { + public func registerCallbackFunctionCallbackHandle(_ callbackHandle: NSInteger, error: AutoreleasingUnsafeMutablePointer) { // noop on iOS since this method is used to register callbacks on Android } } diff --git a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h index 20fb8b270b..599480018a 100644 --- a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h +++ b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h @@ -1,7 +1,7 @@ -// +// // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon #import @@ -32,12 +32,12 @@ typedef NS_ENUM(NSUInteger, PermissionStatus) { @interface PermissionsOptions : NSObject /// `init` unavailable to enforce nonnull fields, see the `make` class method. - (instancetype)init NS_UNAVAILABLE; -+ (instancetype)makeWithAlert:(NSNumber *)alert - sound:(NSNumber *)sound - badge:(NSNumber *)badge; -@property(nonatomic, strong) NSNumber * alert; -@property(nonatomic, strong) NSNumber * sound; -@property(nonatomic, strong) NSNumber * badge; ++ (instancetype)makeWithAlert:(BOOL )alert + sound:(BOOL )sound + badge:(BOOL )badge; +@property(nonatomic, assign) BOOL alert; +@property(nonatomic, assign) BOOL sound; +@property(nonatomic, assign) BOOL badge; @end @interface GetPermissionStatusResult : NSObject @@ -47,17 +47,16 @@ typedef NS_ENUM(NSUInteger, PermissionStatus) { @property(nonatomic, assign) PermissionStatus status; @end -/// The codec used by PushNotificationsFlutterApi. -NSObject *PushNotificationsFlutterApiGetCodec(void); +/// The codec used by all APIs. +NSObject *nullGetPushNotificationsNativePluginCodec(void); @interface PushNotificationsFlutterApi : NSObject - (instancetype)initWithBinaryMessenger:(id)binaryMessenger; +- (instancetype)initWithBinaryMessenger:(id)binaryMessenger messageChannelSuffix:(nullable NSString *)messageChannelSuffix; - (void)onNotificationReceivedInBackgroundWithPayload:(NSDictionary *)withPayload completion:(void (^)(FlutterError *_Nullable))completion; - (void)nullifyLaunchNotificationWithCompletion:(void (^)(FlutterError *_Nullable))completion; @end -/// The codec used by PushNotificationsHostApi. -NSObject *PushNotificationsHostApiGetCodec(void); @protocol PushNotificationsHostApi - (void)requestInitialTokenWithError:(FlutterError *_Nullable *_Nonnull)error; @@ -66,10 +65,12 @@ NSObject *PushNotificationsHostApiGetCodec(void); - (nullable NSDictionary *)getLaunchNotificationWithError:(FlutterError *_Nullable *_Nonnull)error; /// @return `nil` only when `error != nil`. - (nullable NSNumber *)getBadgeCountWithError:(FlutterError *_Nullable *_Nonnull)error; -- (void)setBadgeCountWithBadgeCount:(NSNumber *)withBadgeCount error:(FlutterError *_Nullable *_Nonnull)error; -- (void)registerCallbackFunctionCallbackHandle:(NSNumber *)callbackHandle error:(FlutterError *_Nullable *_Nonnull)error; +- (void)setBadgeCountWithBadgeCount:(NSInteger)withBadgeCount error:(FlutterError *_Nullable *_Nonnull)error; +- (void)registerCallbackFunctionCallbackHandle:(NSInteger)callbackHandle error:(FlutterError *_Nullable *_Nonnull)error; @end -extern void PushNotificationsHostApiSetup(id binaryMessenger, NSObject *_Nullable api); +extern void SetUpPushNotificationsHostApi(id binaryMessenger, NSObject *_Nullable api); + +extern void SetUpPushNotificationsHostApiWithSuffix(id binaryMessenger, NSObject *_Nullable api, NSString *messageChannelSuffix); NS_ASSUME_NONNULL_END diff --git a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m index 7222a7f689..a518a7a119 100644 --- a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m +++ b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m @@ -1,7 +1,7 @@ -// +// // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon #import "PushNotificationsNativePlugin.h" @@ -16,17 +16,7 @@ #error File requires ARC to be enabled. #endif -@implementation PermissionStatusBox -- (instancetype)initWithValue:(PermissionStatus)value { - self = [super init]; - if (self) { - _value = value; - } - return self; -} -@end - -static NSArray *wrapResult(id result, FlutterError *error) { +static NSArray *wrapResult(id result, FlutterError *error) { if (error) { return @[ error.code ?: [NSNull null], error.message ?: [NSNull null], error.details ?: [NSNull null] @@ -34,51 +24,63 @@ - (instancetype)initWithValue:(PermissionStatus)value { } return @[ result ?: [NSNull null] ]; } -static id GetNullableObjectAtIndex(NSArray *array, NSInteger key) { + +static FlutterError *createConnectionError(NSString *channelName) { + return [FlutterError errorWithCode:@"channel-error" message:[NSString stringWithFormat:@"%@/%@/%@", @"Unable to establish connection on channel: '", channelName, @"'."] details:@""]; +} + +static id GetNullableObjectAtIndex(NSArray *array, NSInteger key) { id result = array[key]; return (result == [NSNull null]) ? nil : result; } +@implementation PermissionStatusBox +- (instancetype)initWithValue:(PermissionStatus)value { + self = [super init]; + if (self) { + _value = value; + } + return self; +} +@end + @interface PermissionsOptions () -+ (PermissionsOptions *)fromList:(NSArray *)list; -+ (nullable PermissionsOptions *)nullableFromList:(NSArray *)list; -- (NSArray *)toList; ++ (PermissionsOptions *)fromList:(NSArray *)list; ++ (nullable PermissionsOptions *)nullableFromList:(NSArray *)list; +- (NSArray *)toList; @end @interface GetPermissionStatusResult () -+ (GetPermissionStatusResult *)fromList:(NSArray *)list; -+ (nullable GetPermissionStatusResult *)nullableFromList:(NSArray *)list; -- (NSArray *)toList; ++ (GetPermissionStatusResult *)fromList:(NSArray *)list; ++ (nullable GetPermissionStatusResult *)nullableFromList:(NSArray *)list; +- (NSArray *)toList; @end @implementation PermissionsOptions -+ (instancetype)makeWithAlert:(NSNumber *)alert - sound:(NSNumber *)sound - badge:(NSNumber *)badge { ++ (instancetype)makeWithAlert:(BOOL )alert + sound:(BOOL )sound + badge:(BOOL )badge { PermissionsOptions* pigeonResult = [[PermissionsOptions alloc] init]; pigeonResult.alert = alert; pigeonResult.sound = sound; pigeonResult.badge = badge; return pigeonResult; } -+ (PermissionsOptions *)fromList:(NSArray *)list { ++ (PermissionsOptions *)fromList:(NSArray *)list { PermissionsOptions *pigeonResult = [[PermissionsOptions alloc] init]; - pigeonResult.alert = GetNullableObjectAtIndex(list, 0); - NSAssert(pigeonResult.alert != nil, @""); - pigeonResult.sound = GetNullableObjectAtIndex(list, 1); - NSAssert(pigeonResult.sound != nil, @""); - pigeonResult.badge = GetNullableObjectAtIndex(list, 2); - NSAssert(pigeonResult.badge != nil, @""); + pigeonResult.alert = [GetNullableObjectAtIndex(list, 0) boolValue]; + pigeonResult.sound = [GetNullableObjectAtIndex(list, 1) boolValue]; + pigeonResult.badge = [GetNullableObjectAtIndex(list, 2) boolValue]; return pigeonResult; } -+ (nullable PermissionsOptions *)nullableFromList:(NSArray *)list { ++ (nullable PermissionsOptions *)nullableFromList:(NSArray *)list { return (list) ? [PermissionsOptions fromList:list] : nil; } -- (NSArray *)toList { +- (NSArray *)toList { return @[ - (self.alert ?: [NSNull null]), - (self.sound ?: [NSNull null]), - (self.badge ?: [NSNull null]), + @(self.alert), + @(self.sound), + @(self.badge), ]; } @end @@ -89,45 +91,54 @@ + (instancetype)makeWithStatus:(PermissionStatus)status { pigeonResult.status = status; return pigeonResult; } -+ (GetPermissionStatusResult *)fromList:(NSArray *)list { ++ (GetPermissionStatusResult *)fromList:(NSArray *)list { GetPermissionStatusResult *pigeonResult = [[GetPermissionStatusResult alloc] init]; - pigeonResult.status = [GetNullableObjectAtIndex(list, 0) integerValue]; + PermissionStatusBox *boxedPermissionStatus = GetNullableObjectAtIndex(list, 0); + pigeonResult.status = boxedPermissionStatus.value; return pigeonResult; } -+ (nullable GetPermissionStatusResult *)nullableFromList:(NSArray *)list { ++ (nullable GetPermissionStatusResult *)nullableFromList:(NSArray *)list { return (list) ? [GetPermissionStatusResult fromList:list] : nil; } -- (NSArray *)toList { +- (NSArray *)toList { return @[ - @(self.status), + [[PermissionStatusBox alloc] initWithValue:self.status], ]; } @end -@interface PushNotificationsFlutterApiCodecReader : FlutterStandardReader +@interface nullPushNotificationsNativePluginPigeonCodecReader : FlutterStandardReader @end -@implementation PushNotificationsFlutterApiCodecReader +@implementation nullPushNotificationsNativePluginPigeonCodecReader - (nullable id)readValueOfType:(UInt8)type { switch (type) { - case 128: - return [GetPermissionStatusResult fromList:[self readValue]]; - case 129: + case 129: { + NSNumber *enumAsNumber = [self readValue]; + return enumAsNumber == nil ? nil : [[PermissionStatusBox alloc] initWithValue:[enumAsNumber integerValue]]; + } + case 130: return [PermissionsOptions fromList:[self readValue]]; + case 131: + return [GetPermissionStatusResult fromList:[self readValue]]; default: return [super readValueOfType:type]; } } @end -@interface PushNotificationsFlutterApiCodecWriter : FlutterStandardWriter +@interface nullPushNotificationsNativePluginPigeonCodecWriter : FlutterStandardWriter @end -@implementation PushNotificationsFlutterApiCodecWriter +@implementation nullPushNotificationsNativePluginPigeonCodecWriter - (void)writeValue:(id)value { - if ([value isKindOfClass:[GetPermissionStatusResult class]]) { - [self writeByte:128]; - [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[PermissionsOptions class]]) { + if ([value isKindOfClass:[PermissionStatusBox class]]) { + PermissionStatusBox *box = (PermissionStatusBox *)value; [self writeByte:129]; + [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])]; + } else if ([value isKindOfClass:[PermissionsOptions class]]) { + [self writeByte:130]; + [self writeValue:[value toList]]; + } else if ([value isKindOfClass:[GetPermissionStatusResult class]]) { + [self writeByte:131]; [self writeValue:[value toList]]; } else { [super writeValue:value]; @@ -135,121 +146,96 @@ - (void)writeValue:(id)value { } @end -@interface PushNotificationsFlutterApiCodecReaderWriter : FlutterStandardReaderWriter +@interface nullPushNotificationsNativePluginPigeonCodecReaderWriter : FlutterStandardReaderWriter @end -@implementation PushNotificationsFlutterApiCodecReaderWriter +@implementation nullPushNotificationsNativePluginPigeonCodecReaderWriter - (FlutterStandardWriter *)writerWithData:(NSMutableData *)data { - return [[PushNotificationsFlutterApiCodecWriter alloc] initWithData:data]; + return [[nullPushNotificationsNativePluginPigeonCodecWriter alloc] initWithData:data]; } - (FlutterStandardReader *)readerWithData:(NSData *)data { - return [[PushNotificationsFlutterApiCodecReader alloc] initWithData:data]; + return [[nullPushNotificationsNativePluginPigeonCodecReader alloc] initWithData:data]; } @end -NSObject *PushNotificationsFlutterApiGetCodec(void) { +NSObject *nullGetPushNotificationsNativePluginCodec(void) { static FlutterStandardMessageCodec *sSharedObject = nil; static dispatch_once_t sPred = 0; dispatch_once(&sPred, ^{ - PushNotificationsFlutterApiCodecReaderWriter *readerWriter = [[PushNotificationsFlutterApiCodecReaderWriter alloc] init]; + nullPushNotificationsNativePluginPigeonCodecReaderWriter *readerWriter = [[nullPushNotificationsNativePluginPigeonCodecReaderWriter alloc] init]; sSharedObject = [FlutterStandardMessageCodec codecWithReaderWriter:readerWriter]; }); return sSharedObject; } - @interface PushNotificationsFlutterApi () @property(nonatomic, strong) NSObject *binaryMessenger; +@property(nonatomic, strong) NSString *messageChannelSuffix; @end @implementation PushNotificationsFlutterApi - (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger { - self = [super init]; + return [self initWithBinaryMessenger:binaryMessenger messageChannelSuffix:@""]; +} +- (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger messageChannelSuffix:(nullable NSString*)messageChannelSuffix{ + self = [self init]; if (self) { _binaryMessenger = binaryMessenger; + _messageChannelSuffix = [messageChannelSuffix length] == 0 ? @"" : [NSString stringWithFormat: @".%@", messageChannelSuffix]; } return self; } - (void)onNotificationReceivedInBackgroundWithPayload:(NSDictionary *)arg_withPayload completion:(void (^)(FlutterError *_Nullable))completion { + NSString *channelName = [NSString stringWithFormat:@"%@%@", @"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.onNotificationReceivedInBackground", _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.onNotificationReceivedInBackground" + messageChannelWithName:channelName binaryMessenger:self.binaryMessenger - codec:PushNotificationsFlutterApiGetCodec()]; - [channel sendMessage:@[arg_withPayload ?: [NSNull null]] reply:^(id reply) { - completion(nil); + codec:nullGetPushNotificationsNativePluginCodec()]; + [channel sendMessage:@[arg_withPayload ?: [NSNull null]] reply:^(NSArray *reply) { + if (reply != nil) { + if (reply.count > 1) { + completion([FlutterError errorWithCode:reply[0] message:reply[1] details:reply[2]]); + } else { + completion(nil); + } + } else { + completion(createConnectionError(channelName)); + } }]; } - (void)nullifyLaunchNotificationWithCompletion:(void (^)(FlutterError *_Nullable))completion { + NSString *channelName = [NSString stringWithFormat:@"%@%@", @"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.nullifyLaunchNotification", _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.nullifyLaunchNotification" + messageChannelWithName:channelName binaryMessenger:self.binaryMessenger - codec:PushNotificationsFlutterApiGetCodec()]; - [channel sendMessage:nil reply:^(id reply) { - completion(nil); + codec:nullGetPushNotificationsNativePluginCodec()]; + [channel sendMessage:nil reply:^(NSArray *reply) { + if (reply != nil) { + if (reply.count > 1) { + completion([FlutterError errorWithCode:reply[0] message:reply[1] details:reply[2]]); + } else { + completion(nil); + } + } else { + completion(createConnectionError(channelName)); + } }]; } @end -@interface PushNotificationsHostApiCodecReader : FlutterStandardReader -@end -@implementation PushNotificationsHostApiCodecReader -- (nullable id)readValueOfType:(UInt8)type { - switch (type) { - case 128: - return [GetPermissionStatusResult fromList:[self readValue]]; - case 129: - return [PermissionsOptions fromList:[self readValue]]; - default: - return [super readValueOfType:type]; - } -} -@end - -@interface PushNotificationsHostApiCodecWriter : FlutterStandardWriter -@end -@implementation PushNotificationsHostApiCodecWriter -- (void)writeValue:(id)value { - if ([value isKindOfClass:[GetPermissionStatusResult class]]) { - [self writeByte:128]; - [self writeValue:[value toList]]; - } else if ([value isKindOfClass:[PermissionsOptions class]]) { - [self writeByte:129]; - [self writeValue:[value toList]]; - } else { - [super writeValue:value]; - } -} -@end - -@interface PushNotificationsHostApiCodecReaderWriter : FlutterStandardReaderWriter -@end -@implementation PushNotificationsHostApiCodecReaderWriter -- (FlutterStandardWriter *)writerWithData:(NSMutableData *)data { - return [[PushNotificationsHostApiCodecWriter alloc] initWithData:data]; -} -- (FlutterStandardReader *)readerWithData:(NSData *)data { - return [[PushNotificationsHostApiCodecReader alloc] initWithData:data]; -} -@end - -NSObject *PushNotificationsHostApiGetCodec(void) { - static FlutterStandardMessageCodec *sSharedObject = nil; - static dispatch_once_t sPred = 0; - dispatch_once(&sPred, ^{ - PushNotificationsHostApiCodecReaderWriter *readerWriter = [[PushNotificationsHostApiCodecReaderWriter alloc] init]; - sSharedObject = [FlutterStandardMessageCodec codecWithReaderWriter:readerWriter]; - }); - return sSharedObject; +void SetUpPushNotificationsHostApi(id binaryMessenger, NSObject *api) { + SetUpPushNotificationsHostApiWithSuffix(binaryMessenger, api, @""); } -void PushNotificationsHostApiSetup(id binaryMessenger, NSObject *api) { +void SetUpPushNotificationsHostApiWithSuffix(id binaryMessenger, NSObject *api, NSString *messageChannelSuffix) { + messageChannelSuffix = messageChannelSuffix.length > 0 ? [NSString stringWithFormat: @".%@", messageChannelSuffix] : @""; { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestInitialToken" + initWithName:[NSString stringWithFormat:@"%@%@", @"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestInitialToken", messageChannelSuffix] binaryMessenger:binaryMessenger - codec:PushNotificationsHostApiGetCodec()]; + codec:nullGetPushNotificationsNativePluginCodec()]; if (api) { NSCAssert([api respondsToSelector:@selector(requestInitialTokenWithError:)], @"PushNotificationsHostApi api (%@) doesn't respond to @selector(requestInitialTokenWithError:)", api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { @@ -264,9 +250,9 @@ void PushNotificationsHostApiSetup(id binaryMessenger, N { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getPermissionStatus" + initWithName:[NSString stringWithFormat:@"%@%@", @"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getPermissionStatus", messageChannelSuffix] binaryMessenger:binaryMessenger - codec:PushNotificationsHostApiGetCodec()]; + codec:nullGetPushNotificationsNativePluginCodec()]; if (api) { NSCAssert([api respondsToSelector:@selector(getPermissionStatusWithCompletion:)], @"PushNotificationsHostApi api (%@) doesn't respond to @selector(getPermissionStatusWithCompletion:)", api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { @@ -281,13 +267,13 @@ void PushNotificationsHostApiSetup(id binaryMessenger, N { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestPermissions" + initWithName:[NSString stringWithFormat:@"%@%@", @"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestPermissions", messageChannelSuffix] binaryMessenger:binaryMessenger - codec:PushNotificationsHostApiGetCodec()]; + codec:nullGetPushNotificationsNativePluginCodec()]; if (api) { NSCAssert([api respondsToSelector:@selector(requestPermissionsWithPermissionOptions:completion:)], @"PushNotificationsHostApi api (%@) doesn't respond to @selector(requestPermissionsWithPermissionOptions:completion:)", api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { - NSArray *args = message; + NSArray *args = message; PermissionsOptions *arg_withPermissionOptions = GetNullableObjectAtIndex(args, 0); [api requestPermissionsWithPermissionOptions:arg_withPermissionOptions completion:^(NSNumber *_Nullable output, FlutterError *_Nullable error) { callback(wrapResult(output, error)); @@ -300,9 +286,9 @@ void PushNotificationsHostApiSetup(id binaryMessenger, N { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getLaunchNotification" + initWithName:[NSString stringWithFormat:@"%@%@", @"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getLaunchNotification", messageChannelSuffix] binaryMessenger:binaryMessenger - codec:PushNotificationsHostApiGetCodec()]; + codec:nullGetPushNotificationsNativePluginCodec()]; if (api) { NSCAssert([api respondsToSelector:@selector(getLaunchNotificationWithError:)], @"PushNotificationsHostApi api (%@) doesn't respond to @selector(getLaunchNotificationWithError:)", api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { @@ -317,9 +303,9 @@ void PushNotificationsHostApiSetup(id binaryMessenger, N { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getBadgeCount" + initWithName:[NSString stringWithFormat:@"%@%@", @"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getBadgeCount", messageChannelSuffix] binaryMessenger:binaryMessenger - codec:PushNotificationsHostApiGetCodec()]; + codec:nullGetPushNotificationsNativePluginCodec()]; if (api) { NSCAssert([api respondsToSelector:@selector(getBadgeCountWithError:)], @"PushNotificationsHostApi api (%@) doesn't respond to @selector(getBadgeCountWithError:)", api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { @@ -334,14 +320,14 @@ void PushNotificationsHostApiSetup(id binaryMessenger, N { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.setBadgeCount" + initWithName:[NSString stringWithFormat:@"%@%@", @"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.setBadgeCount", messageChannelSuffix] binaryMessenger:binaryMessenger - codec:PushNotificationsHostApiGetCodec()]; + codec:nullGetPushNotificationsNativePluginCodec()]; if (api) { NSCAssert([api respondsToSelector:@selector(setBadgeCountWithBadgeCount:error:)], @"PushNotificationsHostApi api (%@) doesn't respond to @selector(setBadgeCountWithBadgeCount:error:)", api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { - NSArray *args = message; - NSNumber *arg_withBadgeCount = GetNullableObjectAtIndex(args, 0); + NSArray *args = message; + NSInteger arg_withBadgeCount = [GetNullableObjectAtIndex(args, 0) integerValue]; FlutterError *error; [api setBadgeCountWithBadgeCount:arg_withBadgeCount error:&error]; callback(wrapResult(nil, error)); @@ -353,14 +339,14 @@ void PushNotificationsHostApiSetup(id binaryMessenger, N { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.registerCallbackFunction" + initWithName:[NSString stringWithFormat:@"%@%@", @"dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.registerCallbackFunction", messageChannelSuffix] binaryMessenger:binaryMessenger - codec:PushNotificationsHostApiGetCodec()]; + codec:nullGetPushNotificationsNativePluginCodec()]; if (api) { NSCAssert([api respondsToSelector:@selector(registerCallbackFunctionCallbackHandle:error:)], @"PushNotificationsHostApi api (%@) doesn't respond to @selector(registerCallbackFunctionCallbackHandle:error:)", api); [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { - NSArray *args = message; - NSNumber *arg_callbackHandle = GetNullableObjectAtIndex(args, 0); + NSArray *args = message; + NSInteger arg_callbackHandle = [GetNullableObjectAtIndex(args, 0) integerValue]; FlutterError *error; [api registerCallbackFunctionCallbackHandle:arg_callbackHandle error:&error]; callback(wrapResult(nil, error)); diff --git a/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart b/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart index 9893eed5a2..6b416d1b3a 100644 --- a/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart +++ b/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart @@ -1,9 +1,9 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v11.0.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; @@ -11,6 +11,24 @@ import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +PlatformException _createConnectionError(String channelName) { + return PlatformException( + code: 'channel-error', + message: 'Unable to establish connection on channel: "$channelName".', + ); +} + +List wrapResponse( + {Object? result, PlatformException? error, bool empty = false}) { + if (empty) { + return []; + } + if (error == null) { + return [result]; + } + return [error.code, error.message, error.details]; +} + enum PermissionStatus { shouldRequest, shouldExplainThenRequest, @@ -58,27 +76,33 @@ class GetPermissionStatusResult { Object encode() { return [ - status.index, + status, ]; } static GetPermissionStatusResult decode(Object result) { result as List; return GetPermissionStatusResult( - status: PermissionStatus.values[result[0]! as int], + status: result[0]! as PermissionStatus, ); } } -class _PushNotificationsFlutterApiCodec extends StandardMessageCodec { - const _PushNotificationsFlutterApiCodec(); +class _PigeonCodec extends StandardMessageCodec { + const _PigeonCodec(); @override void writeValue(WriteBuffer buffer, Object? value) { - if (value is GetPermissionStatusResult) { - buffer.putUint8(128); - writeValue(buffer, value.encode()); - } else if (value is PermissionsOptions) { + if (value is int) { + buffer.putUint8(4); + buffer.putInt64(value); + } else if (value is PermissionStatus) { buffer.putUint8(129); + writeValue(buffer, value.index); + } else if (value is PermissionsOptions) { + buffer.putUint8(130); + writeValue(buffer, value.encode()); + } else if (value is GetPermissionStatusResult) { + buffer.putUint8(131); writeValue(buffer, value.encode()); } else { super.writeValue(buffer, value); @@ -88,10 +112,13 @@ class _PushNotificationsFlutterApiCodec extends StandardMessageCodec { @override Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { - case 128: - return GetPermissionStatusResult.decode(readValue(buffer)!); case 129: + final int? value = readValue(buffer) as int?; + return value == null ? null : PermissionStatus.values[value]; + case 130: return PermissionsOptions.decode(readValue(buffer)!); + case 131: + return GetPermissionStatusResult.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); } @@ -99,25 +126,31 @@ class _PushNotificationsFlutterApiCodec extends StandardMessageCodec { } abstract class PushNotificationsFlutterApi { - static const MessageCodec codec = - _PushNotificationsFlutterApiCodec(); + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); Future onNotificationReceivedInBackground( Map withPayload); void nullifyLaunchNotification(); - static void setup(PushNotificationsFlutterApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + PushNotificationsFlutterApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.onNotificationReceivedInBackground', - codec, + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< + Object?>( + 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.onNotificationReceivedInBackground$messageChannelSuffix', + pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - channel.setMessageHandler((Object? message) async { + pigeonVar_channel.setMessageHandler((Object? message) async { assert(message != null, 'Argument for dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.onNotificationReceivedInBackground was null.'); final List args = (message as List?)!; @@ -125,83 +158,77 @@ abstract class PushNotificationsFlutterApi { (args[0] as Map?)?.cast(); assert(arg_withPayload != null, 'Argument for dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.onNotificationReceivedInBackground was null, expected non-null Map.'); - await api.onNotificationReceivedInBackground(arg_withPayload!); - return; + try { + await api.onNotificationReceivedInBackground(arg_withPayload!); + return wrapResponse(empty: true); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString())); + } }); } } { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.nullifyLaunchNotification', - codec, + final BasicMessageChannel< + Object?> pigeonVar_channel = BasicMessageChannel< + Object?>( + 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsFlutterApi.nullifyLaunchNotification$messageChannelSuffix', + pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { - channel.setMessageHandler(null); + pigeonVar_channel.setMessageHandler(null); } else { - channel.setMessageHandler((Object? message) async { - // ignore message - api.nullifyLaunchNotification(); - return; + pigeonVar_channel.setMessageHandler((Object? message) async { + try { + api.nullifyLaunchNotification(); + return wrapResponse(empty: true); + } on PlatformException catch (e) { + return wrapResponse(error: e); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString())); + } }); } } } } -class _PushNotificationsHostApiCodec extends StandardMessageCodec { - const _PushNotificationsHostApiCodec(); - @override - void writeValue(WriteBuffer buffer, Object? value) { - if (value is GetPermissionStatusResult) { - buffer.putUint8(128); - writeValue(buffer, value.encode()); - } else if (value is PermissionsOptions) { - buffer.putUint8(129); - writeValue(buffer, value.encode()); - } else { - super.writeValue(buffer, value); - } - } - - @override - Object? readValueOfType(int type, ReadBuffer buffer) { - switch (type) { - case 128: - return GetPermissionStatusResult.decode(readValue(buffer)!); - case 129: - return PermissionsOptions.decode(readValue(buffer)!); - default: - return super.readValueOfType(type, buffer); - } - } -} - class PushNotificationsHostApi { /// Constructor for [PushNotificationsHostApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - PushNotificationsHostApi({BinaryMessenger? binaryMessenger}) - : _binaryMessenger = binaryMessenger; - final BinaryMessenger? _binaryMessenger; + PushNotificationsHostApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + final BinaryMessenger? pigeonVar_binaryMessenger; + + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); - static const MessageCodec codec = _PushNotificationsHostApiCodec(); + final String pigeonVar_messageChannelSuffix; Future requestInitialToken() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestInitialToken', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send(null) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestInitialToken$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; @@ -209,150 +236,160 @@ class PushNotificationsHostApi { } Future getPermissionStatus() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getPermissionStatus', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send(null) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getPermissionStatus$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (replyList[0] as GetPermissionStatusResult?)!; + return (pigeonVar_replyList[0] as GetPermissionStatusResult?)!; } } Future requestPermissions( - PermissionsOptions arg_withPermissionOptions) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestPermissions', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel - .send([arg_withPermissionOptions]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + PermissionsOptions withPermissionOptions) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.requestPermissions$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([withPermissionOptions]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } Future?> getLaunchNotification() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getLaunchNotification', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send(null) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getLaunchNotification$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { - return (replyList[0] as Map?)?.cast(); + return (pigeonVar_replyList[0] as Map?) + ?.cast(); } } Future getBadgeCount() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getBadgeCount', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel.send(null) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.getBadgeCount$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send(null) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (replyList[0] as int?)!; + return (pigeonVar_replyList[0] as int?)!; } } - Future setBadgeCount(int arg_withBadgeCount) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.setBadgeCount', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_withBadgeCount]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + Future setBadgeCount(int withBadgeCount) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.setBadgeCount$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([withBadgeCount]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; } } - Future registerCallbackFunction(int arg_callbackHandle) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.registerCallbackFunction', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_callbackHandle]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + Future registerCallbackFunction(int callbackHandle) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_push_notifications.PushNotificationsHostApi.registerCallbackFunction$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([callbackHandle]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; diff --git a/packages/notifications/push/amplify_push_notifications/lib/src/push_notifications_flutter_api.dart b/packages/notifications/push/amplify_push_notifications/lib/src/push_notifications_flutter_api.dart index 0bd7a970cb..c58dba4a5e 100644 --- a/packages/notifications/push/amplify_push_notifications/lib/src/push_notifications_flutter_api.dart +++ b/packages/notifications/push/amplify_push_notifications/lib/src/push_notifications_flutter_api.dart @@ -21,14 +21,14 @@ class AmplifyPushNotificationsFlutterApi implements PushNotificationsFlutterApi { /// {@macro amplify_push_notifications.amplify_push_notifications_flutter_api} AmplifyPushNotificationsFlutterApi._constructor() { - PushNotificationsFlutterApi.setup(this); + PushNotificationsFlutterApi.setUp(this); } /// {@template amplify_push_notifications.amplify_push_notifications_flutter_api.reset} /// Ability to reset the singleton only used for resetting between tests. /// {@endtemplate} static void reset() { - PushNotificationsFlutterApi.setup(null); + PushNotificationsFlutterApi.setUp(null); _instance = AmplifyPushNotificationsFlutterApi._constructor(); } diff --git a/packages/notifications/push/amplify_push_notifications/pubspec.yaml b/packages/notifications/push/amplify_push_notifications/pubspec.yaml index 329d9e128d..cb46ed922f 100644 --- a/packages/notifications/push/amplify_push_notifications/pubspec.yaml +++ b/packages/notifications/push/amplify_push_notifications/pubspec.yaml @@ -5,8 +5,8 @@ homepage: https://docs.amplify.aws/lib/q/platform/flutter/ issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_core: ">=2.6.0 <2.7.0" @@ -29,7 +29,7 @@ dev_dependencies: flutter_test: sdk: flutter mockito: ^5.0.0 - pigeon: ^11.0.0 + pigeon: ^22.6.2 test: ^1.22.1 flutter: diff --git a/packages/notifications/push/amplify_push_notifications/test/push_notification_flutter_api_test.dart b/packages/notifications/push/amplify_push_notifications/test/push_notification_flutter_api_test.dart index 0035960d22..9f91f710a3 100644 --- a/packages/notifications/push/amplify_push_notifications/test/push_notification_flutter_api_test.dart +++ b/packages/notifications/push/amplify_push_notifications/test/push_notification_flutter_api_test.dart @@ -13,6 +13,7 @@ import 'amplify_push_notifications_impl_test.mocks.dart'; import 'test_data/fake_notification_messges.dart'; import 'test_data/test_amplify_push_notifications_impl.dart'; +@pragma('vm:entry-point') void testGlobalCallbackFunction(PushNotificationMessage pushMessage) { expect( pushMessage.title, diff --git a/packages/notifications/push/amplify_push_notifications_pinpoint/example/pubspec.yaml b/packages/notifications/push/amplify_push_notifications_pinpoint/example/pubspec.yaml index 0982354afe..66af1f073d 100644 --- a/packages/notifications/push/amplify_push_notifications_pinpoint/example/pubspec.yaml +++ b/packages/notifications/push/amplify_push_notifications_pinpoint/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the amplify_push_notifications_pinpoint plu publish_to: "none" # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_auth_cognito: ">=1.0.0-next.8 <1.0.0-next.9" diff --git a/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml b/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml index 3e463d3c66..f46f24388f 100644 --- a/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml +++ b/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml @@ -5,8 +5,8 @@ homepage: https://docs.amplify.aws/lib/q/platform/flutter/ issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" # Helps `pana` since it does not detect Android support. platforms: @@ -33,7 +33,7 @@ dev_dependencies: aws_common: ">=0.7.3 <0.8.0" aws_signature_v4: ">=0.6.3 <0.7.0" build_runner: ^2.4.9 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 flutter_test: sdk: flutter mocktail: ^1.0.0 diff --git a/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt index 7905f901cc..74c5cbd050 100644 --- a/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt +++ b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt @@ -1,8 +1,9 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// -// Autogenerated from Pigeon (v11.0.0), do not edit directly. +// +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon +@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") package com.amazonaws.amplify.amplify_secure_storage.pigeons @@ -19,14 +20,14 @@ private fun wrapResult(result: Any?): List { } private fun wrapError(exception: Throwable): List { - if (exception is FlutterError) { - return listOf( + return if (exception is FlutterError) { + listOf( exception.code, exception.message, exception.details ) } else { - return listOf( + listOf( exception.javaClass.simpleName, exception.toString(), "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception) @@ -45,6 +46,15 @@ class FlutterError ( override val message: String? = null, val details: Any? = null ) : Throwable() +private open class AmplifySecureStoragePigeonPigeonCodec : StandardMessageCodec() { + override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? { + return super.readValueOfType(type, buffer) + } + override fun writeValue(stream: ByteArrayOutputStream, value: Any?) { + super.writeValue(stream, value) + } +} + /** * A pigeon for interacting with the native AmplifySecureStorage implementation @@ -61,14 +71,15 @@ interface AmplifySecureStoragePigeon { companion object { /** The codec used by AmplifySecureStoragePigeon. */ val codec: MessageCodec by lazy { - StandardMessageCodec() + AmplifySecureStoragePigeonPigeonCodec() } /** Sets up an instance of `AmplifySecureStoragePigeon` to handle messages through the `binaryMessenger`. */ - @Suppress("UNCHECKED_CAST") - fun setUp(binaryMessenger: BinaryMessenger, api: AmplifySecureStoragePigeon?) { + @JvmOverloads + fun setUp(binaryMessenger: BinaryMessenger, api: AmplifySecureStoragePigeon?, messageChannelSuffix: String = "") { + val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" run { val taskQueue = binaryMessenger.makeBackgroundTaskQueue() - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.read", codec, taskQueue) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.read$separatedMessageChannelSuffix", codec, taskQueue) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -90,7 +101,7 @@ interface AmplifySecureStoragePigeon { } run { val taskQueue = binaryMessenger.makeBackgroundTaskQueue() - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.write", codec, taskQueue) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.write$separatedMessageChannelSuffix", codec, taskQueue) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -112,7 +123,7 @@ interface AmplifySecureStoragePigeon { } run { val taskQueue = binaryMessenger.makeBackgroundTaskQueue() - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.delete", codec, taskQueue) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.delete$separatedMessageChannelSuffix", codec, taskQueue) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List @@ -133,7 +144,7 @@ interface AmplifySecureStoragePigeon { } run { val taskQueue = binaryMessenger.makeBackgroundTaskQueue() - val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.removeAll", codec, taskQueue) + val channel = BasicMessageChannel(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.removeAll$separatedMessageChannelSuffix", codec, taskQueue) if (api != null) { channel.setMessageHandler { message, reply -> val args = message as List diff --git a/packages/secure_storage/amplify_secure_storage/example/android/app/build.gradle b/packages/secure_storage/amplify_secure_storage/example/android/app/build.gradle index 80eacabc63..8afb653888 100644 --- a/packages/secure_storage/amplify_secure_storage/example/android/app/build.gradle +++ b/packages/secure_storage/amplify_secure_storage/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace 'com.amazonaws.amplify.amplify_secure_storage_example' compileSdk flutter.compileSdkVersion @@ -67,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/packages/secure_storage/amplify_secure_storage/example/android/build.gradle b/packages/secure_storage/amplify_secure_storage/example/android/build.gradle index 070b4ffbfd..bc157bd1a1 100644 --- a/packages/secure_storage/amplify_secure_storage/example/android/build.gradle +++ b/packages/secure_storage/amplify_secure_storage/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/packages/secure_storage/amplify_secure_storage/example/android/settings.gradle b/packages/secure_storage/amplify_secure_storage/example/android/settings.gradle index 44e62bcf06..276cdabf9c 100644 --- a/packages/secure_storage/amplify_secure_storage/example/android/settings.gradle +++ b/packages/secure_storage/amplify_secure_storage/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.10" apply false +} + +include ":app" diff --git a/packages/secure_storage/amplify_secure_storage/example/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/example/pubspec.yaml index 3d50c7024d..7a2cfea339 100644 --- a/packages/secure_storage/amplify_secure_storage/example/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage/example/pubspec.yaml @@ -4,8 +4,8 @@ description: Demonstrates how to use the amplify_secure_storage plugin and house publish_to: "none" environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_secure_storage: ">=0.3.0 <0.4.0" diff --git a/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift b/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift index f546fbe25d..d6cfe5e204 100644 --- a/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift +++ b/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift @@ -1,20 +1,35 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// -// Autogenerated from Pigeon (v11.0.0), do not edit directly. +// +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation + #if os(iOS) -import Flutter + import Flutter #elseif os(macOS) -import FlutterMacOS + import FlutterMacOS #else -#error("Unsupported platform.") + #error("Unsupported platform.") #endif -private func isNullish(_ value: Any?) -> Bool { - return value is NSNull || value == nil +/// Error class for passing custom error details to Dart side. +final class PigeonError: Error { + let code: String + let message: String? + let details: Any? + + init(code: String, message: String?, details: Any?) { + self.code = code + self.message = message + self.details = details + } + + var localizedDescription: String { + return + "PigeonError(code: \(code), message: \(message ?? ""), details: \(details ?? "")" + } } private func wrapResult(_ result: Any?) -> [Any?] { @@ -22,24 +37,56 @@ private func wrapResult(_ result: Any?) -> [Any?] { } private func wrapError(_ error: Any) -> [Any?] { + if let pigeonError = error as? PigeonError { + return [ + pigeonError.code, + pigeonError.message, + pigeonError.details, + ] + } if let flutterError = error as? FlutterError { return [ flutterError.code, flutterError.message, - flutterError.details + flutterError.details, ] } return [ "\(error)", "\(type(of: error))", - "Stacktrace: \(Thread.callStackSymbols)" + "Stacktrace: \(Thread.callStackSymbols)", ] } +private func isNullish(_ value: Any?) -> Bool { + return value is NSNull || value == nil +} + private func nilOrValue(_ value: Any?) -> T? { if value is NSNull { return nil } return value as! T? } + +private class NSUserDefaultsPigeonPigeonCodecReader: FlutterStandardReader { +} + +private class NSUserDefaultsPigeonPigeonCodecWriter: FlutterStandardWriter { +} + +private class NSUserDefaultsPigeonPigeonCodecReaderWriter: FlutterStandardReaderWriter { + override func reader(with data: Data) -> FlutterStandardReader { + return NSUserDefaultsPigeonPigeonCodecReader(data: data) + } + + override func writer(with data: NSMutableData) -> FlutterStandardWriter { + return NSUserDefaultsPigeonPigeonCodecWriter(data: data) + } +} + +class NSUserDefaultsPigeonPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable { + static let shared = NSUserDefaultsPigeonPigeonCodec(readerWriter: NSUserDefaultsPigeonPigeonCodecReaderWriter()) +} + /// A pigeon for interacting with the NSUserDefaults API on iOS and macOS. /// /// Generated protocol from Pigeon that represents a handler of messages from Flutter. @@ -50,10 +97,11 @@ protocol NSUserDefaultsPigeon { /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. class NSUserDefaultsPigeonSetup { - /// The codec used by NSUserDefaultsPigeon. + static var codec: FlutterStandardMessageCodec { NSUserDefaultsPigeonPigeonCodec.shared } /// Sets up an instance of `NSUserDefaultsPigeon` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NSUserDefaultsPigeon?) { - let setBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.setBool", binaryMessenger: binaryMessenger) + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NSUserDefaultsPigeon?, messageChannelSuffix: String = "") { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" + let setBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.setBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { setBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -69,7 +117,7 @@ class NSUserDefaultsPigeonSetup { } else { setBoolChannel.setMessageHandler(nil) } - let boolForChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.boolFor", binaryMessenger: binaryMessenger) + let boolForChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.boolFor\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { boolForChannel.setMessageHandler { message, reply in let args = message as! [Any?] diff --git a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart index 6d632294bf..ab1fa4ef77 100644 --- a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart +++ b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart @@ -1,9 +1,9 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // -// Autogenerated from Pigeon (v11.0.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; @@ -11,105 +11,141 @@ import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +PlatformException _createConnectionError(String channelName) { + return PlatformException( + code: 'channel-error', + message: 'Unable to establish connection on channel: "$channelName".', + ); +} + +class _PigeonCodec extends StandardMessageCodec { + const _PigeonCodec(); + @override + void writeValue(WriteBuffer buffer, Object? value) { + if (value is int) { + buffer.putUint8(4); + buffer.putInt64(value); + } else { + super.writeValue(buffer, value); + } + } + + @override + Object? readValueOfType(int type, ReadBuffer buffer) { + switch (type) { + default: + return super.readValueOfType(type, buffer); + } + } +} + /// A pigeon for interacting with the native AmplifySecureStorage implementation /// on Android. class AmplifySecureStoragePigeon { /// Constructor for [AmplifySecureStoragePigeon]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - AmplifySecureStoragePigeon({BinaryMessenger? binaryMessenger}) - : _binaryMessenger = binaryMessenger; - final BinaryMessenger? _binaryMessenger; + AmplifySecureStoragePigeon( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + final BinaryMessenger? pigeonVar_binaryMessenger; - static const MessageCodec codec = StandardMessageCodec(); + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); - Future read(String arg_namespace, String arg_key) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.read', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_namespace, arg_key]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_messageChannelSuffix; + + Future read(String namespace, String key) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.read$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([namespace, key]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { - return (replyList[0] as String?); + return (pigeonVar_replyList[0] as String?); } } - Future write( - String arg_namespace, String arg_key, String? arg_value) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.write', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = await channel - .send([arg_namespace, arg_key, arg_value]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + Future write(String namespace, String key, String? value) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.write$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([namespace, key, value]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; } } - Future delete(String arg_namespace, String arg_key) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.delete', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_namespace, arg_key]) as List?; - if (replyList == null) { + Future delete(String namespace, String key) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.delete$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = await pigeonVar_channel + .send([namespace, key]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { - throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; } } - Future removeAll(String arg_namespace) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.removeAll', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_namespace]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + Future removeAll(String namespace) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.removeAll$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send([namespace]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; diff --git a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart index 94f386adf1..c0493f9b47 100644 --- a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart +++ b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart @@ -1,9 +1,9 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // -// Autogenerated from Pigeon (v11.0.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; @@ -11,65 +11,100 @@ import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +PlatformException _createConnectionError(String channelName) { + return PlatformException( + code: 'channel-error', + message: 'Unable to establish connection on channel: "$channelName".', + ); +} + +class _PigeonCodec extends StandardMessageCodec { + const _PigeonCodec(); + @override + void writeValue(WriteBuffer buffer, Object? value) { + if (value is int) { + buffer.putUint8(4); + buffer.putInt64(value); + } else { + super.writeValue(buffer, value); + } + } + + @override + Object? readValueOfType(int type, ReadBuffer buffer) { + switch (type) { + default: + return super.readValueOfType(type, buffer); + } + } +} + /// A pigeon for interacting with the NSUserDefaults API on iOS and macOS. class NSUserDefaultsPigeon { /// Constructor for [NSUserDefaultsPigeon]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - NSUserDefaultsPigeon({BinaryMessenger? binaryMessenger}) - : _binaryMessenger = binaryMessenger; - final BinaryMessenger? _binaryMessenger; + NSUserDefaultsPigeon( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + final BinaryMessenger? pigeonVar_binaryMessenger; - static const MessageCodec codec = StandardMessageCodec(); + static const MessageCodec pigeonChannelCodec = _PigeonCodec(); - Future setBool(String arg_key, bool arg_value) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.setBool', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_key, arg_value]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + final String pigeonVar_messageChannelSuffix; + + Future setBool(String key, bool value) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.setBool$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send([key, value]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); } else { return; } } - Future boolFor(String arg_key) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.boolFor', - codec, - binaryMessenger: _binaryMessenger); - final List? replyList = - await channel.send([arg_key]) as List?; - if (replyList == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - ); - } else if (replyList.length > 1) { + Future boolFor(String key) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.boolFor$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final List? pigeonVar_replyList = + await pigeonVar_channel.send([key]) as List?; + if (pigeonVar_replyList == null) { + throw _createConnectionError(pigeonVar_channelName); + } else if (pigeonVar_replyList.length > 1) { throw PlatformException( - code: replyList[0]! as String, - message: replyList[1] as String?, - details: replyList[2], + code: pigeonVar_replyList[0]! as String, + message: pigeonVar_replyList[1] as String?, + details: pigeonVar_replyList[2], ); - } else if (replyList[0] == null) { + } else if (pigeonVar_replyList[0] == null) { throw PlatformException( code: 'null-error', message: 'Host platform returned null value for non-null return value.', ); } else { - return (replyList[0] as bool?)!; + return (pigeonVar_replyList[0] as bool?)!; } } } diff --git a/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift b/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift index f546fbe25d..d6cfe5e204 100644 --- a/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift +++ b/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift @@ -1,20 +1,35 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// -// Autogenerated from Pigeon (v11.0.0), do not edit directly. +// +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation + #if os(iOS) -import Flutter + import Flutter #elseif os(macOS) -import FlutterMacOS + import FlutterMacOS #else -#error("Unsupported platform.") + #error("Unsupported platform.") #endif -private func isNullish(_ value: Any?) -> Bool { - return value is NSNull || value == nil +/// Error class for passing custom error details to Dart side. +final class PigeonError: Error { + let code: String + let message: String? + let details: Any? + + init(code: String, message: String?, details: Any?) { + self.code = code + self.message = message + self.details = details + } + + var localizedDescription: String { + return + "PigeonError(code: \(code), message: \(message ?? ""), details: \(details ?? "")" + } } private func wrapResult(_ result: Any?) -> [Any?] { @@ -22,24 +37,56 @@ private func wrapResult(_ result: Any?) -> [Any?] { } private func wrapError(_ error: Any) -> [Any?] { + if let pigeonError = error as? PigeonError { + return [ + pigeonError.code, + pigeonError.message, + pigeonError.details, + ] + } if let flutterError = error as? FlutterError { return [ flutterError.code, flutterError.message, - flutterError.details + flutterError.details, ] } return [ "\(error)", "\(type(of: error))", - "Stacktrace: \(Thread.callStackSymbols)" + "Stacktrace: \(Thread.callStackSymbols)", ] } +private func isNullish(_ value: Any?) -> Bool { + return value is NSNull || value == nil +} + private func nilOrValue(_ value: Any?) -> T? { if value is NSNull { return nil } return value as! T? } + +private class NSUserDefaultsPigeonPigeonCodecReader: FlutterStandardReader { +} + +private class NSUserDefaultsPigeonPigeonCodecWriter: FlutterStandardWriter { +} + +private class NSUserDefaultsPigeonPigeonCodecReaderWriter: FlutterStandardReaderWriter { + override func reader(with data: Data) -> FlutterStandardReader { + return NSUserDefaultsPigeonPigeonCodecReader(data: data) + } + + override func writer(with data: NSMutableData) -> FlutterStandardWriter { + return NSUserDefaultsPigeonPigeonCodecWriter(data: data) + } +} + +class NSUserDefaultsPigeonPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable { + static let shared = NSUserDefaultsPigeonPigeonCodec(readerWriter: NSUserDefaultsPigeonPigeonCodecReaderWriter()) +} + /// A pigeon for interacting with the NSUserDefaults API on iOS and macOS. /// /// Generated protocol from Pigeon that represents a handler of messages from Flutter. @@ -50,10 +97,11 @@ protocol NSUserDefaultsPigeon { /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. class NSUserDefaultsPigeonSetup { - /// The codec used by NSUserDefaultsPigeon. + static var codec: FlutterStandardMessageCodec { NSUserDefaultsPigeonPigeonCodec.shared } /// Sets up an instance of `NSUserDefaultsPigeon` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NSUserDefaultsPigeon?) { - let setBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.setBool", binaryMessenger: binaryMessenger) + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NSUserDefaultsPigeon?, messageChannelSuffix: String = "") { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" + let setBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.setBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { setBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -69,7 +117,7 @@ class NSUserDefaultsPigeonSetup { } else { setBoolChannel.setMessageHandler(nil) } - let boolForChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.boolFor", binaryMessenger: binaryMessenger) + let boolForChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.boolFor\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { boolForChannel.setMessageHandler { message, reply in let args = message as! [Any?] diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml index 1d9b76ecb3..e63e7b8554 100644 --- a/packages/secure_storage/amplify_secure_storage/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/se issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_secure_storage_dart: ">=0.5.3 <0.6.0" @@ -26,7 +26,7 @@ dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" flutter_test: sdk: flutter - pigeon: ^11.0.0 + pigeon: ^22.6.2 flutter: plugin: diff --git a/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml index f54f976ff2..ac8321a34a 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml @@ -7,7 +7,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_secure_storage_dart: ">=0.5.3 <0.6.0" diff --git a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml index 5d2bf3a6bf..4ad7b4f5a0 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/se issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 # Explicitly declare platform support to help `pana` platforms: @@ -39,7 +39,7 @@ dev_dependencies: build: ^2.3.0 build_runner: ^2.4.9 build_web_compilers: ^4.0.0 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 ffigen: ^9.0.0 test: ^1.22.1 worker_bee_builder: ">=0.3.2 <0.4.0" diff --git a/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml index ec163256e9..9667ce776b 100644 --- a/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_secure_storage_dart: any diff --git a/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml b/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml index 905d1d643a..7c47200550 100644 --- a/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml +++ b/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -39,6 +39,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml b/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml index 1fef27249e..d81cf4ab1f 100644 --- a/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml +++ b/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -42,6 +42,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib/awsQuery/pubspec.yaml b/packages/smithy/goldens/lib/awsQuery/pubspec.yaml index be869b521b..20c7578e3f 100644 --- a/packages/smithy/goldens/lib/awsQuery/pubspec.yaml +++ b/packages/smithy/goldens/lib/awsQuery/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -38,6 +38,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib/ec2Query/pubspec.yaml b/packages/smithy/goldens/lib/ec2Query/pubspec.yaml index 9bfb7a07c7..c343427d55 100644 --- a/packages/smithy/goldens/lib/ec2Query/pubspec.yaml +++ b/packages/smithy/goldens/lib/ec2Query/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -38,6 +38,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib/restJson1/pubspec.yaml b/packages/smithy/goldens/lib/restJson1/pubspec.yaml index f9c4d8edb3..8b1e2b8b4e 100644 --- a/packages/smithy/goldens/lib/restJson1/pubspec.yaml +++ b/packages/smithy/goldens/lib/restJson1/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -42,6 +42,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib/restXml/pubspec.yaml b/packages/smithy/goldens/lib/restXml/pubspec.yaml index 73a99018eb..4562b64c4c 100644 --- a/packages/smithy/goldens/lib/restXml/pubspec.yaml +++ b/packages/smithy/goldens/lib/restXml/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -43,6 +43,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml b/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml index d539d821e9..cd16bb03da 100644 --- a/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml +++ b/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -41,6 +41,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml b/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml index ffdb760ffb..d2336291a1 100644 --- a/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml +++ b/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -39,6 +39,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml b/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml index bb645a2e26..915fdcfe9a 100644 --- a/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml +++ b/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -42,6 +42,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml b/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml index 0b16bbded3..4775e05ae0 100644 --- a/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml +++ b/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -38,6 +38,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib2/custom/pubspec.yaml b/packages/smithy/goldens/lib2/custom/pubspec.yaml index 0b76615793..7db50abd52 100644 --- a/packages/smithy/goldens/lib2/custom/pubspec.yaml +++ b/packages/smithy/goldens/lib2/custom/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -41,6 +41,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml b/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml index 3c017aaa8c..180fb8875d 100644 --- a/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml +++ b/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -38,6 +38,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib2/restJson1/pubspec.yaml b/packages/smithy/goldens/lib2/restJson1/pubspec.yaml index 7826a674cb..4273d56304 100644 --- a/packages/smithy/goldens/lib2/restJson1/pubspec.yaml +++ b/packages/smithy/goldens/lib2/restJson1/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -42,6 +42,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib2/restXml/pubspec.yaml b/packages/smithy/goldens/lib2/restXml/pubspec.yaml index a67dc37406..e436fc0e97 100644 --- a/packages/smithy/goldens/lib2/restXml/pubspec.yaml +++ b/packages/smithy/goldens/lib2/restXml/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -43,6 +43,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml b/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml index 68953aa86c..d7a04d3382 100644 --- a/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml +++ b/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: smithy: @@ -41,6 +41,6 @@ dev_dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 build_test: ^2.1.5 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 lints: ^2.1.0 test: ^1.22.1 diff --git a/packages/smithy/goldens/pubspec.yaml b/packages/smithy/goldens/pubspec.yaml index 56af310902..64ea44efbf 100644 --- a/packages/smithy/goldens/pubspec.yaml +++ b/packages/smithy/goldens/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: aws_common: ^0.5.0+2 diff --git a/packages/smithy/smithy/pubspec.yaml b/packages/smithy/smithy/pubspec.yaml index 79af956b55..36575409d0 100644 --- a/packages/smithy/smithy/pubspec.yaml +++ b/packages/smithy/smithy/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/sm issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: async: ^2.10.0 @@ -30,7 +30,7 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" build_runner: ^2.4.9 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 json_serializable: 6.8.0 stack_trace: ^1.10.0 test: ^1.22.1 diff --git a/packages/smithy/smithy_aws/pubspec.yaml b/packages/smithy/smithy_aws/pubspec.yaml index b81cbd666c..060713d9f8 100644 --- a/packages/smithy/smithy_aws/pubspec.yaml +++ b/packages/smithy/smithy_aws/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/sm issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: aws_common: ">=0.7.3 <0.8.0" @@ -27,7 +27,7 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" build_runner: ^2.4.9 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 file: ">=6.0.0 <8.0.0" glob: ^2.0.2 json_serializable: 6.8.0 diff --git a/packages/smithy/smithy_codegen/lib/src/generator/serialization/protocol_traits.g.dart b/packages/smithy/smithy_codegen/lib/src/generator/serialization/protocol_traits.g.dart index 7248e0e4e6..df525e4358 100644 --- a/packages/smithy/smithy_codegen/lib/src/generator/serialization/protocol_traits.g.dart +++ b/packages/smithy/smithy_codegen/lib/src/generator/serialization/protocol_traits.g.dart @@ -160,12 +160,13 @@ class ProtocolTraitsBuilder try { _$result = _$v ?? new _$ProtocolTraits._( - wireName: wireName, - namespace: namespace, - attributeMembers: attributeMembers.build(), - flattenedMembers: flattenedMembers.build(), - memberNamespaces: memberNamespaces.build(), - memberWireNames: memberWireNames.build()); + wireName: wireName, + namespace: namespace, + attributeMembers: attributeMembers.build(), + flattenedMembers: flattenedMembers.build(), + memberNamespaces: memberNamespaces.build(), + memberWireNames: memberWireNames.build(), + ); } catch (_) { late String _$failedField; try { @@ -276,9 +277,10 @@ class HttpPayloadBuilder implements Builder { try { _$result = _$v ?? new _$HttpPayload._( - symbol: BuiltValueNullFieldError.checkNotNull( - symbol, r'HttpPayload', 'symbol'), - member: _member?.build()); + symbol: BuiltValueNullFieldError.checkNotNull( + symbol, r'HttpPayload', 'symbol'), + member: _member?.build(), + ); } catch (_) { late String _$failedField; try { @@ -389,9 +391,10 @@ class HttpPrefixHeadersBuilder try { _$result = _$v ?? new _$HttpPrefixHeaders._( - trait: BuiltValueNullFieldError.checkNotNull( - trait, r'HttpPrefixHeaders', 'trait'), - member: member.build()); + trait: BuiltValueNullFieldError.checkNotNull( + trait, r'HttpPrefixHeaders', 'trait'), + member: member.build(), + ); } catch (_) { late String _$failedField; try { @@ -575,12 +578,13 @@ class HttpInputTraitsBuilder try { _$result = _$v ?? new _$HttpInputTraits._( - httpLabels: httpLabels.build(), - hostLabel: _hostLabel?.build(), - httpQuery: httpQuery.build(), - httpQueryParams: _httpQueryParams?.build(), - httpHeaders: httpHeaders.build(), - httpPrefixHeaders: _httpPrefixHeaders?.build()); + httpLabels: httpLabels.build(), + hostLabel: _hostLabel?.build(), + httpQuery: httpQuery.build(), + httpQueryParams: _httpQueryParams?.build(), + httpHeaders: httpHeaders.build(), + httpPrefixHeaders: _httpPrefixHeaders?.build(), + ); } catch (_) { late String _$failedField; try { @@ -722,9 +726,10 @@ class HttpOutputTraitsBuilder try { _$result = _$v ?? new _$HttpOutputTraits._( - httpResponseCode: _httpResponseCode?.build(), - httpHeaders: httpHeaders.build(), - httpPrefixHeaders: _httpPrefixHeaders?.build()); + httpResponseCode: _httpResponseCode?.build(), + httpHeaders: httpHeaders.build(), + httpPrefixHeaders: _httpPrefixHeaders?.build(), + ); } catch (_) { late String _$failedField; try { @@ -918,17 +923,18 @@ class HttpErrorTraitsBuilder try { _$result = _$v ?? new _$HttpErrorTraits._( - shapeId: BuiltValueNullFieldError.checkNotNull( - shapeId, r'HttpErrorTraits', 'shapeId'), - kind: BuiltValueNullFieldError.checkNotNull( - kind, r'HttpErrorTraits', 'kind'), - symbol: BuiltValueNullFieldError.checkNotNull( - symbol, r'HttpErrorTraits', 'symbol'), - payloadSymbol: payloadSymbol, - retryConfig: retryConfig, - statusCode: statusCode, - httpHeaders: httpHeaders.build(), - httpPrefixHeaders: _httpPrefixHeaders?.build()); + shapeId: BuiltValueNullFieldError.checkNotNull( + shapeId, r'HttpErrorTraits', 'shapeId'), + kind: BuiltValueNullFieldError.checkNotNull( + kind, r'HttpErrorTraits', 'kind'), + symbol: BuiltValueNullFieldError.checkNotNull( + symbol, r'HttpErrorTraits', 'symbol'), + payloadSymbol: payloadSymbol, + retryConfig: retryConfig, + statusCode: statusCode, + httpHeaders: httpHeaders.build(), + httpPrefixHeaders: _httpPrefixHeaders?.build(), + ); } catch (_) { late String _$failedField; try { @@ -1070,13 +1076,14 @@ class PaginationItemBuilder try { _$result = _$v ?? new _$PaginationItem._( - member: member.build(), - isNullable: BuiltValueNullFieldError.checkNotNull( - isNullable, r'PaginationItem', 'isNullable'), - buildExpression: BuiltValueNullFieldError.checkNotNull( - buildExpression, r'PaginationItem', 'buildExpression'), - symbol: BuiltValueNullFieldError.checkNotNull( - symbol, r'PaginationItem', 'symbol')); + member: member.build(), + isNullable: BuiltValueNullFieldError.checkNotNull( + isNullable, r'PaginationItem', 'isNullable'), + buildExpression: BuiltValueNullFieldError.checkNotNull( + buildExpression, r'PaginationItem', 'buildExpression'), + symbol: BuiltValueNullFieldError.checkNotNull( + symbol, r'PaginationItem', 'symbol'), + ); } catch (_) { late String _$failedField; try { @@ -1258,14 +1265,15 @@ class PaginatedTraitsBuilder try { _$result = _$v ?? new _$PaginatedTraits._( - inputTokenPath: inputTokenPath, - inputToken: _inputToken?.build(), - outputTokenPath: outputTokenPath, - outputToken: _outputToken?.build(), - pageSizePath: pageSizePath, - pageSize: _pageSize?.build(), - itemsPath: itemsPath, - items: _items?.build()); + inputTokenPath: inputTokenPath, + inputToken: _inputToken?.build(), + outputTokenPath: outputTokenPath, + outputToken: _outputToken?.build(), + pageSizePath: pageSizePath, + pageSize: _pageSize?.build(), + itemsPath: itemsPath, + items: _items?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/smithy/smithy_codegen/lib/src/util/config_parameter.g.dart b/packages/smithy/smithy_codegen/lib/src/util/config_parameter.g.dart index 25e505f0df..7521e3d241 100644 --- a/packages/smithy/smithy_codegen/lib/src/util/config_parameter.g.dart +++ b/packages/smithy/smithy_codegen/lib/src/util/config_parameter.g.dart @@ -150,17 +150,18 @@ class ConfigParameterBuilder _$ConfigParameter _build() { final _$result = _$v ?? new _$ConfigParameter._( - name: BuiltValueNullFieldError.checkNotNull( - name, r'ConfigParameter', 'name'), - type: BuiltValueNullFieldError.checkNotNull( - type, r'ConfigParameter', 'type'), - required: BuiltValueNullFieldError.checkNotNull( - required, r'ConfigParameter', 'required'), - isOverride: BuiltValueNullFieldError.checkNotNull( - isOverride, r'ConfigParameter', 'isOverride'), - location: BuiltValueNullFieldError.checkNotNull( - location, r'ConfigParameter', 'location'), - defaultTo: defaultTo); + name: BuiltValueNullFieldError.checkNotNull( + name, r'ConfigParameter', 'name'), + type: BuiltValueNullFieldError.checkNotNull( + type, r'ConfigParameter', 'type'), + required: BuiltValueNullFieldError.checkNotNull( + required, r'ConfigParameter', 'required'), + isOverride: BuiltValueNullFieldError.checkNotNull( + isOverride, r'ConfigParameter', 'isOverride'), + location: BuiltValueNullFieldError.checkNotNull( + location, r'ConfigParameter', 'location'), + defaultTo: defaultTo, + ); replace(_$result); return _$result; } diff --git a/packages/smithy/smithy_codegen/pubspec.yaml b/packages/smithy/smithy_codegen/pubspec.yaml index c0c4bb702d..8c4a36f37e 100644 --- a/packages/smithy/smithy_codegen/pubspec.yaml +++ b/packages/smithy/smithy_codegen/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/sm publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: args: ^2.3.0 @@ -42,7 +42,7 @@ dev_dependencies: build_runner: ^2.4.9 build_verify: ^3.0.0 build_version: ^2.1.0 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 json_serializable: 6.8.0 smithy_test: path: ../smithy_test diff --git a/packages/smithy/smithy_test/pubspec.yaml b/packages/smithy/smithy_test/pubspec.yaml index 360d062482..7c7eece32d 100644 --- a/packages/smithy/smithy_test/pubspec.yaml +++ b/packages/smithy/smithy_test/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/sm publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: async: ^2.10.0 diff --git a/packages/storage/amplify_storage_s3/example/android/app/build.gradle b/packages/storage/amplify_storage_s3/example/android/app/build.gradle index 617f71f6bd..c858de053a 100644 --- a/packages/storage/amplify_storage_s3/example/android/app/build.gradle +++ b/packages/storage/amplify_storage_s3/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,10 +22,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace 'com.amazonaws.amplify.amplify_storage_s3_example' compileSdk flutter.compileSdkVersion @@ -67,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/packages/storage/amplify_storage_s3/example/android/build.gradle b/packages/storage/amplify_storage_s3/example/android/build.gradle index 24d8637a29..bc157bd1a1 100644 --- a/packages/storage/amplify_storage_s3/example/android/build.gradle +++ b/packages/storage/amplify_storage_s3/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() @@ -26,6 +13,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/storage/amplify_storage_s3/example/android/settings.gradle b/packages/storage/amplify_storage_s3/example/android/settings.gradle index 44e62bcf06..276cdabf9c 100644 --- a/packages/storage/amplify_storage_s3/example/android/settings.gradle +++ b/packages/storage/amplify_storage_s3/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.9.10" apply false +} + +include ":app" diff --git a/packages/storage/amplify_storage_s3/example/integration_test/utils/create_file/create_file_html.dart b/packages/storage/amplify_storage_s3/example/integration_test/utils/create_file/create_file_html.dart index 2bf8dfa8d1..d3d8b9de6b 100644 --- a/packages/storage/amplify_storage_s3/example/integration_test/utils/create_file/create_file_html.dart +++ b/packages/storage/amplify_storage_s3/example/integration_test/utils/create_file/create_file_html.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// ignore: avoid_web_libraries_in_flutter +// ignore: deprecated_member_use, avoid_web_libraries_in_flutter import 'dart:html' as html; Future createFile({ diff --git a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift index c33812bc70..1839e89896 100644 --- a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -8,6 +8,7 @@ import Foundation import amplify_auth_cognito import amplify_secure_storage import device_info_plus +import file_picker import package_info_plus import path_provider_foundation import url_launcher_macos @@ -16,6 +17,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) + FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) diff --git a/packages/storage/amplify_storage_s3/example/pubspec.yaml b/packages/storage/amplify_storage_s3/example/pubspec.yaml index f92cc97767..f1f65f9f39 100644 --- a/packages/storage/amplify_storage_s3/example/pubspec.yaml +++ b/packages/storage/amplify_storage_s3/example/pubspec.yaml @@ -4,8 +4,8 @@ version: 0.1.0 publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_auth_cognito: any @@ -28,7 +28,7 @@ dev_dependencies: amplify_test: path: ../../../test/amplify_test aws_common: any - drift: ">=2.18.0 <2.19.0" + drift: ^2.25.0 flutter_driver: sdk: flutter flutter_test: diff --git a/packages/storage/amplify_storage_s3/pubspec.yaml b/packages/storage/amplify_storage_s3/pubspec.yaml index f5377fb4f1..0a3c2e246b 100644 --- a/packages/storage/amplify_storage_s3/pubspec.yaml +++ b/packages/storage/amplify_storage_s3/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/st issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" # Helps `pana` since we do not use Flutter plugins for most platforms platforms: diff --git a/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml b/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml index 9d7e303a9f..2f09d57050 100644 --- a/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml +++ b/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_auth_cognito_dart: any diff --git a/packages/storage/amplify_storage_s3_dart/example/web/main.dart b/packages/storage/amplify_storage_s3_dart/example/web/main.dart index 7a4722519a..1f5f77907a 100644 --- a/packages/storage/amplify_storage_s3_dart/example/web/main.dart +++ b/packages/storage/amplify_storage_s3_dart/example/web/main.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; // TODO(HuiSF): Add example Web App diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/platform_impl/download_file/dom_helper.dart b/packages/storage/amplify_storage_s3_dart/lib/src/platform_impl/download_file/dom_helper.dart index 0875df3777..75319ee549 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/platform_impl/download_file/dom_helper.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/platform_impl/download_file/dom_helper.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; /// {@template amplify_storage_s3_dart.dom_helper} diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/abort_multipart_upload_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/abort_multipart_upload_output.g.dart index 6a02bb4d62..af3152d4b5 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/abort_multipart_upload_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/abort_multipart_upload_output.g.dart @@ -78,7 +78,9 @@ class AbortMultipartUploadOutputBuilder _$AbortMultipartUploadOutput _build() { final _$result = _$v ?? - new _$AbortMultipartUploadOutput._(requestCharged: requestCharged); + new _$AbortMultipartUploadOutput._( + requestCharged: requestCharged, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/abort_multipart_upload_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/abort_multipart_upload_request.g.dart index 8e3b11e772..3993d50b33 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/abort_multipart_upload_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/abort_multipart_upload_request.g.dart @@ -130,14 +130,15 @@ class AbortMultipartUploadRequestBuilder _$AbortMultipartUploadRequest _build() { final _$result = _$v ?? new _$AbortMultipartUploadRequest._( - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'AbortMultipartUploadRequest', 'bucket'), - key: BuiltValueNullFieldError.checkNotNull( - key, r'AbortMultipartUploadRequest', 'key'), - uploadId: BuiltValueNullFieldError.checkNotNull( - uploadId, r'AbortMultipartUploadRequest', 'uploadId'), - requestPayer: requestPayer, - expectedBucketOwner: expectedBucketOwner); + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'AbortMultipartUploadRequest', 'bucket'), + key: BuiltValueNullFieldError.checkNotNull( + key, r'AbortMultipartUploadRequest', 'key'), + uploadId: BuiltValueNullFieldError.checkNotNull( + uploadId, r'AbortMultipartUploadRequest', 'uploadId'), + requestPayer: requestPayer, + expectedBucketOwner: expectedBucketOwner, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/common_prefix.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/common_prefix.g.dart index b393831266..c971f840d7 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/common_prefix.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/common_prefix.g.dart @@ -71,7 +71,10 @@ class CommonPrefixBuilder CommonPrefix build() => _build(); _$CommonPrefix _build() { - final _$result = _$v ?? new _$CommonPrefix._(prefix: prefix); + final _$result = _$v ?? + new _$CommonPrefix._( + prefix: prefix, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/complete_multipart_upload_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/complete_multipart_upload_output.g.dart index 3b7d3c9360..bba02e33df 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/complete_multipart_upload_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/complete_multipart_upload_output.g.dart @@ -218,20 +218,21 @@ class CompleteMultipartUploadOutputBuilder _$CompleteMultipartUploadOutput _build() { final _$result = _$v ?? new _$CompleteMultipartUploadOutput._( - location: location, - bucket: bucket, - key: key, - expiration: expiration, - eTag: eTag, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256, - serverSideEncryption: serverSideEncryption, - versionId: versionId, - ssekmsKeyId: ssekmsKeyId, - bucketKeyEnabled: bucketKeyEnabled, - requestCharged: requestCharged); + location: location, + bucket: bucket, + key: key, + expiration: expiration, + eTag: eTag, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + serverSideEncryption: serverSideEncryption, + versionId: versionId, + ssekmsKeyId: ssekmsKeyId, + bucketKeyEnabled: bucketKeyEnabled, + requestCharged: requestCharged, + ); replace(_$result); return _$result; } @@ -389,14 +390,15 @@ class CompleteMultipartUploadOutputPayloadBuilder _$CompleteMultipartUploadOutputPayload _build() { final _$result = _$v ?? new _$CompleteMultipartUploadOutputPayload._( - bucket: bucket, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256, - eTag: eTag, - key: key, - location: location); + bucket: bucket, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + eTag: eTag, + key: key, + location: location, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/complete_multipart_upload_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/complete_multipart_upload_request.g.dart index 758eeec832..ca120a07ed 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/complete_multipart_upload_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/complete_multipart_upload_request.g.dart @@ -220,22 +220,23 @@ class CompleteMultipartUploadRequestBuilder try { _$result = _$v ?? new _$CompleteMultipartUploadRequest._( - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'CompleteMultipartUploadRequest', 'bucket'), - key: BuiltValueNullFieldError.checkNotNull( - key, r'CompleteMultipartUploadRequest', 'key'), - multipartUpload: _multipartUpload?.build(), - uploadId: BuiltValueNullFieldError.checkNotNull( - uploadId, r'CompleteMultipartUploadRequest', 'uploadId'), - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256, - requestPayer: requestPayer, - expectedBucketOwner: expectedBucketOwner, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKey: sseCustomerKey, - sseCustomerKeyMd5: sseCustomerKeyMd5); + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'CompleteMultipartUploadRequest', 'bucket'), + key: BuiltValueNullFieldError.checkNotNull( + key, r'CompleteMultipartUploadRequest', 'key'), + multipartUpload: _multipartUpload?.build(), + uploadId: BuiltValueNullFieldError.checkNotNull( + uploadId, r'CompleteMultipartUploadRequest', 'uploadId'), + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + requestPayer: requestPayer, + expectedBucketOwner: expectedBucketOwner, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKey: sseCustomerKey, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/completed_multipart_upload.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/completed_multipart_upload.g.dart index 1610f0acb6..d413f5eb2f 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/completed_multipart_upload.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/completed_multipart_upload.g.dart @@ -78,8 +78,10 @@ class CompletedMultipartUploadBuilder _$CompletedMultipartUpload _build() { _$CompletedMultipartUpload _$result; try { - _$result = - _$v ?? new _$CompletedMultipartUpload._(parts: _parts?.build()); + _$result = _$v ?? + new _$CompletedMultipartUpload._( + parts: _parts?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/completed_part.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/completed_part.g.dart index 3a90909fd2..906c0c57c0 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/completed_part.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/completed_part.g.dart @@ -129,12 +129,13 @@ class CompletedPartBuilder _$CompletedPart _build() { final _$result = _$v ?? new _$CompletedPart._( - eTag: eTag, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256, - partNumber: partNumber); + eTag: eTag, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + partNumber: partNumber, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_output.g.dart index 4f51651b57..3569448f94 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_output.g.dart @@ -190,17 +190,18 @@ class CopyObjectOutputBuilder try { _$result = _$v ?? new _$CopyObjectOutput._( - copyObjectResult: _copyObjectResult?.build(), - expiration: expiration, - copySourceVersionId: copySourceVersionId, - versionId: versionId, - serverSideEncryption: serverSideEncryption, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKeyMd5: sseCustomerKeyMd5, - ssekmsKeyId: ssekmsKeyId, - ssekmsEncryptionContext: ssekmsEncryptionContext, - bucketKeyEnabled: bucketKeyEnabled, - requestCharged: requestCharged); + copyObjectResult: _copyObjectResult?.build(), + expiration: expiration, + copySourceVersionId: copySourceVersionId, + versionId: versionId, + serverSideEncryption: serverSideEncryption, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ssekmsKeyId: ssekmsKeyId, + ssekmsEncryptionContext: ssekmsEncryptionContext, + bucketKeyEnabled: bucketKeyEnabled, + requestCharged: requestCharged, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_request.g.dart index 34df6bece4..5347248600 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_request.g.dart @@ -524,50 +524,51 @@ class CopyObjectRequestBuilder try { _$result = _$v ?? new _$CopyObjectRequest._( - acl: acl, - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'CopyObjectRequest', 'bucket'), - cacheControl: cacheControl, - checksumAlgorithm: checksumAlgorithm, - contentDisposition: contentDisposition, - contentEncoding: contentEncoding, - contentLanguage: contentLanguage, - contentType: contentType, - copySource: BuiltValueNullFieldError.checkNotNull( - copySource, r'CopyObjectRequest', 'copySource'), - copySourceIfMatch: copySourceIfMatch, - copySourceIfModifiedSince: copySourceIfModifiedSince, - copySourceIfNoneMatch: copySourceIfNoneMatch, - copySourceIfUnmodifiedSince: copySourceIfUnmodifiedSince, - expires: expires, - grantFullControl: grantFullControl, - grantRead: grantRead, - grantReadAcp: grantReadAcp, - grantWriteAcp: grantWriteAcp, - key: BuiltValueNullFieldError.checkNotNull( - key, r'CopyObjectRequest', 'key'), - metadata: _metadata?.build(), - metadataDirective: metadataDirective, - taggingDirective: taggingDirective, - serverSideEncryption: serverSideEncryption, - storageClass: storageClass, - websiteRedirectLocation: websiteRedirectLocation, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKey: sseCustomerKey, - sseCustomerKeyMd5: sseCustomerKeyMd5, - ssekmsKeyId: ssekmsKeyId, - ssekmsEncryptionContext: ssekmsEncryptionContext, - bucketKeyEnabled: bucketKeyEnabled, - copySourceSseCustomerAlgorithm: copySourceSseCustomerAlgorithm, - copySourceSseCustomerKey: copySourceSseCustomerKey, - copySourceSseCustomerKeyMd5: copySourceSseCustomerKeyMd5, - requestPayer: requestPayer, - tagging: tagging, - objectLockMode: objectLockMode, - objectLockRetainUntilDate: objectLockRetainUntilDate, - objectLockLegalHoldStatus: objectLockLegalHoldStatus, - expectedBucketOwner: expectedBucketOwner, - expectedSourceBucketOwner: expectedSourceBucketOwner); + acl: acl, + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'CopyObjectRequest', 'bucket'), + cacheControl: cacheControl, + checksumAlgorithm: checksumAlgorithm, + contentDisposition: contentDisposition, + contentEncoding: contentEncoding, + contentLanguage: contentLanguage, + contentType: contentType, + copySource: BuiltValueNullFieldError.checkNotNull( + copySource, r'CopyObjectRequest', 'copySource'), + copySourceIfMatch: copySourceIfMatch, + copySourceIfModifiedSince: copySourceIfModifiedSince, + copySourceIfNoneMatch: copySourceIfNoneMatch, + copySourceIfUnmodifiedSince: copySourceIfUnmodifiedSince, + expires: expires, + grantFullControl: grantFullControl, + grantRead: grantRead, + grantReadAcp: grantReadAcp, + grantWriteAcp: grantWriteAcp, + key: BuiltValueNullFieldError.checkNotNull( + key, r'CopyObjectRequest', 'key'), + metadata: _metadata?.build(), + metadataDirective: metadataDirective, + taggingDirective: taggingDirective, + serverSideEncryption: serverSideEncryption, + storageClass: storageClass, + websiteRedirectLocation: websiteRedirectLocation, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKey: sseCustomerKey, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ssekmsKeyId: ssekmsKeyId, + ssekmsEncryptionContext: ssekmsEncryptionContext, + bucketKeyEnabled: bucketKeyEnabled, + copySourceSseCustomerAlgorithm: copySourceSseCustomerAlgorithm, + copySourceSseCustomerKey: copySourceSseCustomerKey, + copySourceSseCustomerKeyMd5: copySourceSseCustomerKeyMd5, + requestPayer: requestPayer, + tagging: tagging, + objectLockMode: objectLockMode, + objectLockRetainUntilDate: objectLockRetainUntilDate, + objectLockLegalHoldStatus: objectLockLegalHoldStatus, + expectedBucketOwner: expectedBucketOwner, + expectedSourceBucketOwner: expectedSourceBucketOwner, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_result.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_result.g.dart index ff3451004c..298af3fb41 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_result.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_object_result.g.dart @@ -132,12 +132,13 @@ class CopyObjectResultBuilder _$CopyObjectResult _build() { final _$result = _$v ?? new _$CopyObjectResult._( - eTag: eTag, - lastModified: lastModified, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256); + eTag: eTag, + lastModified: lastModified, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_part_result.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_part_result.g.dart index fe5164b3e9..16a761fe4f 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_part_result.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/copy_part_result.g.dart @@ -131,12 +131,13 @@ class CopyPartResultBuilder _$CopyPartResult _build() { final _$result = _$v ?? new _$CopyPartResult._( - eTag: eTag, - lastModified: lastModified, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256); + eTag: eTag, + lastModified: lastModified, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/create_multipart_upload_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/create_multipart_upload_output.g.dart index 177c7de164..4fa128c67e 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/create_multipart_upload_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/create_multipart_upload_output.g.dart @@ -209,19 +209,20 @@ class CreateMultipartUploadOutputBuilder _$CreateMultipartUploadOutput _build() { final _$result = _$v ?? new _$CreateMultipartUploadOutput._( - abortDate: abortDate, - abortRuleId: abortRuleId, - bucket: bucket, - key: key, - uploadId: uploadId, - serverSideEncryption: serverSideEncryption, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKeyMd5: sseCustomerKeyMd5, - ssekmsKeyId: ssekmsKeyId, - ssekmsEncryptionContext: ssekmsEncryptionContext, - bucketKeyEnabled: bucketKeyEnabled, - requestCharged: requestCharged, - checksumAlgorithm: checksumAlgorithm); + abortDate: abortDate, + abortRuleId: abortRuleId, + bucket: bucket, + key: key, + uploadId: uploadId, + serverSideEncryption: serverSideEncryption, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ssekmsKeyId: ssekmsKeyId, + ssekmsEncryptionContext: ssekmsEncryptionContext, + bucketKeyEnabled: bucketKeyEnabled, + requestCharged: requestCharged, + checksumAlgorithm: checksumAlgorithm, + ); replace(_$result); return _$result; } @@ -323,7 +324,10 @@ class CreateMultipartUploadOutputPayloadBuilder _$CreateMultipartUploadOutputPayload _build() { final _$result = _$v ?? new _$CreateMultipartUploadOutputPayload._( - bucket: bucket, key: key, uploadId: uploadId); + bucket: bucket, + key: key, + uploadId: uploadId, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/create_multipart_upload_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/create_multipart_upload_request.g.dart index 314f115470..674ca7f9b3 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/create_multipart_upload_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/create_multipart_upload_request.g.dart @@ -402,38 +402,39 @@ class CreateMultipartUploadRequestBuilder try { _$result = _$v ?? new _$CreateMultipartUploadRequest._( - acl: acl, - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'CreateMultipartUploadRequest', 'bucket'), - cacheControl: cacheControl, - contentDisposition: contentDisposition, - contentEncoding: contentEncoding, - contentLanguage: contentLanguage, - contentType: contentType, - expires: expires, - grantFullControl: grantFullControl, - grantRead: grantRead, - grantReadAcp: grantReadAcp, - grantWriteAcp: grantWriteAcp, - key: BuiltValueNullFieldError.checkNotNull( - key, r'CreateMultipartUploadRequest', 'key'), - metadata: _metadata?.build(), - serverSideEncryption: serverSideEncryption, - storageClass: storageClass, - websiteRedirectLocation: websiteRedirectLocation, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKey: sseCustomerKey, - sseCustomerKeyMd5: sseCustomerKeyMd5, - ssekmsKeyId: ssekmsKeyId, - ssekmsEncryptionContext: ssekmsEncryptionContext, - bucketKeyEnabled: bucketKeyEnabled, - requestPayer: requestPayer, - tagging: tagging, - objectLockMode: objectLockMode, - objectLockRetainUntilDate: objectLockRetainUntilDate, - objectLockLegalHoldStatus: objectLockLegalHoldStatus, - expectedBucketOwner: expectedBucketOwner, - checksumAlgorithm: checksumAlgorithm); + acl: acl, + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'CreateMultipartUploadRequest', 'bucket'), + cacheControl: cacheControl, + contentDisposition: contentDisposition, + contentEncoding: contentEncoding, + contentLanguage: contentLanguage, + contentType: contentType, + expires: expires, + grantFullControl: grantFullControl, + grantRead: grantRead, + grantReadAcp: grantReadAcp, + grantWriteAcp: grantWriteAcp, + key: BuiltValueNullFieldError.checkNotNull( + key, r'CreateMultipartUploadRequest', 'key'), + metadata: _metadata?.build(), + serverSideEncryption: serverSideEncryption, + storageClass: storageClass, + websiteRedirectLocation: websiteRedirectLocation, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKey: sseCustomerKey, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ssekmsKeyId: ssekmsKeyId, + ssekmsEncryptionContext: ssekmsEncryptionContext, + bucketKeyEnabled: bucketKeyEnabled, + requestPayer: requestPayer, + tagging: tagging, + objectLockMode: objectLockMode, + objectLockRetainUntilDate: objectLockRetainUntilDate, + objectLockLegalHoldStatus: objectLockLegalHoldStatus, + expectedBucketOwner: expectedBucketOwner, + checksumAlgorithm: checksumAlgorithm, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/csv_input.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/csv_input.g.dart index c99b1d64bd..3d36f4ad03 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/csv_input.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/csv_input.g.dart @@ -141,13 +141,14 @@ class CsvInputBuilder implements Builder { _$CsvInput _build() { final _$result = _$v ?? new _$CsvInput._( - fileHeaderInfo: fileHeaderInfo, - comments: comments, - quoteEscapeCharacter: quoteEscapeCharacter, - recordDelimiter: recordDelimiter, - fieldDelimiter: fieldDelimiter, - quoteCharacter: quoteCharacter, - allowQuotedRecordDelimiter: allowQuotedRecordDelimiter); + fileHeaderInfo: fileHeaderInfo, + comments: comments, + quoteEscapeCharacter: quoteEscapeCharacter, + recordDelimiter: recordDelimiter, + fieldDelimiter: fieldDelimiter, + quoteCharacter: quoteCharacter, + allowQuotedRecordDelimiter: allowQuotedRecordDelimiter, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/csv_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/csv_output.g.dart index bbbb875d27..c345e59d2d 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/csv_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/csv_output.g.dart @@ -120,11 +120,12 @@ class CsvOutputBuilder implements Builder { _$CsvOutput _build() { final _$result = _$v ?? new _$CsvOutput._( - quoteFields: quoteFields, - quoteEscapeCharacter: quoteEscapeCharacter, - recordDelimiter: recordDelimiter, - fieldDelimiter: fieldDelimiter, - quoteCharacter: quoteCharacter); + quoteFields: quoteFields, + quoteEscapeCharacter: quoteEscapeCharacter, + recordDelimiter: recordDelimiter, + fieldDelimiter: fieldDelimiter, + quoteCharacter: quoteCharacter, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete.g.dart index 004f9857e2..cda5c038de 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete.g.dart @@ -84,7 +84,11 @@ class DeleteBuilder implements Builder { _$Delete _build() { _$Delete _$result; try { - _$result = _$v ?? new _$Delete._(objects: objects.build(), quiet: quiet); + _$result = _$v ?? + new _$Delete._( + objects: objects.build(), + quiet: quiet, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_object_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_object_output.g.dart index 5420a3c796..0611360bbd 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_object_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_object_output.g.dart @@ -98,9 +98,10 @@ class DeleteObjectOutputBuilder _$DeleteObjectOutput _build() { final _$result = _$v ?? new _$DeleteObjectOutput._( - deleteMarker: deleteMarker, - versionId: versionId, - requestCharged: requestCharged); + deleteMarker: deleteMarker, + versionId: versionId, + requestCharged: requestCharged, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_object_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_object_request.g.dart index 2f68f06346..b7d5c2f0c1 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_object_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_object_request.g.dart @@ -146,15 +146,16 @@ class DeleteObjectRequestBuilder _$DeleteObjectRequest _build() { final _$result = _$v ?? new _$DeleteObjectRequest._( - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'DeleteObjectRequest', 'bucket'), - key: BuiltValueNullFieldError.checkNotNull( - key, r'DeleteObjectRequest', 'key'), - mfa: mfa, - versionId: versionId, - requestPayer: requestPayer, - bypassGovernanceRetention: bypassGovernanceRetention, - expectedBucketOwner: expectedBucketOwner); + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'DeleteObjectRequest', 'bucket'), + key: BuiltValueNullFieldError.checkNotNull( + key, r'DeleteObjectRequest', 'key'), + mfa: mfa, + versionId: versionId, + requestPayer: requestPayer, + bypassGovernanceRetention: bypassGovernanceRetention, + expectedBucketOwner: expectedBucketOwner, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_objects_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_objects_output.g.dart index f48c0763e9..f358859f0a 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_objects_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_objects_output.g.dart @@ -102,9 +102,10 @@ class DeleteObjectsOutputBuilder try { _$result = _$v ?? new _$DeleteObjectsOutput._( - deleted: _deleted?.build(), - requestCharged: requestCharged, - errors: _errors?.build()); + deleted: _deleted?.build(), + requestCharged: requestCharged, + errors: _errors?.build(), + ); } catch (_) { late String _$failedField; try { @@ -210,7 +211,9 @@ class DeleteObjectsOutputPayloadBuilder try { _$result = _$v ?? new _$DeleteObjectsOutputPayload._( - deleted: _deleted?.build(), errors: _errors?.build()); + deleted: _deleted?.build(), + errors: _errors?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_objects_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_objects_request.g.dart index ec94485f6a..f058d02ccd 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_objects_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/delete_objects_request.g.dart @@ -150,14 +150,15 @@ class DeleteObjectsRequestBuilder try { _$result = _$v ?? new _$DeleteObjectsRequest._( - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'DeleteObjectsRequest', 'bucket'), - delete: delete.build(), - mfa: mfa, - requestPayer: requestPayer, - bypassGovernanceRetention: bypassGovernanceRetention, - expectedBucketOwner: expectedBucketOwner, - checksumAlgorithm: checksumAlgorithm); + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'DeleteObjectsRequest', 'bucket'), + delete: delete.build(), + mfa: mfa, + requestPayer: requestPayer, + bypassGovernanceRetention: bypassGovernanceRetention, + expectedBucketOwner: expectedBucketOwner, + checksumAlgorithm: checksumAlgorithm, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/deleted_object.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/deleted_object.g.dart index 037be28d60..4a547f1664 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/deleted_object.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/deleted_object.g.dart @@ -104,10 +104,11 @@ class DeletedObjectBuilder _$DeletedObject _build() { final _$result = _$v ?? new _$DeletedObject._( - key: key, - versionId: versionId, - deleteMarker: deleteMarker, - deleteMarkerVersionId: deleteMarkerVersionId); + key: key, + versionId: versionId, + deleteMarker: deleteMarker, + deleteMarkerVersionId: deleteMarkerVersionId, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/error.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/error.g.dart index 3c0ca53fa7..35537bbc04 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/error.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/error.g.dart @@ -100,7 +100,11 @@ class ErrorBuilder implements Builder { _$Error _build() { final _$result = _$v ?? new _$Error._( - key: key, versionId: versionId, code: code, message: message); + key: key, + versionId: versionId, + code: code, + message: message, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/get_object_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/get_object_output.g.dart index 9b364b40ea..19d1fc3826 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/get_object_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/get_object_output.g.dart @@ -457,43 +457,44 @@ class GetObjectOutputBuilder try { _$result = _$v ?? new _$GetObjectOutput._( - body: BuiltValueNullFieldError.checkNotNull( - body, r'GetObjectOutput', 'body'), - deleteMarker: deleteMarker, - acceptRanges: acceptRanges, - expiration: expiration, - restore: restore, - lastModified: lastModified, - contentLength: contentLength, - eTag: eTag, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256, - missingMeta: missingMeta, - versionId: versionId, - cacheControl: cacheControl, - contentDisposition: contentDisposition, - contentEncoding: contentEncoding, - contentLanguage: contentLanguage, - contentRange: contentRange, - contentType: contentType, - expires: expires, - websiteRedirectLocation: websiteRedirectLocation, - serverSideEncryption: serverSideEncryption, - metadata: _metadata?.build(), - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKeyMd5: sseCustomerKeyMd5, - ssekmsKeyId: ssekmsKeyId, - bucketKeyEnabled: bucketKeyEnabled, - storageClass: storageClass, - requestCharged: requestCharged, - replicationStatus: replicationStatus, - partsCount: partsCount, - tagCount: tagCount, - objectLockMode: objectLockMode, - objectLockRetainUntilDate: objectLockRetainUntilDate, - objectLockLegalHoldStatus: objectLockLegalHoldStatus); + body: BuiltValueNullFieldError.checkNotNull( + body, r'GetObjectOutput', 'body'), + deleteMarker: deleteMarker, + acceptRanges: acceptRanges, + expiration: expiration, + restore: restore, + lastModified: lastModified, + contentLength: contentLength, + eTag: eTag, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + missingMeta: missingMeta, + versionId: versionId, + cacheControl: cacheControl, + contentDisposition: contentDisposition, + contentEncoding: contentEncoding, + contentLanguage: contentLanguage, + contentRange: contentRange, + contentType: contentType, + expires: expires, + websiteRedirectLocation: websiteRedirectLocation, + serverSideEncryption: serverSideEncryption, + metadata: _metadata?.build(), + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ssekmsKeyId: ssekmsKeyId, + bucketKeyEnabled: bucketKeyEnabled, + storageClass: storageClass, + requestCharged: requestCharged, + replicationStatus: replicationStatus, + partsCount: partsCount, + tagCount: tagCount, + objectLockMode: objectLockMode, + objectLockRetainUntilDate: objectLockRetainUntilDate, + objectLockLegalHoldStatus: objectLockLegalHoldStatus, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/get_object_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/get_object_request.g.dart index 78d213faec..d850be8271 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/get_object_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/get_object_request.g.dart @@ -296,29 +296,30 @@ class GetObjectRequestBuilder _$GetObjectRequest _build() { final _$result = _$v ?? new _$GetObjectRequest._( - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'GetObjectRequest', 'bucket'), - ifMatch: ifMatch, - ifModifiedSince: ifModifiedSince, - ifNoneMatch: ifNoneMatch, - ifUnmodifiedSince: ifUnmodifiedSince, - key: BuiltValueNullFieldError.checkNotNull( - key, r'GetObjectRequest', 'key'), - range: range, - responseCacheControl: responseCacheControl, - responseContentDisposition: responseContentDisposition, - responseContentEncoding: responseContentEncoding, - responseContentLanguage: responseContentLanguage, - responseContentType: responseContentType, - responseExpires: responseExpires, - versionId: versionId, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKey: sseCustomerKey, - sseCustomerKeyMd5: sseCustomerKeyMd5, - requestPayer: requestPayer, - partNumber: partNumber, - expectedBucketOwner: expectedBucketOwner, - checksumMode: checksumMode); + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'GetObjectRequest', 'bucket'), + ifMatch: ifMatch, + ifModifiedSince: ifModifiedSince, + ifNoneMatch: ifNoneMatch, + ifUnmodifiedSince: ifUnmodifiedSince, + key: BuiltValueNullFieldError.checkNotNull( + key, r'GetObjectRequest', 'key'), + range: range, + responseCacheControl: responseCacheControl, + responseContentDisposition: responseContentDisposition, + responseContentEncoding: responseContentEncoding, + responseContentLanguage: responseContentLanguage, + responseContentType: responseContentType, + responseExpires: responseExpires, + versionId: versionId, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKey: sseCustomerKey, + sseCustomerKeyMd5: sseCustomerKeyMd5, + requestPayer: requestPayer, + partNumber: partNumber, + expectedBucketOwner: expectedBucketOwner, + checksumMode: checksumMode, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/head_object_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/head_object_output.g.dart index a4357b25a0..05f6d49de3 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/head_object_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/head_object_output.g.dart @@ -435,40 +435,41 @@ class HeadObjectOutputBuilder try { _$result = _$v ?? new _$HeadObjectOutput._( - deleteMarker: deleteMarker, - acceptRanges: acceptRanges, - expiration: expiration, - restore: restore, - archiveStatus: archiveStatus, - lastModified: lastModified, - contentLength: contentLength, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256, - eTag: eTag, - missingMeta: missingMeta, - versionId: versionId, - cacheControl: cacheControl, - contentDisposition: contentDisposition, - contentEncoding: contentEncoding, - contentLanguage: contentLanguage, - contentType: contentType, - expires: expires, - websiteRedirectLocation: websiteRedirectLocation, - serverSideEncryption: serverSideEncryption, - metadata: _metadata?.build(), - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKeyMd5: sseCustomerKeyMd5, - ssekmsKeyId: ssekmsKeyId, - bucketKeyEnabled: bucketKeyEnabled, - storageClass: storageClass, - requestCharged: requestCharged, - replicationStatus: replicationStatus, - partsCount: partsCount, - objectLockMode: objectLockMode, - objectLockRetainUntilDate: objectLockRetainUntilDate, - objectLockLegalHoldStatus: objectLockLegalHoldStatus); + deleteMarker: deleteMarker, + acceptRanges: acceptRanges, + expiration: expiration, + restore: restore, + archiveStatus: archiveStatus, + lastModified: lastModified, + contentLength: contentLength, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + eTag: eTag, + missingMeta: missingMeta, + versionId: versionId, + cacheControl: cacheControl, + contentDisposition: contentDisposition, + contentEncoding: contentEncoding, + contentLanguage: contentLanguage, + contentType: contentType, + expires: expires, + websiteRedirectLocation: websiteRedirectLocation, + serverSideEncryption: serverSideEncryption, + metadata: _metadata?.build(), + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ssekmsKeyId: ssekmsKeyId, + bucketKeyEnabled: bucketKeyEnabled, + storageClass: storageClass, + requestCharged: requestCharged, + replicationStatus: replicationStatus, + partsCount: partsCount, + objectLockMode: objectLockMode, + objectLockRetainUntilDate: objectLockRetainUntilDate, + objectLockLegalHoldStatus: objectLockLegalHoldStatus, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/head_object_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/head_object_request.g.dart index 822cf6cc8b..1801331573 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/head_object_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/head_object_request.g.dart @@ -230,23 +230,24 @@ class HeadObjectRequestBuilder _$HeadObjectRequest _build() { final _$result = _$v ?? new _$HeadObjectRequest._( - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'HeadObjectRequest', 'bucket'), - ifMatch: ifMatch, - ifModifiedSince: ifModifiedSince, - ifNoneMatch: ifNoneMatch, - ifUnmodifiedSince: ifUnmodifiedSince, - key: BuiltValueNullFieldError.checkNotNull( - key, r'HeadObjectRequest', 'key'), - range: range, - versionId: versionId, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKey: sseCustomerKey, - sseCustomerKeyMd5: sseCustomerKeyMd5, - requestPayer: requestPayer, - partNumber: partNumber, - expectedBucketOwner: expectedBucketOwner, - checksumMode: checksumMode); + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'HeadObjectRequest', 'bucket'), + ifMatch: ifMatch, + ifModifiedSince: ifModifiedSince, + ifNoneMatch: ifNoneMatch, + ifUnmodifiedSince: ifUnmodifiedSince, + key: BuiltValueNullFieldError.checkNotNull( + key, r'HeadObjectRequest', 'key'), + range: range, + versionId: versionId, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKey: sseCustomerKey, + sseCustomerKeyMd5: sseCustomerKeyMd5, + requestPayer: requestPayer, + partNumber: partNumber, + expectedBucketOwner: expectedBucketOwner, + checksumMode: checksumMode, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/initiator.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/initiator.g.dart index 37be3be1de..9400a66bb5 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/initiator.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/initiator.g.dart @@ -80,7 +80,11 @@ class InitiatorBuilder implements Builder { Initiator build() => _build(); _$Initiator _build() { - final _$result = _$v ?? new _$Initiator._(id: id, displayName: displayName); + final _$result = _$v ?? + new _$Initiator._( + id: id, + displayName: displayName, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/input_serialization.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/input_serialization.g.dart index a85af236f6..8258a95008 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/input_serialization.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/input_serialization.g.dart @@ -110,10 +110,11 @@ class InputSerializationBuilder try { _$result = _$v ?? new _$InputSerialization._( - csv: _csv?.build(), - compressionType: compressionType, - json: _json?.build(), - parquet: _parquet?.build()); + csv: _csv?.build(), + compressionType: compressionType, + json: _json?.build(), + parquet: _parquet?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/invalid_object_state.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/invalid_object_state.g.dart index 0631aad4ce..8d5b5bfae9 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/invalid_object_state.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/invalid_object_state.g.dart @@ -96,9 +96,10 @@ class InvalidObjectStateBuilder _$InvalidObjectState _build() { final _$result = _$v ?? new _$InvalidObjectState._( - storageClass: storageClass, - accessTier: accessTier, - headers: headers); + storageClass: storageClass, + accessTier: accessTier, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/json_input.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/json_input.g.dart index fdc0ef1f42..abfd56982a 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/json_input.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/json_input.g.dart @@ -70,7 +70,10 @@ class JsonInputBuilder implements Builder { JsonInput build() => _build(); _$JsonInput _build() { - final _$result = _$v ?? new _$JsonInput._(type: type); + final _$result = _$v ?? + new _$JsonInput._( + type: type, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/json_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/json_output.g.dart index 3041d47dc9..b565cfa886 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/json_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/json_output.g.dart @@ -71,8 +71,10 @@ class JsonOutputBuilder implements Builder { JsonOutput build() => _build(); _$JsonOutput _build() { - final _$result = - _$v ?? new _$JsonOutput._(recordDelimiter: recordDelimiter); + final _$result = _$v ?? + new _$JsonOutput._( + recordDelimiter: recordDelimiter, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_multipart_uploads_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_multipart_uploads_output.g.dart index da1f1825d1..90d43365c6 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_multipart_uploads_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_multipart_uploads_output.g.dart @@ -211,19 +211,20 @@ class ListMultipartUploadsOutputBuilder try { _$result = _$v ?? new _$ListMultipartUploadsOutput._( - bucket: bucket, - keyMarker: keyMarker, - uploadIdMarker: uploadIdMarker, - nextKeyMarker: nextKeyMarker, - prefix: prefix, - delimiter: delimiter, - nextUploadIdMarker: nextUploadIdMarker, - maxUploads: maxUploads, - isTruncated: isTruncated, - uploads: _uploads?.build(), - commonPrefixes: _commonPrefixes?.build(), - encodingType: encodingType, - requestCharged: requestCharged); + bucket: bucket, + keyMarker: keyMarker, + uploadIdMarker: uploadIdMarker, + nextKeyMarker: nextKeyMarker, + prefix: prefix, + delimiter: delimiter, + nextUploadIdMarker: nextUploadIdMarker, + maxUploads: maxUploads, + isTruncated: isTruncated, + uploads: _uploads?.build(), + commonPrefixes: _commonPrefixes?.build(), + encodingType: encodingType, + requestCharged: requestCharged, + ); } catch (_) { late String _$failedField; try { @@ -440,18 +441,19 @@ class ListMultipartUploadsOutputPayloadBuilder try { _$result = _$v ?? new _$ListMultipartUploadsOutputPayload._( - bucket: bucket, - commonPrefixes: _commonPrefixes?.build(), - delimiter: delimiter, - encodingType: encodingType, - isTruncated: isTruncated, - keyMarker: keyMarker, - maxUploads: maxUploads, - nextKeyMarker: nextKeyMarker, - nextUploadIdMarker: nextUploadIdMarker, - prefix: prefix, - uploadIdMarker: uploadIdMarker, - uploads: _uploads?.build()); + bucket: bucket, + commonPrefixes: _commonPrefixes?.build(), + delimiter: delimiter, + encodingType: encodingType, + isTruncated: isTruncated, + keyMarker: keyMarker, + maxUploads: maxUploads, + nextKeyMarker: nextKeyMarker, + nextUploadIdMarker: nextUploadIdMarker, + prefix: prefix, + uploadIdMarker: uploadIdMarker, + uploads: _uploads?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_multipart_uploads_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_multipart_uploads_request.g.dart index 42186cdbd3..07e4c091cf 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_multipart_uploads_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_multipart_uploads_request.g.dart @@ -168,16 +168,17 @@ class ListMultipartUploadsRequestBuilder _$ListMultipartUploadsRequest _build() { final _$result = _$v ?? new _$ListMultipartUploadsRequest._( - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'ListMultipartUploadsRequest', 'bucket'), - delimiter: delimiter, - encodingType: encodingType, - keyMarker: keyMarker, - maxUploads: maxUploads, - prefix: prefix, - uploadIdMarker: uploadIdMarker, - expectedBucketOwner: expectedBucketOwner, - requestPayer: requestPayer); + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'ListMultipartUploadsRequest', 'bucket'), + delimiter: delimiter, + encodingType: encodingType, + keyMarker: keyMarker, + maxUploads: maxUploads, + prefix: prefix, + uploadIdMarker: uploadIdMarker, + expectedBucketOwner: expectedBucketOwner, + requestPayer: requestPayer, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_objects_v2_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_objects_v2_output.g.dart index f07198a2c2..27af7ffb15 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_objects_v2_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_objects_v2_output.g.dart @@ -209,19 +209,20 @@ class ListObjectsV2OutputBuilder try { _$result = _$v ?? new _$ListObjectsV2Output._( - isTruncated: isTruncated, - contents: _contents?.build(), - name: name, - prefix: prefix, - delimiter: delimiter, - maxKeys: maxKeys, - commonPrefixes: _commonPrefixes?.build(), - encodingType: encodingType, - keyCount: keyCount, - continuationToken: continuationToken, - nextContinuationToken: nextContinuationToken, - startAfter: startAfter, - requestCharged: requestCharged); + isTruncated: isTruncated, + contents: _contents?.build(), + name: name, + prefix: prefix, + delimiter: delimiter, + maxKeys: maxKeys, + commonPrefixes: _commonPrefixes?.build(), + encodingType: encodingType, + keyCount: keyCount, + continuationToken: continuationToken, + nextContinuationToken: nextContinuationToken, + startAfter: startAfter, + requestCharged: requestCharged, + ); } catch (_) { late String _$failedField; try { @@ -434,18 +435,19 @@ class ListObjectsV2OutputPayloadBuilder try { _$result = _$v ?? new _$ListObjectsV2OutputPayload._( - commonPrefixes: _commonPrefixes?.build(), - contents: _contents?.build(), - continuationToken: continuationToken, - delimiter: delimiter, - encodingType: encodingType, - isTruncated: isTruncated, - keyCount: keyCount, - maxKeys: maxKeys, - name: name, - nextContinuationToken: nextContinuationToken, - prefix: prefix, - startAfter: startAfter); + commonPrefixes: _commonPrefixes?.build(), + contents: _contents?.build(), + continuationToken: continuationToken, + delimiter: delimiter, + encodingType: encodingType, + isTruncated: isTruncated, + keyCount: keyCount, + maxKeys: maxKeys, + name: name, + nextContinuationToken: nextContinuationToken, + prefix: prefix, + startAfter: startAfter, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_objects_v2_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_objects_v2_request.g.dart index df0d45f781..9e808f5f0c 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_objects_v2_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_objects_v2_request.g.dart @@ -193,18 +193,19 @@ class ListObjectsV2RequestBuilder try { _$result = _$v ?? new _$ListObjectsV2Request._( - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'ListObjectsV2Request', 'bucket'), - delimiter: delimiter, - encodingType: encodingType, - maxKeys: maxKeys, - prefix: prefix, - continuationToken: continuationToken, - fetchOwner: fetchOwner, - startAfter: startAfter, - requestPayer: requestPayer, - expectedBucketOwner: expectedBucketOwner, - optionalObjectAttributes: _optionalObjectAttributes?.build()); + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'ListObjectsV2Request', 'bucket'), + delimiter: delimiter, + encodingType: encodingType, + maxKeys: maxKeys, + prefix: prefix, + continuationToken: continuationToken, + fetchOwner: fetchOwner, + startAfter: startAfter, + requestPayer: requestPayer, + expectedBucketOwner: expectedBucketOwner, + optionalObjectAttributes: _optionalObjectAttributes?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_parts_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_parts_output.g.dart index 2d7f56fcc6..43dc7f1065 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_parts_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_parts_output.g.dart @@ -226,21 +226,22 @@ class ListPartsOutputBuilder try { _$result = _$v ?? new _$ListPartsOutput._( - abortDate: abortDate, - abortRuleId: abortRuleId, - bucket: bucket, - key: key, - uploadId: uploadId, - partNumberMarker: partNumberMarker, - nextPartNumberMarker: nextPartNumberMarker, - maxParts: maxParts, - isTruncated: isTruncated, - parts: _parts?.build(), - initiator: _initiator?.build(), - owner: _owner?.build(), - storageClass: storageClass, - requestCharged: requestCharged, - checksumAlgorithm: checksumAlgorithm); + abortDate: abortDate, + abortRuleId: abortRuleId, + bucket: bucket, + key: key, + uploadId: uploadId, + partNumberMarker: partNumberMarker, + nextPartNumberMarker: nextPartNumberMarker, + maxParts: maxParts, + isTruncated: isTruncated, + parts: _parts?.build(), + initiator: _initiator?.build(), + owner: _owner?.build(), + storageClass: storageClass, + requestCharged: requestCharged, + checksumAlgorithm: checksumAlgorithm, + ); } catch (_) { late String _$failedField; try { @@ -452,18 +453,19 @@ class ListPartsOutputPayloadBuilder try { _$result = _$v ?? new _$ListPartsOutputPayload._( - bucket: bucket, - checksumAlgorithm: checksumAlgorithm, - initiator: _initiator?.build(), - isTruncated: isTruncated, - key: key, - maxParts: maxParts, - nextPartNumberMarker: nextPartNumberMarker, - owner: _owner?.build(), - partNumberMarker: partNumberMarker, - parts: _parts?.build(), - storageClass: storageClass, - uploadId: uploadId); + bucket: bucket, + checksumAlgorithm: checksumAlgorithm, + initiator: _initiator?.build(), + isTruncated: isTruncated, + key: key, + maxParts: maxParts, + nextPartNumberMarker: nextPartNumberMarker, + owner: _owner?.build(), + partNumberMarker: partNumberMarker, + parts: _parts?.build(), + storageClass: storageClass, + uploadId: uploadId, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_parts_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_parts_request.g.dart index 89ba424077..59bada5740 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_parts_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/list_parts_request.g.dart @@ -180,19 +180,20 @@ class ListPartsRequestBuilder _$ListPartsRequest _build() { final _$result = _$v ?? new _$ListPartsRequest._( - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'ListPartsRequest', 'bucket'), - key: BuiltValueNullFieldError.checkNotNull( - key, r'ListPartsRequest', 'key'), - maxParts: maxParts, - partNumberMarker: partNumberMarker, - uploadId: BuiltValueNullFieldError.checkNotNull( - uploadId, r'ListPartsRequest', 'uploadId'), - requestPayer: requestPayer, - expectedBucketOwner: expectedBucketOwner, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKey: sseCustomerKey, - sseCustomerKeyMd5: sseCustomerKeyMd5); + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'ListPartsRequest', 'bucket'), + key: BuiltValueNullFieldError.checkNotNull( + key, r'ListPartsRequest', 'key'), + maxParts: maxParts, + partNumberMarker: partNumberMarker, + uploadId: BuiltValueNullFieldError.checkNotNull( + uploadId, r'ListPartsRequest', 'uploadId'), + requestPayer: requestPayer, + expectedBucketOwner: expectedBucketOwner, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKey: sseCustomerKey, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/multipart_upload.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/multipart_upload.g.dart index a3858cad37..6642d4e369 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/multipart_upload.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/multipart_upload.g.dart @@ -142,13 +142,14 @@ class MultipartUploadBuilder try { _$result = _$v ?? new _$MultipartUpload._( - uploadId: uploadId, - key: key, - initiated: initiated, - storageClass: storageClass, - owner: _owner?.build(), - initiator: _initiator?.build(), - checksumAlgorithm: checksumAlgorithm); + uploadId: uploadId, + key: key, + initiated: initiated, + storageClass: storageClass, + owner: _owner?.build(), + initiator: _initiator?.build(), + checksumAlgorithm: checksumAlgorithm, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_bucket.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_bucket.g.dart index b076ff6056..8417258869 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_bucket.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_bucket.g.dart @@ -68,7 +68,10 @@ class NoSuchBucketBuilder NoSuchBucket build() => _build(); _$NoSuchBucket _build() { - final _$result = _$v ?? new _$NoSuchBucket._(headers: headers); + final _$result = _$v ?? + new _$NoSuchBucket._( + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_key.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_key.g.dart index e87c01a20f..df5eb2e96d 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_key.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_key.g.dart @@ -67,7 +67,10 @@ class NoSuchKeyBuilder implements Builder { NoSuchKey build() => _build(); _$NoSuchKey _build() { - final _$result = _$v ?? new _$NoSuchKey._(headers: headers); + final _$result = _$v ?? + new _$NoSuchKey._( + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_upload.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_upload.g.dart index 95e642be48..a7315d5fa3 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_upload.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/no_such_upload.g.dart @@ -68,7 +68,10 @@ class NoSuchUploadBuilder NoSuchUpload build() => _build(); _$NoSuchUpload _build() { - final _$result = _$v ?? new _$NoSuchUpload._(headers: headers); + final _$result = _$v ?? + new _$NoSuchUpload._( + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/not_found.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/not_found.g.dart index f436973709..8f34d2eb1e 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/not_found.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/not_found.g.dart @@ -74,8 +74,11 @@ class NotFoundBuilder implements Builder { NotFound build() => _build(); _$NotFound _build() { - final _$result = - _$v ?? new _$NotFound._(statusCode: statusCode, headers: headers); + final _$result = _$v ?? + new _$NotFound._( + statusCode: statusCode, + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object.g.dart index 4930ae02a4..2fd64099c5 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object.g.dart @@ -154,14 +154,15 @@ class S3ObjectBuilder implements Builder { try { _$result = _$v ?? new _$S3Object._( - key: key, - lastModified: lastModified, - eTag: eTag, - checksumAlgorithm: _checksumAlgorithm?.build(), - size: size, - storageClass: storageClass, - owner: _owner?.build(), - restoreStatus: _restoreStatus?.build()); + key: key, + lastModified: lastModified, + eTag: eTag, + checksumAlgorithm: _checksumAlgorithm?.build(), + size: size, + storageClass: storageClass, + owner: _owner?.build(), + restoreStatus: _restoreStatus?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object_identifier.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object_identifier.g.dart index 3a56191d75..f151ec2111 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object_identifier.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object_identifier.g.dart @@ -87,9 +87,10 @@ class ObjectIdentifierBuilder _$ObjectIdentifier _build() { final _$result = _$v ?? new _$ObjectIdentifier._( - key: BuiltValueNullFieldError.checkNotNull( - key, r'ObjectIdentifier', 'key'), - versionId: versionId); + key: BuiltValueNullFieldError.checkNotNull( + key, r'ObjectIdentifier', 'key'), + versionId: versionId, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object_not_in_active_tier_error.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object_not_in_active_tier_error.g.dart index b4f1b0f674..5001f6d070 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object_not_in_active_tier_error.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/object_not_in_active_tier_error.g.dart @@ -72,8 +72,10 @@ class ObjectNotInActiveTierErrorBuilder ObjectNotInActiveTierError build() => _build(); _$ObjectNotInActiveTierError _build() { - final _$result = - _$v ?? new _$ObjectNotInActiveTierError._(headers: headers); + final _$result = _$v ?? + new _$ObjectNotInActiveTierError._( + headers: headers, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/output_serialization.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/output_serialization.g.dart index 7270486ea8..57610251fb 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/output_serialization.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/output_serialization.g.dart @@ -87,7 +87,10 @@ class OutputSerializationBuilder _$OutputSerialization _$result; try { _$result = _$v ?? - new _$OutputSerialization._(csv: _csv?.build(), json: _json?.build()); + new _$OutputSerialization._( + csv: _csv?.build(), + json: _json?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/owner.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/owner.g.dart index 4e3153830a..c6f43e778a 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/owner.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/owner.g.dart @@ -78,7 +78,11 @@ class OwnerBuilder implements Builder { Owner build() => _build(); _$Owner _build() { - final _$result = _$v ?? new _$Owner._(displayName: displayName, id: id); + final _$result = _$v ?? + new _$Owner._( + displayName: displayName, + id: id, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/part.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/part.g.dart index 935781a1e5..85dc378001 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/part.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/part.g.dart @@ -149,14 +149,15 @@ class PartBuilder implements Builder { _$Part _build() { final _$result = _$v ?? new _$Part._( - partNumber: partNumber, - lastModified: lastModified, - eTag: eTag, - size: size, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256); + partNumber: partNumber, + lastModified: lastModified, + eTag: eTag, + size: size, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/progress.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/progress.g.dart index da9589f8e4..6e920a493a 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/progress.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/progress.g.dart @@ -95,9 +95,10 @@ class ProgressBuilder implements Builder { _$Progress _build() { final _$result = _$v ?? new _$Progress._( - bytesScanned: bytesScanned, - bytesProcessed: bytesProcessed, - bytesReturned: bytesReturned); + bytesScanned: bytesScanned, + bytesProcessed: bytesProcessed, + bytesReturned: bytesReturned, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/progress_event.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/progress_event.g.dart index d3e96b12c2..051c89a507 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/progress_event.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/progress_event.g.dart @@ -73,7 +73,10 @@ class ProgressEventBuilder _$ProgressEvent _build() { _$ProgressEvent _$result; try { - _$result = _$v ?? new _$ProgressEvent._(details: _details?.build()); + _$result = _$v ?? + new _$ProgressEvent._( + details: _details?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/put_object_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/put_object_output.g.dart index d5ac882a9e..47b6e43482 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/put_object_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/put_object_output.g.dart @@ -217,20 +217,21 @@ class PutObjectOutputBuilder _$PutObjectOutput _build() { final _$result = _$v ?? new _$PutObjectOutput._( - expiration: expiration, - eTag: eTag, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256, - serverSideEncryption: serverSideEncryption, - versionId: versionId, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKeyMd5: sseCustomerKeyMd5, - ssekmsKeyId: ssekmsKeyId, - ssekmsEncryptionContext: ssekmsEncryptionContext, - bucketKeyEnabled: bucketKeyEnabled, - requestCharged: requestCharged); + expiration: expiration, + eTag: eTag, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + serverSideEncryption: serverSideEncryption, + versionId: versionId, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ssekmsKeyId: ssekmsKeyId, + ssekmsEncryptionContext: ssekmsEncryptionContext, + bucketKeyEnabled: bucketKeyEnabled, + requestCharged: requestCharged, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/put_object_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/put_object_request.g.dart index 879a8b83d1..6a56234432 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/put_object_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/put_object_request.g.dart @@ -475,46 +475,47 @@ class PutObjectRequestBuilder try { _$result = _$v ?? new _$PutObjectRequest._( - acl: acl, - body: BuiltValueNullFieldError.checkNotNull( - body, r'PutObjectRequest', 'body'), - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'PutObjectRequest', 'bucket'), - cacheControl: cacheControl, - contentDisposition: contentDisposition, - contentEncoding: contentEncoding, - contentLanguage: contentLanguage, - contentLength: contentLength, - contentMd5: contentMd5, - contentType: contentType, - checksumAlgorithm: checksumAlgorithm, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256, - expires: expires, - grantFullControl: grantFullControl, - grantRead: grantRead, - grantReadAcp: grantReadAcp, - grantWriteAcp: grantWriteAcp, - key: BuiltValueNullFieldError.checkNotNull( - key, r'PutObjectRequest', 'key'), - metadata: _metadata?.build(), - serverSideEncryption: serverSideEncryption, - storageClass: storageClass, - websiteRedirectLocation: websiteRedirectLocation, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKey: sseCustomerKey, - sseCustomerKeyMd5: sseCustomerKeyMd5, - ssekmsKeyId: ssekmsKeyId, - ssekmsEncryptionContext: ssekmsEncryptionContext, - bucketKeyEnabled: bucketKeyEnabled, - requestPayer: requestPayer, - tagging: tagging, - objectLockMode: objectLockMode, - objectLockRetainUntilDate: objectLockRetainUntilDate, - objectLockLegalHoldStatus: objectLockLegalHoldStatus, - expectedBucketOwner: expectedBucketOwner); + acl: acl, + body: BuiltValueNullFieldError.checkNotNull( + body, r'PutObjectRequest', 'body'), + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'PutObjectRequest', 'bucket'), + cacheControl: cacheControl, + contentDisposition: contentDisposition, + contentEncoding: contentEncoding, + contentLanguage: contentLanguage, + contentLength: contentLength, + contentMd5: contentMd5, + contentType: contentType, + checksumAlgorithm: checksumAlgorithm, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + expires: expires, + grantFullControl: grantFullControl, + grantRead: grantRead, + grantReadAcp: grantReadAcp, + grantWriteAcp: grantWriteAcp, + key: BuiltValueNullFieldError.checkNotNull( + key, r'PutObjectRequest', 'key'), + metadata: _metadata?.build(), + serverSideEncryption: serverSideEncryption, + storageClass: storageClass, + websiteRedirectLocation: websiteRedirectLocation, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKey: sseCustomerKey, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ssekmsKeyId: ssekmsKeyId, + ssekmsEncryptionContext: ssekmsEncryptionContext, + bucketKeyEnabled: bucketKeyEnabled, + requestPayer: requestPayer, + tagging: tagging, + objectLockMode: objectLockMode, + objectLockRetainUntilDate: objectLockRetainUntilDate, + objectLockLegalHoldStatus: objectLockLegalHoldStatus, + expectedBucketOwner: expectedBucketOwner, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/records_event.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/records_event.g.dart index 129e5f8dc5..8fe8a7cf3a 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/records_event.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/records_event.g.dart @@ -71,7 +71,10 @@ class RecordsEventBuilder RecordsEvent build() => _build(); _$RecordsEvent _build() { - final _$result = _$v ?? new _$RecordsEvent._(payload: payload); + final _$result = _$v ?? + new _$RecordsEvent._( + payload: payload, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/request_progress.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/request_progress.g.dart index ed7bc3c9ce..39d0fde3a1 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/request_progress.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/request_progress.g.dart @@ -72,7 +72,10 @@ class RequestProgressBuilder RequestProgress build() => _build(); _$RequestProgress _build() { - final _$result = _$v ?? new _$RequestProgress._(enabled: enabled); + final _$result = _$v ?? + new _$RequestProgress._( + enabled: enabled, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/restore_status.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/restore_status.g.dart index 8196896f9c..eaced4799b 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/restore_status.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/restore_status.g.dart @@ -86,8 +86,9 @@ class RestoreStatusBuilder _$RestoreStatus _build() { final _$result = _$v ?? new _$RestoreStatus._( - isRestoreInProgress: isRestoreInProgress, - restoreExpiryDate: restoreExpiryDate); + isRestoreInProgress: isRestoreInProgress, + restoreExpiryDate: restoreExpiryDate, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/scan_range.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/scan_range.g.dart index cab56ed433..dca6a1ff18 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/scan_range.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/scan_range.g.dart @@ -78,7 +78,11 @@ class ScanRangeBuilder implements Builder { ScanRange build() => _build(); _$ScanRange _build() { - final _$result = _$v ?? new _$ScanRange._(start: start, end: end); + final _$result = _$v ?? + new _$ScanRange._( + start: start, + end: end, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/select_object_content_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/select_object_content_output.g.dart index d2906071d3..259fbe5031 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/select_object_content_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/select_object_content_output.g.dart @@ -76,7 +76,10 @@ class SelectObjectContentOutputBuilder SelectObjectContentOutput build() => _build(); _$SelectObjectContentOutput _build() { - final _$result = _$v ?? new _$SelectObjectContentOutput._(payload: payload); + final _$result = _$v ?? + new _$SelectObjectContentOutput._( + payload: payload, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/select_object_content_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/select_object_content_request.g.dart index f85733afce..66312cf17e 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/select_object_content_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/select_object_content_request.g.dart @@ -217,24 +217,25 @@ class SelectObjectContentRequestBuilder try { _$result = _$v ?? new _$SelectObjectContentRequest._( - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'SelectObjectContentRequest', 'bucket'), - key: BuiltValueNullFieldError.checkNotNull( - key, r'SelectObjectContentRequest', 'key'), - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKey: sseCustomerKey, - sseCustomerKeyMd5: sseCustomerKeyMd5, - expression: BuiltValueNullFieldError.checkNotNull( - expression, r'SelectObjectContentRequest', 'expression'), - expressionType: BuiltValueNullFieldError.checkNotNull( - expressionType, - r'SelectObjectContentRequest', - 'expressionType'), - requestProgress: _requestProgress?.build(), - inputSerialization: inputSerialization.build(), - outputSerialization: outputSerialization.build(), - scanRange: _scanRange?.build(), - expectedBucketOwner: expectedBucketOwner); + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'SelectObjectContentRequest', 'bucket'), + key: BuiltValueNullFieldError.checkNotNull( + key, r'SelectObjectContentRequest', 'key'), + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKey: sseCustomerKey, + sseCustomerKeyMd5: sseCustomerKeyMd5, + expression: BuiltValueNullFieldError.checkNotNull( + expression, r'SelectObjectContentRequest', 'expression'), + expressionType: BuiltValueNullFieldError.checkNotNull( + expressionType, + r'SelectObjectContentRequest', + 'expressionType'), + requestProgress: _requestProgress?.build(), + inputSerialization: inputSerialization.build(), + outputSerialization: outputSerialization.build(), + scanRange: _scanRange?.build(), + expectedBucketOwner: expectedBucketOwner, + ); } catch (_) { late String _$failedField; try { @@ -404,16 +405,17 @@ class SelectObjectContentRequestPayloadBuilder try { _$result = _$v ?? new _$SelectObjectContentRequestPayload._( - expression: BuiltValueNullFieldError.checkNotNull(expression, - r'SelectObjectContentRequestPayload', 'expression'), - expressionType: BuiltValueNullFieldError.checkNotNull( - expressionType, - r'SelectObjectContentRequestPayload', - 'expressionType'), - inputSerialization: inputSerialization.build(), - outputSerialization: outputSerialization.build(), - requestProgress: _requestProgress?.build(), - scanRange: _scanRange?.build()); + expression: BuiltValueNullFieldError.checkNotNull( + expression, r'SelectObjectContentRequestPayload', 'expression'), + expressionType: BuiltValueNullFieldError.checkNotNull( + expressionType, + r'SelectObjectContentRequestPayload', + 'expressionType'), + inputSerialization: inputSerialization.build(), + outputSerialization: outputSerialization.build(), + requestProgress: _requestProgress?.build(), + scanRange: _scanRange?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/stats.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/stats.g.dart index 55a60d342a..f2ba149d4c 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/stats.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/stats.g.dart @@ -95,9 +95,10 @@ class StatsBuilder implements Builder { _$Stats _build() { final _$result = _$v ?? new _$Stats._( - bytesScanned: bytesScanned, - bytesProcessed: bytesProcessed, - bytesReturned: bytesReturned); + bytesScanned: bytesScanned, + bytesProcessed: bytesProcessed, + bytesReturned: bytesReturned, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/stats_event.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/stats_event.g.dart index 96aa455bc9..d24643f345 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/stats_event.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/stats_event.g.dart @@ -72,7 +72,10 @@ class StatsEventBuilder implements Builder { _$StatsEvent _build() { _$StatsEvent _$result; try { - _$result = _$v ?? new _$StatsEvent._(details: _details?.build()); + _$result = _$v ?? + new _$StatsEvent._( + details: _details?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_copy_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_copy_output.g.dart index 2d0f240e47..ca8574ff8e 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_copy_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_copy_output.g.dart @@ -160,14 +160,15 @@ class UploadPartCopyOutputBuilder try { _$result = _$v ?? new _$UploadPartCopyOutput._( - copySourceVersionId: copySourceVersionId, - copyPartResult: _copyPartResult?.build(), - serverSideEncryption: serverSideEncryption, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKeyMd5: sseCustomerKeyMd5, - ssekmsKeyId: ssekmsKeyId, - bucketKeyEnabled: bucketKeyEnabled, - requestCharged: requestCharged); + copySourceVersionId: copySourceVersionId, + copyPartResult: _copyPartResult?.build(), + serverSideEncryption: serverSideEncryption, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ssekmsKeyId: ssekmsKeyId, + bucketKeyEnabled: bucketKeyEnabled, + requestCharged: requestCharged, + ); } catch (_) { late String _$failedField; try { diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_copy_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_copy_request.g.dart index 9b8b7ca918..6205a81b84 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_copy_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_copy_request.g.dart @@ -285,29 +285,30 @@ class UploadPartCopyRequestBuilder _$UploadPartCopyRequest _build() { final _$result = _$v ?? new _$UploadPartCopyRequest._( - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'UploadPartCopyRequest', 'bucket'), - copySource: BuiltValueNullFieldError.checkNotNull( - copySource, r'UploadPartCopyRequest', 'copySource'), - copySourceIfMatch: copySourceIfMatch, - copySourceIfModifiedSince: copySourceIfModifiedSince, - copySourceIfNoneMatch: copySourceIfNoneMatch, - copySourceIfUnmodifiedSince: copySourceIfUnmodifiedSince, - copySourceRange: copySourceRange, - key: BuiltValueNullFieldError.checkNotNull( - key, r'UploadPartCopyRequest', 'key'), - partNumber: partNumber, - uploadId: BuiltValueNullFieldError.checkNotNull( - uploadId, r'UploadPartCopyRequest', 'uploadId'), - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKey: sseCustomerKey, - sseCustomerKeyMd5: sseCustomerKeyMd5, - copySourceSseCustomerAlgorithm: copySourceSseCustomerAlgorithm, - copySourceSseCustomerKey: copySourceSseCustomerKey, - copySourceSseCustomerKeyMd5: copySourceSseCustomerKeyMd5, - requestPayer: requestPayer, - expectedBucketOwner: expectedBucketOwner, - expectedSourceBucketOwner: expectedSourceBucketOwner); + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'UploadPartCopyRequest', 'bucket'), + copySource: BuiltValueNullFieldError.checkNotNull( + copySource, r'UploadPartCopyRequest', 'copySource'), + copySourceIfMatch: copySourceIfMatch, + copySourceIfModifiedSince: copySourceIfModifiedSince, + copySourceIfNoneMatch: copySourceIfNoneMatch, + copySourceIfUnmodifiedSince: copySourceIfUnmodifiedSince, + copySourceRange: copySourceRange, + key: BuiltValueNullFieldError.checkNotNull( + key, r'UploadPartCopyRequest', 'key'), + partNumber: partNumber, + uploadId: BuiltValueNullFieldError.checkNotNull( + uploadId, r'UploadPartCopyRequest', 'uploadId'), + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKey: sseCustomerKey, + sseCustomerKeyMd5: sseCustomerKeyMd5, + copySourceSseCustomerAlgorithm: copySourceSseCustomerAlgorithm, + copySourceSseCustomerKey: copySourceSseCustomerKey, + copySourceSseCustomerKeyMd5: copySourceSseCustomerKeyMd5, + requestPayer: requestPayer, + expectedBucketOwner: expectedBucketOwner, + expectedSourceBucketOwner: expectedSourceBucketOwner, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_output.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_output.g.dart index ffe980ebdd..eb70d21992 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_output.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_output.g.dart @@ -187,17 +187,18 @@ class UploadPartOutputBuilder _$UploadPartOutput _build() { final _$result = _$v ?? new _$UploadPartOutput._( - serverSideEncryption: serverSideEncryption, - eTag: eTag, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256, - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKeyMd5: sseCustomerKeyMd5, - ssekmsKeyId: ssekmsKeyId, - bucketKeyEnabled: bucketKeyEnabled, - requestCharged: requestCharged); + serverSideEncryption: serverSideEncryption, + eTag: eTag, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKeyMd5: sseCustomerKeyMd5, + ssekmsKeyId: ssekmsKeyId, + bucketKeyEnabled: bucketKeyEnabled, + requestCharged: requestCharged, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_request.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_request.g.dart index ca9a95bab4..82cf3c2f60 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_request.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/sdk/src/s3/model/upload_part_request.g.dart @@ -257,27 +257,28 @@ class UploadPartRequestBuilder _$UploadPartRequest _build() { final _$result = _$v ?? new _$UploadPartRequest._( - body: BuiltValueNullFieldError.checkNotNull( - body, r'UploadPartRequest', 'body'), - bucket: BuiltValueNullFieldError.checkNotNull( - bucket, r'UploadPartRequest', 'bucket'), - contentLength: contentLength, - contentMd5: contentMd5, - checksumAlgorithm: checksumAlgorithm, - checksumCrc32: checksumCrc32, - checksumCrc32C: checksumCrc32C, - checksumSha1: checksumSha1, - checksumSha256: checksumSha256, - key: BuiltValueNullFieldError.checkNotNull( - key, r'UploadPartRequest', 'key'), - partNumber: partNumber, - uploadId: BuiltValueNullFieldError.checkNotNull( - uploadId, r'UploadPartRequest', 'uploadId'), - sseCustomerAlgorithm: sseCustomerAlgorithm, - sseCustomerKey: sseCustomerKey, - sseCustomerKeyMd5: sseCustomerKeyMd5, - requestPayer: requestPayer, - expectedBucketOwner: expectedBucketOwner); + body: BuiltValueNullFieldError.checkNotNull( + body, r'UploadPartRequest', 'body'), + bucket: BuiltValueNullFieldError.checkNotNull( + bucket, r'UploadPartRequest', 'bucket'), + contentLength: contentLength, + contentMd5: contentMd5, + checksumAlgorithm: checksumAlgorithm, + checksumCrc32: checksumCrc32, + checksumCrc32C: checksumCrc32C, + checksumSha1: checksumSha1, + checksumSha256: checksumSha256, + key: BuiltValueNullFieldError.checkNotNull( + key, r'UploadPartRequest', 'key'), + partNumber: partNumber, + uploadId: BuiltValueNullFieldError.checkNotNull( + uploadId, r'UploadPartRequest', 'uploadId'), + sseCustomerAlgorithm: sseCustomerAlgorithm, + sseCustomerKey: sseCustomerKey, + sseCustomerKeyMd5: sseCustomerKeyMd5, + requestPayer: requestPayer, + expectedBucketOwner: expectedBucketOwner, + ); replace(_$result); return _$result; } diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_html.dart b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_html.dart index a64cb07016..e8a7a3fcca 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_html.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_html.dart @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use import 'dart:html'; import 'package:amplify_core/amplify_core.dart'; diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.drift.dart b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.drift.dart index 9c87dfc276..071cd83deb 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.drift.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.drift.dart @@ -1,3 +1,4 @@ +// dart format width=80 // ignore_for_file: type=lint import 'package:drift/drift.dart' as i0; import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/tables.drift.dart' diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/tables.drift.dart b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/tables.drift.dart index f50e5c57ce..68115be6de 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/tables.drift.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/tables.drift.dart @@ -1,3 +1,4 @@ +// dart format width=80 // ignore_for_file: type=lint import 'package:drift/drift.dart' as i0; import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/tables.drift.dart' @@ -5,6 +6,196 @@ import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/tables.dart' as i2; +typedef $$TransferRecordsTableCreateCompanionBuilder + = i1.TransferRecordsCompanion Function({ + i0.Value id, + required String uploadId, + required String objectKey, + required String createdAt, + i0.Value bucketName, + i0.Value awsRegion, +}); +typedef $$TransferRecordsTableUpdateCompanionBuilder + = i1.TransferRecordsCompanion Function({ + i0.Value id, + i0.Value uploadId, + i0.Value objectKey, + i0.Value createdAt, + i0.Value bucketName, + i0.Value awsRegion, +}); + +class $$TransferRecordsTableFilterComposer + extends i0.Composer { + $$TransferRecordsTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + i0.ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => i0.ColumnFilters(column)); + + i0.ColumnFilters get uploadId => $composableBuilder( + column: $table.uploadId, builder: (column) => i0.ColumnFilters(column)); + + i0.ColumnFilters get objectKey => $composableBuilder( + column: $table.objectKey, builder: (column) => i0.ColumnFilters(column)); + + i0.ColumnFilters get createdAt => $composableBuilder( + column: $table.createdAt, builder: (column) => i0.ColumnFilters(column)); + + i0.ColumnFilters get bucketName => $composableBuilder( + column: $table.bucketName, builder: (column) => i0.ColumnFilters(column)); + + i0.ColumnFilters get awsRegion => $composableBuilder( + column: $table.awsRegion, builder: (column) => i0.ColumnFilters(column)); +} + +class $$TransferRecordsTableOrderingComposer + extends i0.Composer { + $$TransferRecordsTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + i0.ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => i0.ColumnOrderings(column)); + + i0.ColumnOrderings get uploadId => $composableBuilder( + column: $table.uploadId, builder: (column) => i0.ColumnOrderings(column)); + + i0.ColumnOrderings get objectKey => $composableBuilder( + column: $table.objectKey, + builder: (column) => i0.ColumnOrderings(column)); + + i0.ColumnOrderings get createdAt => $composableBuilder( + column: $table.createdAt, + builder: (column) => i0.ColumnOrderings(column)); + + i0.ColumnOrderings get bucketName => $composableBuilder( + column: $table.bucketName, + builder: (column) => i0.ColumnOrderings(column)); + + i0.ColumnOrderings get awsRegion => $composableBuilder( + column: $table.awsRegion, + builder: (column) => i0.ColumnOrderings(column)); +} + +class $$TransferRecordsTableAnnotationComposer + extends i0.Composer { + $$TransferRecordsTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + i0.GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + i0.GeneratedColumn get uploadId => + $composableBuilder(column: $table.uploadId, builder: (column) => column); + + i0.GeneratedColumn get objectKey => + $composableBuilder(column: $table.objectKey, builder: (column) => column); + + i0.GeneratedColumn get createdAt => + $composableBuilder(column: $table.createdAt, builder: (column) => column); + + i0.GeneratedColumn get bucketName => $composableBuilder( + column: $table.bucketName, builder: (column) => column); + + i0.GeneratedColumn get awsRegion => + $composableBuilder(column: $table.awsRegion, builder: (column) => column); +} + +class $$TransferRecordsTableTableManager extends i0.RootTableManager< + i0.GeneratedDatabase, + i1.$TransferRecordsTable, + i1.TransferRecord, + i1.$$TransferRecordsTableFilterComposer, + i1.$$TransferRecordsTableOrderingComposer, + i1.$$TransferRecordsTableAnnotationComposer, + $$TransferRecordsTableCreateCompanionBuilder, + $$TransferRecordsTableUpdateCompanionBuilder, + ( + i1.TransferRecord, + i0.BaseReferences + ), + i1.TransferRecord, + i0.PrefetchHooks Function()> { + $$TransferRecordsTableTableManager( + i0.GeneratedDatabase db, i1.$TransferRecordsTable table) + : super(i0.TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + i1.$$TransferRecordsTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + i1.$$TransferRecordsTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => i1 + .$$TransferRecordsTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ + i0.Value id = const i0.Value.absent(), + i0.Value uploadId = const i0.Value.absent(), + i0.Value objectKey = const i0.Value.absent(), + i0.Value createdAt = const i0.Value.absent(), + i0.Value bucketName = const i0.Value.absent(), + i0.Value awsRegion = const i0.Value.absent(), + }) => + i1.TransferRecordsCompanion( + id: id, + uploadId: uploadId, + objectKey: objectKey, + createdAt: createdAt, + bucketName: bucketName, + awsRegion: awsRegion, + ), + createCompanionCallback: ({ + i0.Value id = const i0.Value.absent(), + required String uploadId, + required String objectKey, + required String createdAt, + i0.Value bucketName = const i0.Value.absent(), + i0.Value awsRegion = const i0.Value.absent(), + }) => + i1.TransferRecordsCompanion.insert( + id: id, + uploadId: uploadId, + objectKey: objectKey, + createdAt: createdAt, + bucketName: bucketName, + awsRegion: awsRegion, + ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, + )); +} + +typedef $$TransferRecordsTableProcessedTableManager = i0.ProcessedTableManager< + i0.GeneratedDatabase, + i1.$TransferRecordsTable, + i1.TransferRecord, + i1.$$TransferRecordsTableFilterComposer, + i1.$$TransferRecordsTableOrderingComposer, + i1.$$TransferRecordsTableAnnotationComposer, + $$TransferRecordsTableCreateCompanionBuilder, + $$TransferRecordsTableUpdateCompanionBuilder, + ( + i1.TransferRecord, + i0.BaseReferences + ), + i1.TransferRecord, + i0.PrefetchHooks Function()>; + class $TransferRecordsTable extends i2.TransferRecords with i0.TableInfo<$TransferRecordsTable, i1.TransferRecord> { @override @@ -222,6 +413,18 @@ class TransferRecord extends i0.DataClass bucketName: bucketName.present ? bucketName.value : this.bucketName, awsRegion: awsRegion.present ? awsRegion.value : this.awsRegion, ); + TransferRecord copyWithCompanion(i1.TransferRecordsCompanion data) { + return TransferRecord( + id: data.id.present ? data.id.value : this.id, + uploadId: data.uploadId.present ? data.uploadId.value : this.uploadId, + objectKey: data.objectKey.present ? data.objectKey.value : this.objectKey, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, + bucketName: + data.bucketName.present ? data.bucketName.value : this.bucketName, + awsRegion: data.awsRegion.present ? data.awsRegion.value : this.awsRegion, + ); + } + @override String toString() { return (StringBuffer('TransferRecord(') @@ -347,158 +550,3 @@ class TransferRecordsCompanion extends i0.UpdateCompanion { .toString(); } } - -typedef $$TransferRecordsTableInsertCompanionBuilder - = i1.TransferRecordsCompanion Function({ - i0.Value id, - required String uploadId, - required String objectKey, - required String createdAt, - i0.Value bucketName, - i0.Value awsRegion, -}); -typedef $$TransferRecordsTableUpdateCompanionBuilder - = i1.TransferRecordsCompanion Function({ - i0.Value id, - i0.Value uploadId, - i0.Value objectKey, - i0.Value createdAt, - i0.Value bucketName, - i0.Value awsRegion, -}); - -class $$TransferRecordsTableTableManager extends i0.RootTableManager< - i0.GeneratedDatabase, - i1.$TransferRecordsTable, - i1.TransferRecord, - i1.$$TransferRecordsTableFilterComposer, - i1.$$TransferRecordsTableOrderingComposer, - $$TransferRecordsTableProcessedTableManager, - $$TransferRecordsTableInsertCompanionBuilder, - $$TransferRecordsTableUpdateCompanionBuilder> { - $$TransferRecordsTableTableManager( - i0.GeneratedDatabase db, i1.$TransferRecordsTable table) - : super(i0.TableManagerState( - db: db, - table: table, - filteringComposer: i1.$$TransferRecordsTableFilterComposer( - i0.ComposerState(db, table)), - orderingComposer: i1.$$TransferRecordsTableOrderingComposer( - i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$TransferRecordsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ - i0.Value id = const i0.Value.absent(), - i0.Value uploadId = const i0.Value.absent(), - i0.Value objectKey = const i0.Value.absent(), - i0.Value createdAt = const i0.Value.absent(), - i0.Value bucketName = const i0.Value.absent(), - i0.Value awsRegion = const i0.Value.absent(), - }) => - i1.TransferRecordsCompanion( - id: id, - uploadId: uploadId, - objectKey: objectKey, - createdAt: createdAt, - bucketName: bucketName, - awsRegion: awsRegion, - ), - getInsertCompanionBuilder: ({ - i0.Value id = const i0.Value.absent(), - required String uploadId, - required String objectKey, - required String createdAt, - i0.Value bucketName = const i0.Value.absent(), - i0.Value awsRegion = const i0.Value.absent(), - }) => - i1.TransferRecordsCompanion.insert( - id: id, - uploadId: uploadId, - objectKey: objectKey, - createdAt: createdAt, - bucketName: bucketName, - awsRegion: awsRegion, - ), - )); -} - -class $$TransferRecordsTableProcessedTableManager - extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.$TransferRecordsTable, - i1.TransferRecord, - i1.$$TransferRecordsTableFilterComposer, - i1.$$TransferRecordsTableOrderingComposer, - $$TransferRecordsTableProcessedTableManager, - $$TransferRecordsTableInsertCompanionBuilder, - $$TransferRecordsTableUpdateCompanionBuilder> { - $$TransferRecordsTableProcessedTableManager(super.$state); -} - -class $$TransferRecordsTableFilterComposer - extends i0.FilterComposer { - $$TransferRecordsTableFilterComposer(super.$state); - i0.ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - i0.ColumnFilters(column, joinBuilders: joinBuilders)); - - i0.ColumnFilters get uploadId => $state.composableBuilder( - column: $state.table.uploadId, - builder: (column, joinBuilders) => - i0.ColumnFilters(column, joinBuilders: joinBuilders)); - - i0.ColumnFilters get objectKey => $state.composableBuilder( - column: $state.table.objectKey, - builder: (column, joinBuilders) => - i0.ColumnFilters(column, joinBuilders: joinBuilders)); - - i0.ColumnFilters get createdAt => $state.composableBuilder( - column: $state.table.createdAt, - builder: (column, joinBuilders) => - i0.ColumnFilters(column, joinBuilders: joinBuilders)); - - i0.ColumnFilters get bucketName => $state.composableBuilder( - column: $state.table.bucketName, - builder: (column, joinBuilders) => - i0.ColumnFilters(column, joinBuilders: joinBuilders)); - - i0.ColumnFilters get awsRegion => $state.composableBuilder( - column: $state.table.awsRegion, - builder: (column, joinBuilders) => - i0.ColumnFilters(column, joinBuilders: joinBuilders)); -} - -class $$TransferRecordsTableOrderingComposer extends i0 - .OrderingComposer { - $$TransferRecordsTableOrderingComposer(super.$state); - i0.ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - i0.ColumnOrderings(column, joinBuilders: joinBuilders)); - - i0.ColumnOrderings get uploadId => $state.composableBuilder( - column: $state.table.uploadId, - builder: (column, joinBuilders) => - i0.ColumnOrderings(column, joinBuilders: joinBuilders)); - - i0.ColumnOrderings get objectKey => $state.composableBuilder( - column: $state.table.objectKey, - builder: (column, joinBuilders) => - i0.ColumnOrderings(column, joinBuilders: joinBuilders)); - - i0.ColumnOrderings get createdAt => $state.composableBuilder( - column: $state.table.createdAt, - builder: (column, joinBuilders) => - i0.ColumnOrderings(column, joinBuilders: joinBuilders)); - - i0.ColumnOrderings get bucketName => $state.composableBuilder( - column: $state.table.bucketName, - builder: (column, joinBuilders) => - i0.ColumnOrderings(column, joinBuilders: joinBuilders)); - - i0.ColumnOrderings get awsRegion => $state.composableBuilder( - column: $state.table.awsRegion, - builder: (column, joinBuilders) => - i0.ColumnOrderings(column, joinBuilders: joinBuilders)); -} diff --git a/packages/storage/amplify_storage_s3_dart/pubspec.yaml b/packages/storage/amplify_storage_s3_dart/pubspec.yaml index 08b32b3215..aec44751eb 100644 --- a/packages/storage/amplify_storage_s3_dart/pubspec.yaml +++ b/packages/storage/amplify_storage_s3_dart/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/st issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_core: ">=2.6.0 <2.7.0" @@ -16,7 +16,7 @@ dependencies: aws_signature_v4: ">=0.6.3 <0.7.0" built_collection: ^5.0.0 built_value: ^8.6.0 - drift: ">=2.18.0 <2.19.0" + drift: ^2.25.0 fixnum: ^1.0.0 json_annotation: ">=4.9.0 <4.10.0" meta: ^1.7.0 @@ -28,8 +28,8 @@ dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" build_runner: ^2.4.9 build_verify: ^3.0.0 - built_value_generator: 8.8.1 - drift_dev: ">=2.18.0 <2.19.0" + built_value_generator: 8.9.3 + drift_dev: ^2.25.1 json_serializable: 6.8.0 mocktail: ^1.0.0 test: ^1.22.1 diff --git a/packages/test/amplify_auth_integration_test/pubspec.yaml b/packages/test/amplify_auth_integration_test/pubspec.yaml index 8053f46d9a..ee406830be 100644 --- a/packages/test/amplify_auth_integration_test/pubspec.yaml +++ b/packages/test/amplify_auth_integration_test/pubspec.yaml @@ -6,8 +6,8 @@ issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: amplify_api: any diff --git a/packages/test/amplify_integration_test/pubspec.yaml b/packages/test/amplify_integration_test/pubspec.yaml index 480620077b..cb5c58e048 100644 --- a/packages/test/amplify_integration_test/pubspec.yaml +++ b/packages/test/amplify_integration_test/pubspec.yaml @@ -4,7 +4,7 @@ homepage: https://github.com/aws-amplify/amplify-flutter publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_auth_cognito_dart: any @@ -26,4 +26,4 @@ dependencies: dev_dependencies: amplify_lints: ^2.0.0 build_runner: ^2.4.9 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 diff --git a/packages/test/amplify_test/pubspec.yaml b/packages/test/amplify_test/pubspec.yaml index c8acefaff6..12ac2cf770 100644 --- a/packages/test/amplify_test/pubspec.yaml +++ b/packages/test/amplify_test/pubspec.yaml @@ -4,7 +4,7 @@ homepage: https://github.com/aws-amplify/amplify-flutter publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: amplify_core: any diff --git a/packages/test/pub_server/lib/src/database.g.dart b/packages/test/pub_server/lib/src/database.g.dart index 6387001704..09672a7945 100644 --- a/packages/test/pub_server/lib/src/database.g.dart +++ b/packages/test/pub_server/lib/src/database.g.dart @@ -104,6 +104,13 @@ class Package extends DataClass implements Insertable { name: name ?? this.name, latest: latest ?? this.latest, ); + Package copyWithCompanion(PackagesCompanion data) { + return Package( + name: data.name.present ? data.name.value : this.name, + latest: data.latest.present ? data.latest.value : this.latest, + ); + } + @override String toString() { return (StringBuffer('Package(') @@ -406,6 +413,19 @@ class PackageVersion extends DataClass implements Insertable { changelog: changelog ?? this.changelog, published: published ?? this.published, ); + PackageVersion copyWithCompanion(PackageVersionsCompanion data) { + return PackageVersion( + package: data.package.present ? data.package.value : this.package, + version: data.version.present ? data.version.value : this.version, + archiveUrl: + data.archiveUrl.present ? data.archiveUrl.value : this.archiveUrl, + pubspec: data.pubspec.present ? data.pubspec.value : this.pubspec, + readme: data.readme.present ? data.readme.value : this.readme, + changelog: data.changelog.present ? data.changelog.value : this.changelog, + published: data.published.present ? data.published.value : this.published, + ); + } + @override String toString() { return (StringBuffer('PackageVersion(') @@ -562,7 +582,7 @@ class PackageVersionsCompanion extends UpdateCompanion { abstract class _$PubDatabase extends GeneratedDatabase { _$PubDatabase(QueryExecutor e) : super(e); - _$PubDatabaseManager get managers => _$PubDatabaseManager(this); + $PubDatabaseManager get managers => $PubDatabaseManager(this); late final $PackagesTable packages = $PackagesTable(this); late final $PackageVersionsTable packageVersions = $PackageVersionsTable(this); @@ -574,7 +594,7 @@ abstract class _$PubDatabase extends GeneratedDatabase { [packages, packageVersions]; } -typedef $$PackagesTableInsertCompanionBuilder = PackagesCompanion Function({ +typedef $$PackagesTableCreateCompanionBuilder = PackagesCompanion Function({ required String name, required String latest, Value rowid, @@ -585,26 +605,77 @@ typedef $$PackagesTableUpdateCompanionBuilder = PackagesCompanion Function({ Value rowid, }); +class $$PackagesTableFilterComposer + extends Composer<_$PubDatabase, $PackagesTable> { + $$PackagesTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get name => $composableBuilder( + column: $table.name, builder: (column) => ColumnFilters(column)); + + ColumnFilters get latest => $composableBuilder( + column: $table.latest, builder: (column) => ColumnFilters(column)); +} + +class $$PackagesTableOrderingComposer + extends Composer<_$PubDatabase, $PackagesTable> { + $$PackagesTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get name => $composableBuilder( + column: $table.name, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get latest => $composableBuilder( + column: $table.latest, builder: (column) => ColumnOrderings(column)); +} + +class $$PackagesTableAnnotationComposer + extends Composer<_$PubDatabase, $PackagesTable> { + $$PackagesTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get name => + $composableBuilder(column: $table.name, builder: (column) => column); + + GeneratedColumn get latest => + $composableBuilder(column: $table.latest, builder: (column) => column); +} + class $$PackagesTableTableManager extends RootTableManager< _$PubDatabase, $PackagesTable, Package, $$PackagesTableFilterComposer, $$PackagesTableOrderingComposer, - $$PackagesTableProcessedTableManager, - $$PackagesTableInsertCompanionBuilder, - $$PackagesTableUpdateCompanionBuilder> { + $$PackagesTableAnnotationComposer, + $$PackagesTableCreateCompanionBuilder, + $$PackagesTableUpdateCompanionBuilder, + (Package, BaseReferences<_$PubDatabase, $PackagesTable, Package>), + Package, + PrefetchHooks Function()> { $$PackagesTableTableManager(_$PubDatabase db, $PackagesTable table) : super(TableManagerState( db: db, table: table, - filteringComposer: - $$PackagesTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$PackagesTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$PackagesTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + createFilteringComposer: () => + $$PackagesTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$PackagesTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$PackagesTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ Value name = const Value.absent(), Value latest = const Value.absent(), Value rowid = const Value.absent(), @@ -614,7 +685,7 @@ class $$PackagesTableTableManager extends RootTableManager< latest: latest, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required String name, required String latest, Value rowid = const Value.absent(), @@ -624,50 +695,26 @@ class $$PackagesTableTableManager extends RootTableManager< latest: latest, rowid: rowid, ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, )); } -class $$PackagesTableProcessedTableManager extends ProcessedTableManager< +typedef $$PackagesTableProcessedTableManager = ProcessedTableManager< _$PubDatabase, $PackagesTable, Package, $$PackagesTableFilterComposer, $$PackagesTableOrderingComposer, - $$PackagesTableProcessedTableManager, - $$PackagesTableInsertCompanionBuilder, - $$PackagesTableUpdateCompanionBuilder> { - $$PackagesTableProcessedTableManager(super.$state); -} - -class $$PackagesTableFilterComposer - extends FilterComposer<_$PubDatabase, $PackagesTable> { - $$PackagesTableFilterComposer(super.$state); - ColumnFilters get name => $state.composableBuilder( - column: $state.table.name, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get latest => $state.composableBuilder( - column: $state.table.latest, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); -} - -class $$PackagesTableOrderingComposer - extends OrderingComposer<_$PubDatabase, $PackagesTable> { - $$PackagesTableOrderingComposer(super.$state); - ColumnOrderings get name => $state.composableBuilder( - column: $state.table.name, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get latest => $state.composableBuilder( - column: $state.table.latest, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); -} - -typedef $$PackageVersionsTableInsertCompanionBuilder = PackageVersionsCompanion + $$PackagesTableAnnotationComposer, + $$PackagesTableCreateCompanionBuilder, + $$PackagesTableUpdateCompanionBuilder, + (Package, BaseReferences<_$PubDatabase, $PackagesTable, Package>), + Package, + PrefetchHooks Function()>; +typedef $$PackageVersionsTableCreateCompanionBuilder = PackageVersionsCompanion Function({ required String package, required String version, @@ -690,27 +737,126 @@ typedef $$PackageVersionsTableUpdateCompanionBuilder = PackageVersionsCompanion Value rowid, }); +class $$PackageVersionsTableFilterComposer + extends Composer<_$PubDatabase, $PackageVersionsTable> { + $$PackageVersionsTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get package => $composableBuilder( + column: $table.package, builder: (column) => ColumnFilters(column)); + + ColumnFilters get version => $composableBuilder( + column: $table.version, builder: (column) => ColumnFilters(column)); + + ColumnFilters get archiveUrl => $composableBuilder( + column: $table.archiveUrl, builder: (column) => ColumnFilters(column)); + + ColumnFilters get pubspec => $composableBuilder( + column: $table.pubspec, builder: (column) => ColumnFilters(column)); + + ColumnFilters get readme => $composableBuilder( + column: $table.readme, builder: (column) => ColumnFilters(column)); + + ColumnFilters get changelog => $composableBuilder( + column: $table.changelog, builder: (column) => ColumnFilters(column)); + + ColumnFilters get published => $composableBuilder( + column: $table.published, builder: (column) => ColumnFilters(column)); +} + +class $$PackageVersionsTableOrderingComposer + extends Composer<_$PubDatabase, $PackageVersionsTable> { + $$PackageVersionsTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get package => $composableBuilder( + column: $table.package, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get version => $composableBuilder( + column: $table.version, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get archiveUrl => $composableBuilder( + column: $table.archiveUrl, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get pubspec => $composableBuilder( + column: $table.pubspec, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get readme => $composableBuilder( + column: $table.readme, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get changelog => $composableBuilder( + column: $table.changelog, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get published => $composableBuilder( + column: $table.published, builder: (column) => ColumnOrderings(column)); +} + +class $$PackageVersionsTableAnnotationComposer + extends Composer<_$PubDatabase, $PackageVersionsTable> { + $$PackageVersionsTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get package => + $composableBuilder(column: $table.package, builder: (column) => column); + + GeneratedColumn get version => + $composableBuilder(column: $table.version, builder: (column) => column); + + GeneratedColumn get archiveUrl => $composableBuilder( + column: $table.archiveUrl, builder: (column) => column); + + GeneratedColumn get pubspec => + $composableBuilder(column: $table.pubspec, builder: (column) => column); + + GeneratedColumn get readme => + $composableBuilder(column: $table.readme, builder: (column) => column); + + GeneratedColumn get changelog => + $composableBuilder(column: $table.changelog, builder: (column) => column); + + GeneratedColumn get published => + $composableBuilder(column: $table.published, builder: (column) => column); +} + class $$PackageVersionsTableTableManager extends RootTableManager< _$PubDatabase, $PackageVersionsTable, PackageVersion, $$PackageVersionsTableFilterComposer, $$PackageVersionsTableOrderingComposer, - $$PackageVersionsTableProcessedTableManager, - $$PackageVersionsTableInsertCompanionBuilder, - $$PackageVersionsTableUpdateCompanionBuilder> { + $$PackageVersionsTableAnnotationComposer, + $$PackageVersionsTableCreateCompanionBuilder, + $$PackageVersionsTableUpdateCompanionBuilder, + ( + PackageVersion, + BaseReferences<_$PubDatabase, $PackageVersionsTable, PackageVersion> + ), + PackageVersion, + PrefetchHooks Function()> { $$PackageVersionsTableTableManager( _$PubDatabase db, $PackageVersionsTable table) : super(TableManagerState( db: db, table: table, - filteringComposer: - $$PackageVersionsTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$PackageVersionsTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$PackageVersionsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + createFilteringComposer: () => + $$PackageVersionsTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$PackageVersionsTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$PackageVersionsTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ Value package = const Value.absent(), Value version = const Value.absent(), Value archiveUrl = const Value.absent(), @@ -730,7 +876,7 @@ class $$PackageVersionsTableTableManager extends RootTableManager< published: published, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required String package, required String version, required String archiveUrl, @@ -750,102 +896,32 @@ class $$PackageVersionsTableTableManager extends RootTableManager< published: published, rowid: rowid, ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, )); } -class $$PackageVersionsTableProcessedTableManager extends ProcessedTableManager< +typedef $$PackageVersionsTableProcessedTableManager = ProcessedTableManager< _$PubDatabase, $PackageVersionsTable, PackageVersion, $$PackageVersionsTableFilterComposer, $$PackageVersionsTableOrderingComposer, - $$PackageVersionsTableProcessedTableManager, - $$PackageVersionsTableInsertCompanionBuilder, - $$PackageVersionsTableUpdateCompanionBuilder> { - $$PackageVersionsTableProcessedTableManager(super.$state); -} - -class $$PackageVersionsTableFilterComposer - extends FilterComposer<_$PubDatabase, $PackageVersionsTable> { - $$PackageVersionsTableFilterComposer(super.$state); - ColumnFilters get package => $state.composableBuilder( - column: $state.table.package, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get version => $state.composableBuilder( - column: $state.table.version, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get archiveUrl => $state.composableBuilder( - column: $state.table.archiveUrl, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get pubspec => $state.composableBuilder( - column: $state.table.pubspec, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get readme => $state.composableBuilder( - column: $state.table.readme, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get changelog => $state.composableBuilder( - column: $state.table.changelog, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get published => $state.composableBuilder( - column: $state.table.published, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); -} - -class $$PackageVersionsTableOrderingComposer - extends OrderingComposer<_$PubDatabase, $PackageVersionsTable> { - $$PackageVersionsTableOrderingComposer(super.$state); - ColumnOrderings get package => $state.composableBuilder( - column: $state.table.package, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get version => $state.composableBuilder( - column: $state.table.version, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get archiveUrl => $state.composableBuilder( - column: $state.table.archiveUrl, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get pubspec => $state.composableBuilder( - column: $state.table.pubspec, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get readme => $state.composableBuilder( - column: $state.table.readme, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get changelog => $state.composableBuilder( - column: $state.table.changelog, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get published => $state.composableBuilder( - column: $state.table.published, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); -} + $$PackageVersionsTableAnnotationComposer, + $$PackageVersionsTableCreateCompanionBuilder, + $$PackageVersionsTableUpdateCompanionBuilder, + ( + PackageVersion, + BaseReferences<_$PubDatabase, $PackageVersionsTable, PackageVersion> + ), + PackageVersion, + PrefetchHooks Function()>; -class _$PubDatabaseManager { +class $PubDatabaseManager { final _$PubDatabase _db; - _$PubDatabaseManager(this._db); + $PubDatabaseManager(this._db); $$PackagesTableTableManager get packages => $$PackagesTableTableManager(_db, _db.packages); $$PackageVersionsTableTableManager get packageVersions => diff --git a/packages/test/pub_server/pubspec.yaml b/packages/test/pub_server/pubspec.yaml index b29627fbb2..e5d4c70819 100644 --- a/packages/test/pub_server/pubspec.yaml +++ b/packages/test/pub_server/pubspec.yaml @@ -6,7 +6,7 @@ issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: archive: ^3.3.7 @@ -14,7 +14,7 @@ dependencies: async: ^2.10.0 aws_common: any collection: ^1.15.0 - drift: ">=2.18.0 <2.19.0" + drift: ^2.25.0 file: ">=6.0.0 <8.0.0" git: ^2.2.0 graphs: ^2.1.0 @@ -31,7 +31,7 @@ dependencies: dev_dependencies: amplify_lints: ">=2.0.3 <2.1.0" build_runner: ^2.4.9 - drift_dev: ">=2.18.0 <2.19.0" + drift_dev: ^2.25.1 json_serializable: 6.8.0 pub_api_client: ">=2.4.0 <2.7.0" # v2.7.0 introduces a new required field - archive_sha256 shelf_router_generator: ^1.0.5 diff --git a/packages/worker_bee/e2e/lib/e2e_message.g.dart b/packages/worker_bee/e2e/lib/e2e_message.g.dart index aed6eb101f..5c11ad9df4 100644 --- a/packages/worker_bee/e2e/lib/e2e_message.g.dart +++ b/packages/worker_bee/e2e/lib/e2e_message.g.dart @@ -348,8 +348,9 @@ class CustomTypeBuilder implements Builder { _$CustomType _build() { final _$result = _$v ?? new _$CustomType._( - customField: BuiltValueNullFieldError.checkNotNull( - customField, r'CustomType', 'customField')); + customField: BuiltValueNullFieldError.checkNotNull( + customField, r'CustomType', 'customField'), + ); replace(_$result); return _$result; } @@ -641,33 +642,36 @@ class E2EMessageBuilder implements Builder { try { _$result = _$v ?? new _$E2EMessage._( - bigInt: BuiltValueNullFieldError.checkNotNull( - bigInt, r'E2EMessage', 'bigInt'), - bool_: BuiltValueNullFieldError.checkNotNull( - bool_, r'E2EMessage', 'bool_'), - builtList: builtList.build(), - builtListMultimap: builtListMultimap.build(), - builtMap: builtMap.build(), - builtSet: builtSet.build(), - builtSetMultimap: builtSetMultimap.build(), - dateTime: BuiltValueNullFieldError.checkNotNull( - dateTime, r'E2EMessage', 'dateTime'), - double_: BuiltValueNullFieldError.checkNotNull( - double_, r'E2EMessage', 'double_'), - duration: BuiltValueNullFieldError.checkNotNull( - duration, r'E2EMessage', 'duration'), - int_: BuiltValueNullFieldError.checkNotNull( - int_, r'E2EMessage', 'int_'), - int64: BuiltValueNullFieldError.checkNotNull( - int64, r'E2EMessage', 'int64'), - jsonObject: BuiltValueNullFieldError.checkNotNull( - jsonObject, r'E2EMessage', 'jsonObject'), - num_: BuiltValueNullFieldError.checkNotNull( - num_, r'E2EMessage', 'num_'), - regExp: BuiltValueNullFieldError.checkNotNull( - regExp, r'E2EMessage', 'regExp'), - string: BuiltValueNullFieldError.checkNotNull(string, r'E2EMessage', 'string'), - uri: BuiltValueNullFieldError.checkNotNull(uri, r'E2EMessage', 'uri')); + bigInt: BuiltValueNullFieldError.checkNotNull( + bigInt, r'E2EMessage', 'bigInt'), + bool_: BuiltValueNullFieldError.checkNotNull( + bool_, r'E2EMessage', 'bool_'), + builtList: builtList.build(), + builtListMultimap: builtListMultimap.build(), + builtMap: builtMap.build(), + builtSet: builtSet.build(), + builtSetMultimap: builtSetMultimap.build(), + dateTime: BuiltValueNullFieldError.checkNotNull( + dateTime, r'E2EMessage', 'dateTime'), + double_: BuiltValueNullFieldError.checkNotNull( + double_, r'E2EMessage', 'double_'), + duration: BuiltValueNullFieldError.checkNotNull( + duration, r'E2EMessage', 'duration'), + int_: BuiltValueNullFieldError.checkNotNull( + int_, r'E2EMessage', 'int_'), + int64: BuiltValueNullFieldError.checkNotNull( + int64, r'E2EMessage', 'int64'), + jsonObject: BuiltValueNullFieldError.checkNotNull( + jsonObject, r'E2EMessage', 'jsonObject'), + num_: BuiltValueNullFieldError.checkNotNull( + num_, r'E2EMessage', 'num_'), + regExp: BuiltValueNullFieldError.checkNotNull( + regExp, r'E2EMessage', 'regExp'), + string: BuiltValueNullFieldError.checkNotNull( + string, r'E2EMessage', 'string'), + uri: BuiltValueNullFieldError.checkNotNull( + uri, r'E2EMessage', 'uri'), + ); } catch (_) { late String _$failedField; try { @@ -766,7 +770,10 @@ class E2EResultBuilder implements Builder { _$E2EResult _build() { _$E2EResult _$result; try { - _$result = _$v ?? new _$E2EResult._(message: message.build()); + _$result = _$v ?? + new _$E2EResult._( + message: message.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/packages/worker_bee/e2e/pubspec.yaml b/packages/worker_bee/e2e/pubspec.yaml index 020eec93f2..3bad6c92a9 100644 --- a/packages/worker_bee/e2e/pubspec.yaml +++ b/packages/worker_bee/e2e/pubspec.yaml @@ -3,7 +3,7 @@ description: E2E tests for the worker_bee package. publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: aws_common: ">=0.4.0 <0.5.0" @@ -26,6 +26,6 @@ dev_dependencies: build_runner: ^2.4.9 build_verify: ^3.0.0 build_web_compilers: ^4.0.0 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 worker_bee_builder: path: ../worker_bee_builder diff --git a/packages/worker_bee/e2e_flutter_test/pubspec.yaml b/packages/worker_bee/e2e_flutter_test/pubspec.yaml index 8e8e0e49f5..cfc83900d1 100644 --- a/packages/worker_bee/e2e_flutter_test/pubspec.yaml +++ b/packages/worker_bee/e2e_flutter_test/pubspec.yaml @@ -4,8 +4,8 @@ publish_to: 'none' version: 1.0.0+1 environment: - flutter: ">=3.19.0" - sdk: ^3.3.0 + flutter: ">=3.27.0" + sdk: ^3.6.0 dependencies: e2e: diff --git a/packages/worker_bee/e2e_test/pubspec.yaml b/packages/worker_bee/e2e_test/pubspec.yaml index 8babfa1565..aaf93655c2 100644 --- a/packages/worker_bee/e2e_test/pubspec.yaml +++ b/packages/worker_bee/e2e_test/pubspec.yaml @@ -3,7 +3,7 @@ description: E2E tests for the worker_bee package. publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependency_overrides: aws_common: @@ -20,7 +20,7 @@ dev_dependencies: build_web_compilers: ^4.0.0 built_collection: ^5.0.0 built_value: ^8.6.0 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 e2e: path: ../e2e meta: ^1.7.0 diff --git a/packages/worker_bee/e2e_test/test/preamble_test.dart b/packages/worker_bee/e2e_test/test/preamble_test.dart index 46d9de5baf..75a2c235fe 100644 --- a/packages/worker_bee/e2e_test/test/preamble_test.dart +++ b/packages/worker_bee/e2e_test/test/preamble_test.dart @@ -3,6 +3,7 @@ @TestOn('browser') +//ignore: deprecated_member_use import 'dart:html'; import 'package:test/test.dart'; diff --git a/packages/worker_bee/worker_bee/lib/src/worker_bee_js.dart b/packages/worker_bee/worker_bee/lib/src/worker_bee_js.dart index 25893d5cd7..3651d8cf54 100644 --- a/packages/worker_bee/worker_bee/lib/src/worker_bee_js.dart +++ b/packages/worker_bee/worker_bee/lib/src/worker_bee_js.dart @@ -1,5 +1,6 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +//ignore: deprecated_member_use export 'package:js/js.dart'; export 'package:stream_channel/stream_channel.dart'; diff --git a/packages/worker_bee/worker_bee/pubspec.yaml b/packages/worker_bee/worker_bee/pubspec.yaml index 14996fe026..56860b37e1 100644 --- a/packages/worker_bee/worker_bee/pubspec.yaml +++ b/packages/worker_bee/worker_bee/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/wo issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: async: ^2.10.0 @@ -24,5 +24,5 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" build_runner: ^2.4.9 - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 test: ^1.22.1 diff --git a/packages/worker_bee/worker_bee_builder/pubspec.yaml b/packages/worker_bee/worker_bee_builder/pubspec.yaml index 71d6560ee2..83d8f2b318 100644 --- a/packages/worker_bee/worker_bee_builder/pubspec.yaml +++ b/packages/worker_bee/worker_bee_builder/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/wo issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: analyzer: ">=5.1.0 <7.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 298afd11e2..c3ab04736c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,8 +3,8 @@ publish_to: none # The current constraints for Dart and Flutter SDKs. environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" # Global dependency versions for third-party dependencies of # Amplify Flutter projects. These represent the values which @@ -18,15 +18,15 @@ dependencies: build_runner: ^2.4.9 build_web_compilers: ^4.0.0 built_value: "^8.6.0" - built_value_generator: 8.8.1 + built_value_generator: 8.9.3 code_builder: 4.10.0 connectivity_plus: ^6.0.1 # This must roughly match what's included in `dart format` # on stable so that CI checks pass for generated code. dart_style: ^2.3.2 device_info_plus: ^10.0.1 - drift: ">=2.18.0 <2.19.0" - drift_dev: ">=2.18.0 <2.19.0" + drift: ^2.25.0 + drift_dev: ^2.25.1 ffigen: ^9.0.0 file: ">=6.0.0 <8.0.0" flutter_plugin_android_lifecycle: ^2.0.9 @@ -38,8 +38,8 @@ dependencies: mime: ">=1.0.0 <3.0.0" oauth2: ^2.0.2 package_info_plus: ^8.0.0 - pigeon: ^11.0.0 - sqlite3: ">=2.0.0 <2.4.7" + pigeon: ^22.6.2 + sqlite3: ">=2.6.0 <2.7.0" source_gen: ^1.3.2 stack_trace: ^1.10.0 uuid: ">=3.0.6 <5.0.0" diff --git a/templates/dart-package/__brick__/example/web/main.dart b/templates/dart-package/__brick__/example/web/main.dart index 87a3d61bde..6ef3c9fc2d 100644 --- a/templates/dart-package/__brick__/example/web/main.dart +++ b/templates/dart-package/__brick__/example/web/main.dart @@ -1,3 +1,4 @@ +//ignore: deprecated_member_use import 'dart:html'; void main() { diff --git a/templates/dart-package/hooks/pubspec.yaml b/templates/dart-package/hooks/pubspec.yaml index ac5f43be57..733e5f7bf1 100644 --- a/templates/dart-package/hooks/pubspec.yaml +++ b/templates/dart-package/hooks/pubspec.yaml @@ -2,7 +2,7 @@ name: dart_package_hooks publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: mason: ">=0.1.0-dev.40 <0.1.0" diff --git a/templates/flutter-package/hooks/pubspec.yaml b/templates/flutter-package/hooks/pubspec.yaml index 2a154749c9..3fc926530e 100644 --- a/templates/flutter-package/hooks/pubspec.yaml +++ b/templates/flutter-package/hooks/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_package_hooks publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.6.0 dependencies: mason: ">=0.1.0-dev.40 <0.1.0"