Skip to content

Commit 421745f

Browse files
committed
chore(all): Updated Flutter/Dart SDKs and Drift version (#5741)
-Updated Pigeon then regenerated files and fixed breaking changes --renamed setup to setUp in various locations --added pigeonVar_binaryMessenger and pigeonVar_messageChannelSuffix to AmplifyNativeLegacyWrapper --renamed PigeonLegacyDataProvider to PinpointLegacyDataProvider (API can’t start with Pigeon) --updated signInWithUrl’s return value (this was updated 3 years ago) --updated native code to support new Result return value -Updated Drift then regenerated databases and fixed breaking changes --updated built_value_generator -Updated Flutter and Dart SDK --Added entry-point annotation for push notification test --Migrated example Android projects to use declarative plugin blocks for Gradle --Updated canary project ---Added support for both *.gradle and *.gradle.kts extensions ---Updated Gradle Version ---Added Desugaring
1 parent 345c27c commit 421745f

File tree

385 files changed

+6409
-4091
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+6409
-4091
lines changed

.github/ISSUE_TEMPLATE/BUG-REPORT.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ body:
7979
attributes:
8080
label: "Flutter Version"
8181
description: "Please share which version of Flutter you're using (found using `flutter --version`)."
82-
placeholder: "3.24.0"
82+
placeholder: "3.27.0"
8383
validations:
8484
required: true
8585
- type: input

.github/workflows/actions.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Dart
3232
uses: dart-lang/setup-dart@e58aeb62aef51dcc4d0ba8eada7c08092aad5314 # main
3333
with:
34-
sdk: 3.3.0
34+
sdk: 3.6.0
3535

3636
- name: Setup pnpm
3737
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # 4.0.0
@@ -63,7 +63,7 @@ jobs:
6363
- name: Setup Dart
6464
uses: dart-lang/setup-dart@e58aeb62aef51dcc4d0ba8eada7c08092aad5314 # main
6565
with:
66-
sdk: 3.3.0
66+
sdk: 3.6.0
6767

6868
- name: Setup aft
6969
shell: bash # Run in bash regardless of platform

.github/workflows/amplify_canaries.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- "any" # latest
3333
include:
3434
- channel: "stable"
35-
flutter-version: "3.19.0"
35+
flutter-version: "3.27.0"
3636
steps:
3737
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0
3838
with:
@@ -88,7 +88,7 @@ jobs:
8888
- "any" # latest
8989
include:
9090
- channel: "stable"
91-
flutter-version: "3.19.0"
91+
flutter-version: "3.27.0"
9292
steps:
9393
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0
9494
with:
@@ -162,7 +162,7 @@ jobs:
162162
- "any" # latest
163163
include:
164164
- channel: "stable"
165-
flutter-version: "3.19.0"
165+
flutter-version: "3.27.0"
166166
ios-version:
167167
- "15.0"
168168
- "17.5"

.github/workflows/dart_dart2js.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
sdk:
2424
# Minimum supported Dart version
25-
- "3.3.0"
25+
- "3.6.0"
2626
- stable
2727
- beta
2828
browser:

.github/workflows/dart_ddc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
sdk:
2424
# Minimum supported Dart version
25-
- "3.3.0"
25+
- "3.6.0"
2626
- stable
2727
- beta
2828
browser:

.github/workflows/dart_vm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
matrix:
2222
sdk:
2323
# Minimum supported Dart version
24-
- "3.3.0"
24+
- "3.6.0"
2525
- stable
2626
- beta
2727
# Skips 'beta' tests on PRs

.github/workflows/flutter_vm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- "any" # latest
3232
include:
3333
- channel: "stable"
34-
flutter-version: "3.19.0"
34+
flutter-version: "3.27.0"
3535
# Skips 'beta' tests on PRs
3636
exclude:
3737
- channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}

actions/lib/src/node/actions/exec.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import 'dart:convert';
55
import 'dart:js_interop';
6+
//ignore: deprecated_member_use
67
import 'dart:js_util';
78

89
@JS()

actions/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 1.0.0
44
publish_to: none
55

66
environment:
7-
sdk: ^3.3.0
7+
sdk: ^3.6.0
88

99
dependencies:
1010
aws_common: ^0.6.1

build-support/build_canary.sh

Lines changed: 56 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,62 @@ cp -r $ROOT_DIR/canaries/lib .
2424
cp $ROOT_DIR/build-support/dummy_amplifyconfiguration.dart lib/amplifyconfiguration.dart
2525

