Skip to content

Commit aefa711

Browse files
authored
feat: upgrade all packages min SDK to Dart 3.5 (#615)
1 parent 8b5cc97 commit aefa711

39 files changed

Lines changed: 282 additions & 238 deletions

File tree

.github/workflows/code_health.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
cache: true
2828
- uses: bluefireteam/melos-action@v3
2929
with:
30-
melos-version: "3.0.1"
30+
melos-version: "^7.5.0"
3131
- name: "Run Analyze"
3232
run: melos run analyze
3333

@@ -41,7 +41,7 @@ jobs:
4141
cache: true
4242
- uses: bluefireteam/melos-action@v3
4343
with:
44-
melos-version: "3.0.1"
44+
melos-version: "^7.5.0"
4545
- name: "Pub Check"
4646
run: |
4747
melos exec -c 1 --no-private --ignore="*example*" -- \
@@ -57,7 +57,7 @@ jobs:
5757
cache: true
5858
- uses: bluefireteam/melos-action@v3
5959
with:
60-
melos-version: "3.0.1"
60+
melos-version: "^7.5.0"
6161
- name: "flutter pub get"
6262
run: |
6363
melos exec -c 1 --scope="*example*" -- \
@@ -74,7 +74,7 @@ jobs:
7474
cache: true
7575
- uses: bluefireteam/melos-action@v3
7676
with:
77-
melos-version: "3.0.1"
77+
melos-version: "^7.5.0"
7878
- uses: Homebrew/actions/setup-homebrew@master
7979
- name: "Install Tools"
8080
run: |
@@ -105,12 +105,14 @@ jobs:
105105
with:
106106
go-version: "^1.13.1"
107107
- run: go install github.com/google/addlicense@latest
108-
- name: Install Dart
109-
uses: dart-lang/setup-dart@v1
108+
- uses: subosito/flutter-action@v2
109+
with:
110+
channel: "stable"
111+
cache: true
110112
- name: Install Melos
111113
uses: bluefireteam/melos-action@v3
112114
with:
113115
run-bootstrap: false
114-
melos-version: "3.0.1"
116+
melos-version: "^7.5.0"
115117
- name: Check license header
116118
run: melos run check-license-header

.github/workflows/e2e.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- uses: bluefireteam/melos-action@720a109b686f61979b4f9f0d14f582ab1637647e
6868
with:
6969
run-bootstrap: false
70-
melos-version: "3.0.1"
70+
melos-version: "^7.5.0"
7171
- name: "Bootstrap package"
7272
run: melos bootstrap --scope tests
7373
# needed because twitter_login plugin doesn't have a namespace defined and he hasn't released a new version yet: https://github.com/0maru/twitter_login/issues/139
@@ -146,7 +146,7 @@ jobs:
146146
- uses: bluefireteam/melos-action@720a109b686f61979b4f9f0d14f582ab1637647e
147147
with:
148148
run-bootstrap: false
149-
melos-version: "3.0.1"
149+
melos-version: "^7.5.0"
150150
- name: "Bootstrap package"
151151
run: melos bootstrap --scope tests
152152
- name: Clean up previous build artifacts
@@ -225,7 +225,7 @@ jobs:
225225
- uses: bluefireteam/melos-action@720a109b686f61979b4f9f0d14f582ab1637647e
226226
with:
227227
run-bootstrap: false
228-
melos-version: "3.0.1"
228+
melos-version: "^7.5.0"
229229
- name: "Bootstrap package"
230230
run: melos bootstrap --scope tests
231231
- name: "Build Application"
@@ -260,7 +260,7 @@ jobs:
260260
cache: true
261261
- uses: bluefireteam/melos-action@720a109b686f61979b4f9f0d14f582ab1637647e
262262
with:
263-
melos-version: "3.0.1"
263+
melos-version: "^6.3.3"
264264
- name: 'Build Test Applications'
265265
run: |
266266
cd packages/firebase_ui_auth/example

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
cache: true
5252
- uses: bluefireteam/melos-action@v3
5353
with:
54-
melos-version: "3.0.1"
54+
melos-version: "^7.5.0"
5555

5656
- name: Run unit tests on Chrome
5757
if: matrix.target == 'html'

melos.yaml

Lines changed: 0 additions & 163 deletions
This file was deleted.

packages/firebase_ui_auth/example/pubspec.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
1818
version: 1.0.0+1
1919

2020
environment:
21-
sdk: ">=3.0.0 <4.0.0"
21+
sdk: ^3.5.0
22+
23+
resolution: workspace
2224

2325
dependencies:
2426
app_tracking_transparency: ^2.0.6
@@ -86,4 +88,4 @@ flutter:
8688
# weight: 700
8789
#
8890
# For details regarding fonts from package dependencies,
89-
# see https://flutter.dev/custom-fonts/#from-packages
91+
# see https://flutter.dev/custom-fonts/#from-packages

packages/firebase_ui_auth/lib/src/screens/internal/multi_provider_screen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ abstract class MultiProviderScreen extends Widget {
2222

2323
List<AuthProvider> get providers {
2424
if (_providers != null) {
25-
return _providers!;
25+
return _providers;
2626
} else {
2727
return FirebaseUIAuth.providersFor(auth.app);
2828
}

packages/firebase_ui_auth/lib/src/screens/internal/provider_screen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ abstract class ProviderScreen<T extends AuthProvider> extends StatelessWidget {
1616

1717
/// Current [AuthProvider] that is being used to authenticate the user.
1818
T get provider {
19-
if (_provider != null) return _provider!;
19+
if (_provider != null) return _provider;
2020
if (_cache.containsKey(T)) {
2121
return _cache[T]! as T;
2222
}

packages/firebase_ui_auth/lib/src/widgets/auth_flow_builder.dart

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,12 @@ class _AuthFlowBuilderState<T extends AuthController>
220220
}
221221

222222
AuthProvider _createDefaultProvider() {
223-
switch (T) {
224-
case EmailAuthController:
225-
return EmailAuthProvider();
226-
case PhoneAuthController:
227-
return PhoneAuthProvider();
228-
default:
229-
throw Exception("Can't create $T provider");
223+
if (T == EmailAuthController) {
224+
return EmailAuthProvider();
225+
} else if (T == PhoneAuthController) {
226+
return PhoneAuthProvider();
227+
} else {
228+
throw Exception("Can't create $T provider");
230229
}
231230
}
232231

packages/firebase_ui_auth/pubspec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ version: 3.0.1
44
repository: https://github.com/firebase/FirebaseUI-Flutter/tree/master/packages/firebase_ui_auth
55
homepage: https://github.com/firebase/FirebaseUI-Flutter/tree/master/packages/firebase_ui_auth
66

7+
resolution: workspace
8+
79
environment:
8-
sdk: ">=2.18.0 <4.0.0"
9-
flutter: ">=3.3.0"
10+
sdk: ^3.5.0
1011

1112
dependencies:
1213
app_links: ^6.4.0

packages/firebase_ui_database/example/pubspec.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
1818
version: 1.0.0+1
1919

2020
environment:
21-
sdk: ">=2.18.0 <4.0.0"
21+
sdk: ^3.5.0
22+
23+
resolution: workspace
2224

2325
# Dependencies specify other packages that your package needs in order to work.
2426
# To automatically upgrade your package dependencies to the latest versions

0 commit comments

Comments
 (0)