Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions .github/workflows/code_health.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
cache: true
- uses: bluefireteam/melos-action@v3
with:
melos-version: "3.0.1"
melos-version: "^7.5.0"
- name: "Run Analyze"
run: melos run analyze

Expand All @@ -41,7 +41,7 @@ jobs:
cache: true
- uses: bluefireteam/melos-action@v3
with:
melos-version: "3.0.1"
melos-version: "^7.5.0"
- name: "Pub Check"
run: |
melos exec -c 1 --no-private --ignore="*example*" -- \
Expand All @@ -57,7 +57,7 @@ jobs:
cache: true
- uses: bluefireteam/melos-action@v3
with:
melos-version: "3.0.1"
melos-version: "^7.5.0"
- name: "flutter pub get"
run: |
melos exec -c 1 --scope="*example*" -- \
Expand All @@ -74,7 +74,7 @@ jobs:
cache: true
- uses: bluefireteam/melos-action@v3
with:
melos-version: "3.0.1"
melos-version: "^7.5.0"
- uses: Homebrew/actions/setup-homebrew@master
- name: "Install Tools"
run: |
Expand Down Expand Up @@ -105,12 +105,14 @@ jobs:
with:
go-version: "^1.13.1"
- run: go install github.com/google/addlicense@latest
- name: Install Dart
uses: dart-lang/setup-dart@v1
- uses: subosito/flutter-action@v2
with:
channel: "stable"
cache: true
- name: Install Melos
uses: bluefireteam/melos-action@v3
with:
run-bootstrap: false
melos-version: "3.0.1"
melos-version: "^7.5.0"
- name: Check license header
run: melos run check-license-header
8 changes: 4 additions & 4 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- uses: bluefireteam/melos-action@720a109b686f61979b4f9f0d14f582ab1637647e
with:
run-bootstrap: false
melos-version: "3.0.1"
melos-version: "^7.5.0"
- name: "Bootstrap package"
run: melos bootstrap --scope tests
# 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
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
- uses: bluefireteam/melos-action@720a109b686f61979b4f9f0d14f582ab1637647e
with:
run-bootstrap: false
melos-version: "3.0.1"
melos-version: "^7.5.0"
- name: "Bootstrap package"
run: melos bootstrap --scope tests
- name: Clean up previous build artifacts
Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
- uses: bluefireteam/melos-action@720a109b686f61979b4f9f0d14f582ab1637647e
with:
run-bootstrap: false
melos-version: "3.0.1"
melos-version: "^7.5.0"
- name: "Bootstrap package"
run: melos bootstrap --scope tests
- name: "Build Application"
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
cache: true
- uses: bluefireteam/melos-action@720a109b686f61979b4f9f0d14f582ab1637647e
with:
melos-version: "3.0.1"
melos-version: "^6.3.3"
- name: 'Build Test Applications'
run: |
cd packages/firebase_ui_auth/example
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
cache: true
- uses: bluefireteam/melos-action@v3
with:
melos-version: "3.0.1"
melos-version: "^7.5.0"

- name: Run unit tests on Chrome
if: matrix.target == 'html'
Expand Down
163 changes: 0 additions & 163 deletions melos.yaml

This file was deleted.

6 changes: 4 additions & 2 deletions packages/firebase_ui_auth/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ^3.5.0

resolution: workspace

