Skip to content

Commit 896e6c2

Browse files
chore: Ensure all pubspec dependencies are sorted (serverpod#4203)
1 parent a9f4715 commit 896e6c2

File tree

96 files changed

+483
-501
lines changed

Some content is hidden

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

96 files changed

+483
-501
lines changed

examples/auth/auth_client/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ environment:
88
sdk: '^3.8.0'
99

1010
dependencies:
11-
serverpod_client: 3.0.0-rc.1
1211
serverpod_auth_idp_client: 3.0.0-rc.1
12+
serverpod_client: 3.0.0-rc.1
1313

1414
dependency_overrides:
1515
serverpod_auth_idp_client:

examples/auth/auth_flutter/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ environment:
2525
flutter: '^3.32.0'
2626

2727
dependencies:
28-
flutter:
29-
sdk: flutter
3028
auth_client:
3129
path: ../auth_client
3230
extended_image: ^10.0.1
31+
flutter:
32+
sdk: flutter
3333
serverpod_auth_idp_flutter: 3.0.0-rc.1
3434
serverpod_flutter: 3.0.0-rc.1
3535

examples/auth/auth_server/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ dependencies:
1515

1616
dev_dependencies:
1717
lints: '>=3.0.0 <7.0.0'
18-
test: ^1.25.5
1918
serverpod_test: 3.0.0-rc.1
19+
test: ^1.25.5
2020

2121
dependency_overrides:
2222
serverpod:

examples/auth_example/auth_example_client/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ environment:
88
sdk: '^3.8.0'
99

1010
dependencies:
11-
serverpod_client: 3.0.0-rc.1
1211
serverpod_auth_client: 3.0.0-rc.1
12+
serverpod_client: 3.0.0-rc.1
1313

1414
dependency_overrides:
15-
serverpod_client:
16-
path: ../../../packages/serverpod_client
1715
serverpod_auth_client:
1816
path: ../../../modules/serverpod_auth/serverpod_auth_client
17+
serverpod_client:
18+
path: ../../../packages/serverpod_client
1919
serverpod_serialization:
20-
path: ../../../packages/serverpod_serialization
20+
path: ../../../packages/serverpod_serialization

examples/auth_example/auth_example_flutter/pubspec.yaml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,41 +25,39 @@ environment:
2525
flutter: '^3.32.0'
2626

2727
dependencies:
28-
flutter:
29-
sdk: flutter
30-
serverpod_flutter: 3.0.0-rc.1
31-
serverpod_auth_email_flutter: 3.0.0-rc.1
32-
serverpod_auth_shared_flutter: 3.0.0-rc.1
33-
serverpod_auth_google_flutter: 3.0.0-rc.1
34-
serverpod_auth_apple_flutter: 3.0.0-rc.1
3528
auth_example_client:
3629
path: ../auth_example_client
37-
38-
3930
# The following adds the Cupertino Icons font to your application.
4031
# Use with the CupertinoIcons class for iOS style icons.
4132
cupertino_icons: ^1.0.5
33+
flutter:
34+
sdk: flutter
35+
serverpod_auth_apple_flutter: 3.0.0-rc.1
36+
serverpod_auth_email_flutter: 3.0.0-rc.1
37+
serverpod_auth_google_flutter: 3.0.0-rc.1
38+
serverpod_auth_shared_flutter: 3.0.0-rc.1
39+
serverpod_flutter: 3.0.0-rc.1
4240

4341
dev_dependencies:
4442
flutter_lints: '>=3.0.0 <7.0.0'
4543
flutter_test:
4644
sdk: flutter
4745

4846
dependency_overrides:
49-
serverpod_flutter:
50-
path: ../../../packages/serverpod_flutter
51-
serverpod_auth_email_flutter:
52-
path: ../../../modules/serverpod_auth/serverpod_auth_email_flutter
53-
serverpod_auth_shared_flutter:
54-
path: ../../../modules/serverpod_auth/serverpod_auth_shared_flutter
55-
serverpod_auth_google_flutter:
56-
path: ../../../modules/serverpod_auth/serverpod_auth_google_flutter
5747
serverpod_auth_apple_flutter:
5848
path: ../../../modules/serverpod_auth/serverpod_auth_apple_flutter
5949
serverpod_auth_client:
6050
path: ../../../modules/serverpod_auth/serverpod_auth_client
51+
serverpod_auth_email_flutter:
52+
path: ../../../modules/serverpod_auth/serverpod_auth_email_flutter
53+
serverpod_auth_google_flutter:
54+
path: ../../../modules/serverpod_auth/serverpod_auth_google_flutter
55+
serverpod_auth_shared_flutter:
56+
path: ../../../modules/serverpod_auth/serverpod_auth_shared_flutter
6157
serverpod_client:
6258
path: ../../../packages/serverpod_client
59+
serverpod_flutter:
60+
path: ../../../packages/serverpod_flutter
6361
serverpod_serialization:
6462
path: ../../../packages/serverpod_serialization
6563

examples/chat/chat_client/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ environment:
88
sdk: '^3.8.0'
99

1010
dependencies:
11-
serverpod_client: 3.0.0-rc.1
1211
serverpod_auth_client: 3.0.0-rc.1
1312
serverpod_chat_client: 3.0.0-rc.1
13+
serverpod_client: 3.0.0-rc.1
1414

1515
dependency_overrides:
16-
serverpod_client:
17-
path: ../../../packages/serverpod_client
1816
serverpod_auth_client:
1917
path: ../../../modules/serverpod_auth/serverpod_auth_client
2018
serverpod_chat_client:
2119
path: ../../../modules/serverpod_chat/serverpod_chat_client
20+
serverpod_client:
21+
path: ../../../packages/serverpod_client
2222
serverpod_serialization:
23-
path: ../../../packages/serverpod_serialization
23+
path: ../../../packages/serverpod_serialization

examples/chat/chat_flutter/pubspec.yaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ environment:
2525
flutter: '^3.32.0'
2626

2727
dependencies:
28+
chat_client:
29+
path: ../chat_client
30+
# The following adds the Cupertino Icons font to your application.
31+
# Use with the CupertinoIcons class for iOS style icons.
32+
cupertino_icons: ^1.0.5
2833
flutter:
2934
sdk: flutter
3035
made_with_serverpod: ^1.0.0
@@ -33,34 +38,27 @@ dependencies:
3338
serverpod_chat_flutter: 3.0.0-rc.1
3439
serverpod_client: 3.0.0-rc.1
3540
serverpod_flutter: 3.0.0-rc.1
36-
chat_client:
37-
path: ../chat_client
38-
39-
40-
# The following adds the Cupertino Icons font to your application.
41-
# Use with the CupertinoIcons class for iOS style icons.
42-
cupertino_icons: ^1.0.5
4341

4442
dev_dependencies:
4543
flutter_lints: '>=3.0.0 <7.0.0'
4644
flutter_test:
4745
sdk: flutter
4846

4947
dependency_overrides:
48+
serverpod_auth_client:
49+
path: ../../../modules/serverpod_auth/serverpod_auth_client
5050
serverpod_auth_email_flutter:
5151
path: ../../../modules/serverpod_auth/serverpod_auth_email_flutter
5252
serverpod_auth_shared_flutter:
5353
path: ../../../modules/serverpod_auth/serverpod_auth_shared_flutter
54+
serverpod_chat_client:
55+
path: ../../../modules/serverpod_chat/serverpod_chat_client
5456
serverpod_chat_flutter:
5557
path: ../../../modules/serverpod_chat/serverpod_chat_flutter
5658
serverpod_client:
5759
path: ../../../packages/serverpod_client
5860
serverpod_flutter:
5961
path: ../../../packages/serverpod_flutter
60-
serverpod_auth_client:
61-
path: ../../../modules/serverpod_auth/serverpod_auth_client
62-
serverpod_chat_client:
63-
path: ../../../modules/serverpod_chat/serverpod_chat_client
6462
serverpod_serialization:
6563
path: ../../../packages/serverpod_serialization
6664

integrations/serverpod_cloud_storage_gcp/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ environment:
1212
sdk: '^3.8.0'
1313

1414
dependencies:
15-
serverpod: 3.0.0-rc.1
1615
amazon_cognito_identity_dart_2: ^3.5.0
17-
http: '>=1.1.0 <2.0.0'
1816
built_collection: ^5.1.1
1917
built_value: ^8.4.4
18+
http: '>=1.1.0 <2.0.0'
2019
path: ^1.8.3
20+
serverpod: 3.0.0-rc.1
2121
xml2json: ^6.0.0
2222

2323
dev_dependencies:

integrations/serverpod_cloud_storage_s3/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ environment:
1212
sdk: '^3.8.0'
1313

1414
dependencies:
15-
serverpod: 3.0.0-rc.1
1615
amazon_cognito_identity_dart_2: ^3.5.0
17-
http: '>=1.1.0 <2.0.0'
1816
built_collection: ^5.1.1
1917
built_value: ^8.4.4
18+
http: '>=1.1.0 <2.0.0'
2019
path: ^1.8.3
20+
serverpod: 3.0.0-rc.1
2121
xml2json: ^6.0.0
2222

2323
dev_dependencies:

melos.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@ scripts:
3838
run: melos exec --no-flutter --category="noTemplates" -c 1 -- dart pub downgrade
3939
downgrade:
4040
run: melos downgrade_flutter && melos downgrade_dart
41+
sort_pubspec_dependencies:
42+
run: melos exec -- "cd \"\$SERVERPOD_HOME\" && dart run sort_pubspec_dependencies --pubspec-path=\"\$MELOS_PACKAGE_PATH/pubspec.yaml\""

0 commit comments

Comments
 (0)