2626
# Android
27-
sed -i '' -e "s/id \"com.android.application\" .*/id \"com.android.application\" version \"8.1.0\" apply false/" ./android/settings.gradle
28-
sed -i '' -e "s/id \"org.jetbrains.kotlin.android\" .*/id \"org.jetbrains.kotlin.android\" version \"1.9.10\" apply false/" ./android/settings.gradle
29-
cat ./android/settings.gradle
30-
31-
# TODO(khatruong2009): remove this line after the next stable release (3.22.0 or 4.0)
32-
sed -i '' -e "s/minSdkVersion .*/minSdkVersion 24/" ./android/app/build.gradle
33-
sed -i '' -e "s/minSdk .*/minSdk 24/" ./android/app/build.gradle
34-
sed -i '' -e '/id "kotlin-android"/a\
35-
id '\''kotlin-parcelize'\''' ./android/app/build.gradle
36-
sed -i '' -e "s/compileSdk .*/compileSdk = 35/" ./android/app/build.gradle
37-
sed -i '' -e "s/sourceCompatibility .*/sourceCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle
38-
sed -i '' -e "s/targetCompatibility .*/targetCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle
39-
# TODO(equartey): remove this line after the next stable release (3.22.0 or 4.0)
40-
sed -i '' -e '/kotlinOptions {/,/}/ s/jvmTarget = .*/jvmTarget = '\''17'\''/' ./android/app/build.gradle
41-
cat ./android/app/build.gradle
42-
43-
sed -i '' -e "s#distributionUrl=.*#distributionUrl=https\\://services.gradle.org/distributions/gradle-8.1-all.zip#" ./android/gradle/wrapper/gradle-wrapper.properties
44-
cat ./android/gradle/wrapper/gradle-wrapper.properties
27+
# Flutter >=3.29.0
28+
if [ -e ./android/settings.gradle.kts ]
29+
then
30+
sed -i '' -e "s/id(\"com.android.application\") .*/id(\"com.android.application\") version \"8.1.0\" apply false/" ./android/settings.gradle.kts
31+
sed -i '' -e "s/id(\"org.jetbrains.kotlin.android\") .*/id(\"org.jetbrains.kotlin.android\") version \"1.9.10\" apply false/" ./android/settings.gradle.kts
32+
cat ./android/settings.gradle.kts
33+
34+
# TODO(khatruong2009): remove this line after the next stable release (3.22.0 or 4.0)
35+
sed -i '' -e "s/minSdkVersion = .*/minSdkVersion = 24/" ./android/app/build.gradle.kts
36+
sed -i '' -e "s/minSdk = .*/minSdk = 24/" ./android/app/build.gradle.kts
37+
38+
sed -i '' -e '/id "kotlin-android"/a\
39+
id '\''kotlin-parcelize'\''' ./android/app/build.gradle.kts
40+
41+
sed -i '' -e "s/compileSdk = .*/compileSdk = 35/" ./android/app/build.gradle.kts
42+
43+
sed -i '' -e "s/sourceCompatibility = .*/sourceCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle.kts
44+
45+
sed -i '' -e "s/targetCompatibility = .*/targetCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle.kts
46+
47+
# TODO(equartey): remove this line after the next stable release (3.22.0 or 4.0)
48+
sed -i '' -e "s/jvmTarget = .*/jvmTarget = JavaVersion.VERSION_17.toString()/" ./android/app/build.gradle.kts
49+
50+
sed -i '' -e "s/compileOptions {.*/compileOptions {\n\t\tisCoreLibraryDesugaringEnabled = true/" ./android/app/build.gradle.kts
51+
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
52+
cat ./android/app/build.gradle.kts
53+
54+
sed -i '' -e "s#distributionUrl=.*#distributionUrl=https\\://services.gradle.org/distributions/gradle-8.9-all.zip#" ./android/gradle/wrapper/gradle-wrapper.properties
55+
cat ./android/gradle/wrapper/gradle-wrapper.properties
56+
# Flutter <3.29.0 (delete this else block when min Flutter SDK is bumped to 3.29.0 or higher)
57+
else
58+
sed -i '' -e "s/id \"com.android.application\" .*/id \"com.android.application\" version \"8.1.0\" apply false/" ./android/settings.gradle
59+
sed -i '' -e "s/id \"org.jetbrains.kotlin.android\" .*/id \"org.jetbrains.kotlin.android\" version \"1.9.10\" apply false/" ./android/settings.gradle
60+
cat ./android/settings.gradle
61+
62+
sed -i '' -e "s/minSdkVersion = .*/minSdkVersion = 24/" ./android/app/build.gradle
63+
sed -i '' -e "s/minSdk = .*/minSdk = 24/" ./android/app/build.gradle
64+
65+
sed -i '' -e '/id "kotlin-android"/a\
66+
id '\''kotlin-parcelize'\''' ./android/app/build.gradle
67+
68+
sed -i '' -e "s/compileSdk = .*/compileSdk = 35/" ./android/app/build.gradle
69+
70+
sed -i '' -e "s/sourceCompatibility = .*/sourceCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle
71+
72+
sed -i '' -e "s/targetCompatibility = .*/targetCompatibility = JavaVersion.VERSION_17/" ./android/app/build.gradle
73+
74+
sed -i '' -e "s/jvmTarget = .*/jvmTarget = JavaVersion.VERSION_17/" ./android/app/build.gradle
75+
76+
#sed -i '' -e "s/compileOptions {.*/compileOptions {\n\t\tCoreLibraryDesugaringEnabled = true/" ./android/app/build.gradle
77+
sed -i '' -e "s/flutter {.*/dependencies {\n\tcoreLibraryDesugaring(\"com.android.tools:desugar_jdk_libs:2.0.3\")\n}\n\nflutter {/" ./android/app/build.gradle
78+
cat ./android/app/build.gradle
79+
80+
sed -i '' -e "s#distributionUrl=.*#distributionUrl=https\\://services.gradle.org/distributions/gradle-8.9-all.zip#" ./android/gradle/wrapper/gradle-wrapper.properties
81+
cat ./android/gradle/wrapper/gradle-wrapper.properties
82+
fi
4583

4684
# iOS
4785
sed -i '' -e "s/# platform .*/platform :ios, '13.0'/" ./ios/Podfile

0 commit comments

Comments
 (0)