dependencies:
app_tracking_transparency: ^2.0.6
Expand Down Expand Up @@ -86,4 +88,4 @@ flutter:
# weight: 700
#
# For details regarding fonts from package dependencies,
# see https://flutter.dev/custom-fonts/#from-packages
# see https://flutter.dev/custom-fonts/#from-packages
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ abstract class MultiProviderScreen extends Widget {

List<AuthProvider> get providers {
if (_providers != null) {
return _providers!;
return _providers;
} else {
return FirebaseUIAuth.providersFor(auth.app);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ abstract class ProviderScreen<T extends AuthProvider> extends StatelessWidget {

/// Current [AuthProvider] that is being used to authenticate the user.
T get provider {
if (_provider != null) return _provider!;
if (_provider != null) return _provider;
if (_cache.containsKey(T)) {
return _cache[T]! as T;
}
Expand Down
13 changes: 6 additions & 7 deletions packages/firebase_ui_auth/lib/src/widgets/auth_flow_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,12 @@ class _AuthFlowBuilderState<T extends AuthController>
}

AuthProvider _createDefaultProvider() {
switch (T) {
case EmailAuthController:
return EmailAuthProvider();
case PhoneAuthController:
return PhoneAuthProvider();
default:
throw Exception("Can't create $T provider");
if (T == EmailAuthController) {
return EmailAuthProvider();
} else if (T == PhoneAuthController) {
return PhoneAuthProvider();
} else {
throw Exception("Can't create $T provider");
}
}

Expand Down
5 changes: 3 additions & 2 deletions packages/firebase_ui_auth/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ version: 3.0.1
repository: https://github.com/firebase/FirebaseUI-Flutter/tree/master/packages/firebase_ui_auth
homepage: https://github.com/firebase/FirebaseUI-Flutter/tree/master/packages/firebase_ui_auth

resolution: workspace

environment:
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"
sdk: ^3.5.0

dependencies:
app_links: ^6.4.0
Expand Down
4 changes: 3 additions & 1 deletion packages/firebase_ui_database/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: ">=2.18.0 <4.0.0"
sdk: ^3.5.0

resolution: workspace

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand Down
1 change: 1 addition & 0 deletions packages/firebase_ui_database/lib/src/query_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,7 @@ class FirebaseDatabaseListView extends FirebaseDatabaseQueryBuilder {
addAutomaticKeepAlives: addAutomaticKeepAlives,
addRepaintBoundaries: addRepaintBoundaries,
addSemanticIndexes: addSemanticIndexes,
// ignore: deprecated_member_use
cacheExtent: cacheExtent,
semanticChildCount: semanticChildCount,
dragStartBehavior: dragStartBehavior,
Expand Down
5 changes: 3 additions & 2 deletions packages/firebase_ui_database/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ description: Pre-built widgets and utilites that make it easy to integrate Fireb
version: 2.0.1
homepage: https://github.com/firebase/FirebaseUI-Flutter/tree/master/packages/firebase_ui_database

resolution: workspace

environment:
sdk: ">=2.18.0 <4.0.0"
flutter: ">=3.3.0"
sdk: ^3.5.0

dependencies:
collection: ^1.18.0
Expand Down
4 changes: 3 additions & 1 deletion packages/firebase_ui_firestore/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: ">=2.18.0 <4.0.0"
sdk: ^3.5.0

resolution: workspace

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand Down
3 changes: 3 additions & 0 deletions packages/firebase_ui_firestore/lib/src/query_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ class FirestoreListView<Document> extends FirestoreQueryBuilder<Document> {
addAutomaticKeepAlives: addAutomaticKeepAlives,
addRepaintBoundaries: addRepaintBoundaries,
addSemanticIndexes: addSemanticIndexes,
// ignore: deprecated_member_use
cacheExtent: cacheExtent,
semanticChildCount: semanticChildCount,
dragStartBehavior: dragStartBehavior,
Expand Down Expand Up @@ -642,10 +643,12 @@ class FirestoreListView<Document> extends FirestoreQueryBuilder<Document> {
physics: physics,
shrinkWrap: shrinkWrap,
padding: padding,
// ignore: deprecated_member_use
findChildIndexCallback: findChildIndexCallback,
addAutomaticKeepAlives: addAutomaticKeepAlives,
addRepaintBoundaries: addRepaintBoundaries,
addSemanticIndexes: addSemanticIndexes,
// ignore: deprecated_member_use
cacheExtent: cacheExtent,
dragStartBehavior: dragStartBehavior,
keyboardDismissBehavior: keyboardDismissBehavior,
Expand Down
Loading
Loading