Skip to content

Commit 1a8e219

Browse files
kevmookevmoo
authored
chore: require Dart 3.5, move to workspaces (#479)
Work-around for dart-lang/pub#4357
1 parent 128ccec commit 1a8e219

File tree

28 files changed

+94
-58
lines changed

28 files changed

+94
-58
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,23 @@ jobs:
3939
- name: mono_repo self validate
4040
run: dart pub global run mono_repo generate --validate
4141
job_002:
42-
name: "analyze_format; Dart 3.4.0; PKGS: dartfn, dartfn/templates/cloudevent, dartfn/templates/helloworld, dartfn/templates/json, examples/fullstack/backend, examples/fullstack/frontend-cli, examples/hello, examples/json, examples/protobuf_firestore, examples/raw_cloudevent, functions_framework, functions_framework_builder, google_cloud; `dart analyze`"
42+
name: "analyze_format; Dart 3.5.0; PKGS: dartfn, dartfn/templates/cloudevent, dartfn/templates/helloworld, dartfn/templates/json, examples/fullstack/backend, examples/fullstack/frontend-cli, examples/hello, examples/json, examples/protobuf_firestore, examples/raw_cloudevent, functions_framework, functions_framework_builder, google_cloud; `dart analyze`"
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Cache Pub hosted dependencies
4646
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
4747
with:
4848
path: "~/.pub-cache/hosted"
49-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-google_cloud;commands:analyze_1"
49+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-google_cloud;commands:analyze_1"
5050
restore-keys: |
51-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-google_cloud
52-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
51+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-google_cloud
52+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0
5353
os:ubuntu-latest;pub-cache-hosted
5454
os:ubuntu-latest
5555
- name: Setup Dart SDK
5656
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
5757
with:
58-
sdk: "3.4.0"
58+
sdk: "3.5.0"
5959
- id: checkout
6060
name: Checkout repository
6161
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332

‎.github/workflows/unit.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ permissions: read-all
1616

1717
jobs:
1818
job_001:
19-
name: "unit_test; linux; Dart 3.4.0; PKGS: dartfn, functions_framework_builder, google_cloud, integration_test; `dart test`"
19+
name: "unit_test; linux; Dart 3.5.0; PKGS: dartfn, functions_framework_builder, google_cloud, integration_test; `dart test`"
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Cache Pub hosted dependencies
2323
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
2424
with:
2525
path: "~/.pub-cache/hosted"
26-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0"
26+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0"
2727
restore-keys: |
28-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test
29-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
28+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test
29+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0
3030
os:ubuntu-latest;pub-cache-hosted
3131
os:ubuntu-latest
3232
- name: Setup Dart SDK
3333
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
3434
with:
35-
sdk: "3.4.0"
35+
sdk: "3.5.0"
3636
- id: checkout
3737
name: Checkout repository
3838
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -73,23 +73,23 @@ jobs:
7373
if: "always() && steps.integration_test_pub_upgrade.conclusion == 'success'"
7474
working-directory: integration_test
7575
job_002:
76-
name: "unit_test; linux; Dart 3.4.0; PKG: google_cloud; `./tool/docker_test_script.sh`"
76+
name: "unit_test; linux; Dart 3.5.0; PKG: google_cloud; `./tool/docker_test_script.sh`"
7777
runs-on: ubuntu-latest
7878
steps:
7979
- name: Cache Pub hosted dependencies
8080
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
8181
with:
8282
path: "~/.pub-cache/hosted"
83-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud;commands:command"
83+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud;commands:command"
8484
restore-keys: |
85-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud
86-
os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
85+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud
86+
os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0
8787
os:ubuntu-latest;pub-cache-hosted
8888
os:ubuntu-latest
8989
- name: Setup Dart SDK
9090
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
9191
with:
92-
sdk: "3.4.0"
92+
sdk: "3.5.0"
9393
- id: checkout
9494
name: Checkout repository
9595
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -280,23 +280,23 @@ jobs:
280280
if: "always() && steps.integration_test_pub_upgrade.conclusion == 'success'"
281281
working-directory: integration_test
282282
job_005:
283-
name: "unit_test; macos; Dart 3.4.0; PKG: google_cloud; `dart test`"
283+
name: "unit_test; macos; Dart 3.5.0; PKG: google_cloud; `dart test`"
284284
runs-on: macos-latest
285285
steps:
286286
- name: Cache Pub hosted dependencies
287287
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
288288
with:
289289
path: "~/.pub-cache/hosted"
290-
key: "os:macos-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud;commands:test_0"
290+
key: "os:macos-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud;commands:test_0"
291291
restore-keys: |
292-
os:macos-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud
293-
os:macos-latest;pub-cache-hosted;sdk:3.4.0
292+
os:macos-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud
293+
os:macos-latest;pub-cache-hosted;sdk:3.5.0
294294
os:macos-latest;pub-cache-hosted
295295
os:macos-latest
296296
- name: Setup Dart SDK
297297
uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
298298
with:
299-
sdk: "3.4.0"
299+
sdk: "3.5.0"
300300
- id: checkout
301301
name: Checkout repository
302302
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.dart_tool
2+
pubspec.lock

‎dartfn/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## 0.4.7-wip
22

33
- Use latest `dart_flutter_team_lints` version.
4-
- Require Dart 3.4
4+
- Require Dart 3.5
55

66
## 0.4.6
77

‎dartfn/lib/src/generators/cloudevent.g.dart‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dartfn/lib/src/generators/helloworld.g.dart‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dartfn/lib/src/generators/json.g.dart‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dartfn/pubspec.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ description: >
55
version: 0.4.7-wip
66
homepage: https://github.com/GoogleCloudPlatform/functions-framework-dart
77

8+
resolution: workspace
89
environment:
9-
sdk: ^3.4.0
10+
sdk: ^3.5.0
1011

1112
executables:
1213
dartfn:

‎dartfn/templates/cloudevent/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: A sample Functions Framework project for handling a cloudevent.
55
publish_to: none
66

77
environment:
8-
sdk: ^3.4.0
8+
sdk: ^3.5.0
99

1010
dependencies:
1111
functions_framework: ^0.4.0

‎dartfn/templates/helloworld/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: A sample "Hello, World!" Functions Framework project.
55
publish_to: none
66

77
environment:
8-
sdk: ^3.4.0
8+
sdk: ^3.5.0
99

1010
dependencies:
1111
functions_framework: ^0.4.0

0 commit comments

Comments
 (0)