chore(all): Updated Flutter/Dart SDKs and Drift version

.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

.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

.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"

.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:

.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:

.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

.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' }}

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()

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

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

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

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

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

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

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.27.0"
 - Dart ^3.3.0
 - Java 17, Kotlin 1.9.10 and Gradle 8.1 for Android projects
 

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"

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:

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

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\.]+');

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