Skip to content

Commit 6cdfcb1

Browse files
kevmooLyokone
andauthored
refactor: move all packages to workspace (#18182)
* Refactor: move all packages to workspace * Add some workspace validation logic! --------- Co-authored-by: Guillaume Bernos <guillaume@bernos.dev>
1 parent 15eb457 commit 6cdfcb1

70 files changed

Lines changed: 740 additions & 134 deletions

File tree

Some content is hidden

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

.github/workflows/all_plugins.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ jobs:
3535
melos-version: '5.3.0'
3636
- name: 'Run Analyze'
3737
run: melos analyze-ci
38+
- name: 'Validate Workspace'
39+
if: always()
40+
run: melos run validate:workspace
3841

3942
# Separated from "analyse" action as pubspec_override file is not being taken into account when running `flutter pub publish --dry-run`
4043
# This will fail on CI until this is fixed: https://github.com/invertase/melos/issues/467
@@ -192,8 +195,12 @@ jobs:
192195
# Go is used by addlicense command (addlicense is used in melos run
193196
# check-license-header)
194197
- run: go install github.com/google/addlicense@latest
195-
- name: Install Dart
196-
uses: dart-lang/setup-dart@65eb853c7ba17dde3be364c3d2858773e7144260
198+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
199+
with:
200+
channel: 'stable'
201+
cache: true
202+
cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
203+
pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-:hash:"
197204
- name: Install Melos
198205
uses: bluefireteam/melos-action@705015c3d2bc4ab94201ac24accb2bbe070cf533
199206
with:

packages/_flutterfire_internals/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ description: A package hosting Dart code shared between FlutterFire plugins.
33
homepage: https://firebase.google.com/docs/firestore
44
repository: https://github.com/firebase/flutterfire/tree/main/packages/_flutterfire_internals
55
version: 1.3.69
6+
resolution: workspace
67

78
environment:
8-
sdk: '>=3.2.0 <4.0.0'
9-
flutter: '>=3.3.0'
9+
sdk: '^3.6.0'
10+
flutter: '>=3.27.0'
1011

1112
dependencies:
1213
collection: ^1.0.0
@@ -20,4 +21,3 @@ dev_dependencies:
2021
flutter_test:
2122
sdk: flutter
2223
mockito: ^5.0.0
23-
test: any

packages/cloud_firestore/cloud_firestore/example/pubspec.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
name: cloud_firestore_example
22
description: Demonstrates how to use the firestore plugin.
3+
resolution: workspace
34

45
environment:
5-
sdk: '>=3.2.0 <4.0.0'
6+
sdk: '^3.6.0'
7+
flutter: '>=3.27.0'
68

79
dependencies:
810
cloud_firestore: ^6.3.0

packages/cloud_firestore/cloud_firestore/pipeline_example/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ class _PipelineExamplePageState extends State<PipelineExamplePage> {
543543
.limit(1)
544544
.addFields(
545545
// VectorValue
546-
Constant(VectorValue([1.0, 2.0, 3.0])).as('c_vector'),
546+
Constant(const VectorValue([1.0, 2.0, 3.0])).as('c_vector'),
547547

548548
Constant(null).as('c_null'),
549549
// String

packages/cloud_firestore/cloud_firestore/pipeline_example/pubspec.yaml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1717
# In Windows, build-name is used as the major, minor, and patch parts
1818
# of the product and file versions while build-number is used as the build suffix.
1919
version: 1.0.0+1
20+
resolution: workspace
2021

2122
environment:
2223
sdk: ^3.10.0-290.4.beta
@@ -39,22 +40,6 @@ dependencies:
3940
# Use with the CupertinoIcons class for iOS style icons.
4041
cupertino_icons: ^1.0.8
4142

42-
dependency_overrides:
43-
_flutterfire_internals:
44-
path: ../../../_flutterfire_internals
45-
cloud_firestore:
46-
path: ..
47-
cloud_firestore_platform_interface:
48-
path: ../../cloud_firestore_platform_interface
49-
cloud_firestore_web:
50-
path: ../../cloud_firestore_web
51-
firebase_core:
52-
path: ../../../firebase_core/firebase_core
53-
firebase_core_platform_interface:
54-
path: ../../../firebase_core/firebase_core_platform_interface
55-
firebase_core_web:
56-
path: ../../../firebase_core/firebase_core_web
57-
5843
dev_dependencies:
5944
flutter_test:
6045
sdk: flutter
@@ -66,7 +51,7 @@ dev_dependencies:
6651
# activated in the `analysis_options.yaml` file located at the root of your
6752
# package. See that file for information about deactivating specific lint
6853
# rules and activating additional ones.
69-
flutter_lints: ^6.0.0
54+
flutter_lints: ^4.0.0
7055

7156
# For information on the generic Dart part of this file, see the
7257
# following page: https://dart.dev/tools/pub/pubspec

packages/cloud_firestore/cloud_firestore/pubspec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ description:
55
homepage: https://firebase.google.com/docs/firestore
66
repository: https://github.com/firebase/flutterfire/tree/main/packages/cloud_firestore/cloud_firestore
77
version: 6.3.0
8+
resolution: workspace
89
topics:
910
- firebase
1011
- firestore
@@ -16,8 +17,8 @@ false_secrets:
1617
- dartpad/**
1718

1819
environment:
19-
sdk: '>=3.2.0 <4.0.0'
20-
flutter: '>=3.3.0'
20+
sdk: '^3.6.0'
21+
flutter: '>=3.27.0'
2122

2223
dependencies:
2324
cloud_firestore_platform_interface: ^7.2.0

packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
name: cloud_firestore_platform_interface
22
description: A common platform interface for the cloud_firestore plugin.
33
version: 7.2.0
4+
resolution: workspace
45
homepage: https://github.com/firebase/flutterfire/tree/main/packages/cloud_firestore/cloud_firestore_platform_interface
56
repository: https://github.com/firebase/flutterfire/tree/main/packages/cloud_firestore/cloud_firestore_platform_interface
67

78
environment:
8-
sdk: '>=3.2.0 <4.0.0'
9-
flutter: '>=3.3.0'
9+
sdk: '^3.6.0'
10+
flutter: '>=3.27.0'
1011

1112
dependencies:
1213
_flutterfire_internals: ^1.3.69
@@ -25,5 +26,3 @@ dev_dependencies:
2526
pigeon: 26.3.4
2627
watcher: ^1.1.0
2728

28-
dependency_overrides:
29-
watcher: ^1.1.0

packages/cloud_firestore/cloud_firestore_web/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ homepage: https://github.com/firebase/flutterfire/tree/main/packages/cloud_fires
44
repository: https://github.com/firebase/flutterfire/tree/main/packages/cloud_firestore/cloud_firestore_web
55

66
version: 5.3.0
7+
resolution: workspace
78

89
environment:
9-
sdk: '>=3.4.0 <4.0.0'
10+
sdk: '^3.6.0'
1011
flutter: '>=3.22.0'
1112

1213
dependencies:

packages/cloud_functions/cloud_functions/example/pubspec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: cloud_functions_example
22
description: Demonstrates how to use the cloud_functions plugin.
3+
resolution: workspace
34

45
environment:
5-
sdk: '>=3.2.0 <4.0.0'
6-
flutter: '>=3.3.0'
6+
sdk: '^3.6.0'
7+
flutter: '>=3.27.0'
78

89
dependencies:
910
cloud_functions: ^6.2.0

packages/cloud_functions/cloud_functions/pubspec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: cloud_functions
22
description: A Flutter plugin allowing you to use Firebase Cloud Functions.
33
version: 6.2.0
4+
resolution: workspace
45
homepage: https://firebase.google.com/docs/functions
56
repository: https://github.com/firebase/flutterfire/tree/main/packages/cloud_functions/cloud_functions
67
topics:
@@ -13,8 +14,8 @@ false_secrets:
1314
- example/**
1415

1516
environment:
16-
sdk: '>=3.2.0 <4.0.0'
17-
flutter: '>=3.3.0'
17+
sdk: '^3.6.0'
18+
flutter: '>=3.27.0'
1819

1920
dependencies:
2021
cloud_functions_platform_interface: ^5.8.12

0 commit comments

Comments
 (0)