From 8926a9ae48f76671c7e538f32ae69c01a80463b8 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Sat, 12 Aug 2023 17:20:35 -0700 Subject: [PATCH 01/43] release: move pkg:functions_framework to pkg:google_cloud (#429) Delete pkg:gcp source --- .github/workflows/lint.yml | 34 +-- Dockerfile | 2 +- docs/quickstarts/03-quickstart-cloudrun.md | 2 +- functions_framework/CHANGELOG.md | 4 + .../lib/functions_framework.dart | 2 +- functions_framework/lib/serve.dart | 6 +- .../lib/src/function_config.dart | 2 +- .../lib/src/json_request_utils.dart | 2 +- .../lib/src/request_context.dart | 2 +- .../lib/src/targets/cloud_event_targets.dart | 2 +- .../lib/src/targets/http_targets.dart | 2 +- functions_framework/lib/src/typedefs.dart | 2 +- functions_framework/pubspec.yaml | 4 +- gcp/.gitignore | 5 - gcp/CHANGELOG.md | 13 -- gcp/Dockerfile | 27 --- gcp/LICENSE | 202 ------------------ gcp/README.md | 4 - gcp/lib/gcp.dart | 18 -- gcp/mono_pkg.yaml | 9 - gcp/pubspec.yaml | 20 -- integration_test/pubspec.yaml | 2 - 22 files changed, 24 insertions(+), 342 deletions(-) delete mode 100644 gcp/.gitignore delete mode 100644 gcp/CHANGELOG.md delete mode 100644 gcp/Dockerfile delete mode 100644 gcp/LICENSE delete mode 100644 gcp/README.md delete mode 100644 gcp/lib/gcp.dart delete mode 100644 gcp/mono_pkg.yaml delete mode 100644 gcp/pubspec.yaml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f870a8aa..367341b1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -39,16 +39,16 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_format; Dart 3.0.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, gcp, google_cloud; `dart analyze`" + name: "analyze_format; Dart 3.0.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`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.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-gcp-google_cloud;commands:analyze_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.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" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.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-gcp-google_cloud + os:ubuntu-latest;pub-cache-hosted;sdk:3.0.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 os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -167,15 +167,6 @@ jobs: run: dart analyze if: "always() && steps.functions_framework_builder_pub_upgrade.conclusion == 'success'" working-directory: functions_framework_builder - - id: gcp_pub_upgrade - name: gcp; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: gcp - - name: gcp; dart analyze - run: dart analyze - if: "always() && steps.gcp_pub_upgrade.conclusion == 'success'" - working-directory: gcp - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -186,16 +177,16 @@ jobs: if: "always() && steps.google_cloud_pub_upgrade.conclusion == 'success'" working-directory: google_cloud job_003: - name: "analyze_format; Dart dev; 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, gcp, google_cloud, integration_test; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`" + name: "analyze_format; Dart dev; 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, integration_test; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-gcp-google_cloud-integration_test;commands:format-analyze_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-gcp-google_cloud-integration_test + os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test os:ubuntu-latest;pub-cache-hosted;sdk:dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -362,19 +353,6 @@ jobs: run: dart analyze --fatal-infos if: "always() && steps.functions_framework_builder_pub_upgrade.conclusion == 'success'" working-directory: functions_framework_builder - - id: gcp_pub_upgrade - name: gcp; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: gcp - - name: "gcp; dart format --output=none --set-exit-if-changed ." - run: "dart format --output=none --set-exit-if-changed ." - if: "always() && steps.gcp_pub_upgrade.conclusion == 'success'" - working-directory: gcp - - name: "gcp; dart analyze --fatal-infos" - run: dart analyze --fatal-infos - if: "always() && steps.gcp_pub_upgrade.conclusion == 'success'" - working-directory: gcp - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade diff --git a/Dockerfile b/Dockerfile index 7d0b6826..454afe66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM dart:stable AS build WORKDIR /app COPY ./functions_framework/pubspec.yaml /app/functions_framework/ COPY ./functions_framework_builder/pubspec.yaml /app/functions_framework_builder/ -COPY ./gcp/pubspec.yaml /app/gcp/ +COPY ./google_cloud/pubspec.yaml /app/google_cloud/ COPY ./integration_test/pubspec.yaml /app/integration_test/ WORKDIR /app/integration_test diff --git a/docs/quickstarts/03-quickstart-cloudrun.md b/docs/quickstarts/03-quickstart-cloudrun.md index cdf1e3ff..0e897e9d 100644 --- a/docs/quickstarts/03-quickstart-cloudrun.md +++ b/docs/quickstarts/03-quickstart-cloudrun.md @@ -125,7 +125,7 @@ the [Manage resources] page. [codelab]: https://codelabs.developers.google.com/codelabs/cloud-shell [delete the image]: https://cloud.google.com/container-registry/docs/managing#deleting_images [gcloud]: https://cloud.google.com/sdk/docs/install -[Google Cloud]: https://cloud.google.com/gcp +[Google Cloud]: https://cloud.google.com/ [incur charges]: https://cloud.google.com/container-registry/pricing [Installing and using dartfn]: 00-install-dartfn.md [Manage resources]: https://console.cloud.google.com/iam-admin/projects diff --git a/functions_framework/CHANGELOG.md b/functions_framework/CHANGELOG.md index 74ca070e..9c396484 100644 --- a/functions_framework/CHANGELOG.md +++ b/functions_framework/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.3+1 + +- Migrate from `package:gcp` to `package:google_cloud`. + ## 0.4.3 - Support `application/protobuf` event encoding. diff --git a/functions_framework/lib/functions_framework.dart b/functions_framework/lib/functions_framework.dart index a204f99a..9124c74a 100644 --- a/functions_framework/lib/functions_framework.dart +++ b/functions_framework/lib/functions_framework.dart @@ -24,7 +24,7 @@ /// ``` library functions_framework; -export 'package:gcp/gcp.dart' +export 'package:google_cloud/google_cloud.dart' show BadRequestException, LogSeverity, RequestLogger; export 'src/cloud_event.dart' show CloudEvent; diff --git a/functions_framework/lib/serve.dart b/functions_framework/lib/serve.dart index 0c54b153..a35308a1 100644 --- a/functions_framework/lib/serve.dart +++ b/functions_framework/lib/serve.dart @@ -25,7 +25,7 @@ library serve; import 'dart:async'; import 'dart:io'; -import 'package:gcp/gcp.dart'; +import 'package:google_cloud/google_cloud.dart'; import 'package:io/ansi.dart'; import 'package:io/io.dart'; @@ -33,7 +33,7 @@ import 'src/function_config.dart'; import 'src/function_target.dart'; import 'src/run.dart'; -export 'package:gcp/gcp.dart' show BadRequestException; +export 'package:google_cloud/google_cloud.dart' show BadRequestException; export 'src/function_target.dart' show FunctionTarget, JsonFunctionTarget, JsonWithContextFunctionTarget; @@ -92,7 +92,7 @@ Future _serve( try { projectId = await projectIdFromMetadataServer(); } on BadConfigurationException { - // NOOP! - we aren't on GCP, so use normal logging + // NOOP! - we aren't on Google Cloud, so use normal logging } final loggingMiddleware = createLoggingMiddleware(projectId: projectId); diff --git a/functions_framework/lib/src/function_config.dart b/functions_framework/lib/src/function_config.dart index 50e2e4b0..2d00e336 100644 --- a/functions_framework/lib/src/function_config.dart +++ b/functions_framework/lib/src/function_config.dart @@ -15,7 +15,7 @@ import 'dart:io'; import 'package:args/args.dart'; -import 'package:gcp/gcp.dart'; +import 'package:google_cloud/google_cloud.dart'; const defaultFunctionType = FunctionType.http; const defaultFunctionTarget = 'function'; diff --git a/functions_framework/lib/src/json_request_utils.dart b/functions_framework/lib/src/json_request_utils.dart index 735c512c..178a5fc8 100644 --- a/functions_framework/lib/src/json_request_utils.dart +++ b/functions_framework/lib/src/json_request_utils.dart @@ -15,7 +15,7 @@ import 'dart:convert'; import 'dart:typed_data'; -import 'package:gcp/gcp.dart'; +import 'package:google_cloud/google_cloud.dart'; import 'package:http_parser/http_parser.dart'; import 'package:shelf/shelf.dart'; diff --git a/functions_framework/lib/src/request_context.dart b/functions_framework/lib/src/request_context.dart index f6daf33b..62005025 100644 --- a/functions_framework/lib/src/request_context.dart +++ b/functions_framework/lib/src/request_context.dart @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import 'package:gcp/gcp.dart'; +import 'package:google_cloud/google_cloud.dart'; import 'package:meta/meta.dart'; import 'package:shelf/shelf.dart'; diff --git a/functions_framework/lib/src/targets/cloud_event_targets.dart b/functions_framework/lib/src/targets/cloud_event_targets.dart index f30c83ad..7ed44911 100644 --- a/functions_framework/lib/src/targets/cloud_event_targets.dart +++ b/functions_framework/lib/src/targets/cloud_event_targets.dart @@ -14,7 +14,7 @@ import 'dart:async'; -import 'package:gcp/gcp.dart'; +import 'package:google_cloud/google_cloud.dart'; import 'package:shelf/shelf.dart'; import '../cloud_event.dart'; diff --git a/functions_framework/lib/src/targets/http_targets.dart b/functions_framework/lib/src/targets/http_targets.dart index af35d3f2..f6daddb7 100644 --- a/functions_framework/lib/src/targets/http_targets.dart +++ b/functions_framework/lib/src/targets/http_targets.dart @@ -14,7 +14,7 @@ import 'dart:async'; -import 'package:gcp/gcp.dart'; +import 'package:google_cloud/google_cloud.dart'; import 'package:shelf/shelf.dart'; import '../function_target.dart'; diff --git a/functions_framework/lib/src/typedefs.dart b/functions_framework/lib/src/typedefs.dart index 76f7dec1..9dc7ea0c 100644 --- a/functions_framework/lib/src/typedefs.dart +++ b/functions_framework/lib/src/typedefs.dart @@ -14,7 +14,7 @@ import 'dart:async'; -import 'package:gcp/gcp.dart'; +import 'package:google_cloud/google_cloud.dart'; import 'package:shelf/shelf.dart'; import 'cloud_event.dart'; diff --git a/functions_framework/pubspec.yaml b/functions_framework/pubspec.yaml index 1b137b3d..5013b945 100644 --- a/functions_framework/pubspec.yaml +++ b/functions_framework/pubspec.yaml @@ -1,5 +1,5 @@ name: functions_framework -version: 0.4.3 +version: 0.4.3+1 description: >- FaaS (Function as a service) framework for writing portable Dart functions repository: https://github.com/GoogleCloudPlatform/functions-framework-dart @@ -10,7 +10,7 @@ environment: dependencies: args: ^2.0.0 collection: ^1.15.0 - gcp: ^0.1.0 + google_cloud: ^0.2.0 http: '>=0.13.0 <2.0.0' http_parser: ^4.0.0 io: ^1.0.0 diff --git a/gcp/.gitignore b/gcp/.gitignore deleted file mode 100644 index ffdd9081..00000000 --- a/gcp/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# See https://dart.dev/guides/libraries/private-files - -# Files and directories created by pub -.dart_tool/ -pubspec.lock diff --git a/gcp/CHANGELOG.md b/gcp/CHANGELOG.md deleted file mode 100644 index 34aaca0c..00000000 --- a/gcp/CHANGELOG.md +++ /dev/null @@ -1,13 +0,0 @@ -## 0.2.0 - -- Last release. Replaced by `package:google_cloud`. -- `cloudLoggingMiddleware` uses structured logs (`jsonPayload`) when message is of type `Map`. All other messages are logged as text (`textPayload`). - -## 0.1.1 - -- Require Dart 3.0 -- Support `package:http` v1 - -## 0.1.0 - -- First release. diff --git a/gcp/Dockerfile b/gcp/Dockerfile deleted file mode 100644 index 2ded538e..00000000 --- a/gcp/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# Corresponds to the sample app in example/ -# Can be deployed directly to Cloud Run via `gcloud run deploy` - -# Official Dart image: https://hub.docker.com/_/dart -# Specify the Dart SDK base image version using dart: (ex: dart:2.12) -FROM dart:stable AS build - -# Resolve app dependencies. -WORKDIR /app -COPY pubspec.* ./ -RUN dart pub get - -# Copy app source code and AOT compile it. -COPY . . -# Ensure packages are still up-to-date if anything has changed -RUN dart pub get --offline -RUN dart compile exe example/example.dart -o example/server - -# Build minimal serving image from AOT-compiled `/server` and required system -# libraries and configuration files stored in `/runtime/` from the build stage. -FROM scratch -COPY --from=build /runtime/ / -COPY --from=build /app/example/server /app/example/ - -# Start server. -EXPOSE 8080 -CMD ["/app/example/server"] diff --git a/gcp/LICENSE b/gcp/LICENSE deleted file mode 100644 index d6456956..00000000 --- a/gcp/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/gcp/README.md b/gcp/README.md deleted file mode 100644 index 79b0c548..00000000 --- a/gcp/README.md +++ /dev/null @@ -1,4 +0,0 @@ -[![pub package](https://img.shields.io/pub/v/gcp.svg)](https://pub.dev/packages/gcp) -[![package publisher](https://img.shields.io/pub/publisher/gcp.svg)](https://pub.dev/packages/gcp/publisher) - -> NOTE: Deprecated. Replaced by `package:google_cloud`. diff --git a/gcp/lib/gcp.dart b/gcp/lib/gcp.dart deleted file mode 100644 index aaff9e63..00000000 --- a/gcp/lib/gcp.dart +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -@Deprecated('Use package:google_cloud instead.') -library; - -export 'package:google_cloud/google_cloud.dart'; diff --git a/gcp/mono_pkg.yaml b/gcp/mono_pkg.yaml deleted file mode 100644 index e2d4613c..00000000 --- a/gcp/mono_pkg.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# https://github.com/google/mono_repo.dart -stages: -- analyze_format: - - group: - - format - - analyze: --fatal-infos - sdk: dev - - analyze: - sdk: pubspec diff --git a/gcp/pubspec.yaml b/gcp/pubspec.yaml deleted file mode 100644 index 679b34d3..00000000 --- a/gcp/pubspec.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: gcp -description: >- - Deprecated. Use pkg:google_cloud instead -version: 0.2.0 -repository: https://github.com/GoogleCloudPlatform/functions-framework-dart/tree/main/gcp - -environment: - sdk: ^3.0.0 - -dependencies: - # Maintain a narrow constraint since APIs from this package are exported. - google_cloud: '>=0.2.0 <0.2.1' - -dev_dependencies: - dart_flutter_team_lints: ^1.0.0 - googleapis: ^11.0.0 - googleapis_auth: ^1.3.1 - shelf: ^1.4.1 - test: ^1.22.0 - test_process: ^2.0.3 diff --git a/integration_test/pubspec.yaml b/integration_test/pubspec.yaml index 0df9d2f1..5fdb5e60 100644 --- a/integration_test/pubspec.yaml +++ b/integration_test/pubspec.yaml @@ -27,7 +27,5 @@ dependency_overrides: path: ../functions_framework functions_framework_builder: path: ../functions_framework_builder - gcp: - path: ../gcp google_cloud: path: ../google_cloud From 9a784305ddf4fdd2fe318439e674d70a58866997 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Sat, 12 Aug 2023 18:06:58 -0700 Subject: [PATCH 02/43] release: dartfv v0.4.6 (#430) --- dartfn/CHANGELOG.md | 2 +- dartfn/lib/src/version.dart | 2 +- dartfn/pubspec.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dartfn/CHANGELOG.md b/dartfn/CHANGELOG.md index c37f0df2..d517a110 100644 --- a/dartfn/CHANGELOG.md +++ b/dartfn/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.4.6-dev +## 0.4.6 - Ignore file cleanup. - Require Dart 3.0 diff --git a/dartfn/lib/src/version.dart b/dartfn/lib/src/version.dart index 7c4ede4f..43354d98 100644 --- a/dartfn/lib/src/version.dart +++ b/dartfn/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '0.4.6-dev'; +const packageVersion = '0.4.6'; diff --git a/dartfn/pubspec.yaml b/dartfn/pubspec.yaml index 4bb2581c..51fde546 100644 --- a/dartfn/pubspec.yaml +++ b/dartfn/pubspec.yaml @@ -2,7 +2,7 @@ name: dartfn description: > A tools package for managing FaaS (Function as a service) portable Dart functions projects # After changing the version, run `pub run build_runner build`. -version: 0.4.6-dev +version: 0.4.6 homepage: https://github.com/GoogleCloudPlatform/functions-framework-dart environment: From 518f8cabf23d82730ab50cc90dcadd379ae2fbdb Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Sat, 26 Aug 2023 06:52:20 -0700 Subject: [PATCH 03/43] chore: update example/protobuf_firestore generated code (#431) --- .../events/cloud/firestore/v1/data.pb.dart | 205 +++++++++++++++++- .../cloud/firestore/v1/data.pbenum.dart | 2 +- .../cloud/firestore/v1/data.pbjson.dart | 2 +- .../cloud/firestore/v1/data.pbserver.dart | 2 +- .../events/cloud/firestore/v1/events.pb.dart | 51 ++++- .../cloud/firestore/v1/events.pbenum.dart | 2 +- .../cloud/firestore/v1/events.pbjson.dart | 2 +- .../cloud/firestore/v1/events.pbserver.dart | 2 +- .../lib/src/google/protobuf/struct.pb.dart | 77 ++++++- .../src/google/protobuf/struct.pbenum.dart | 6 +- .../src/google/protobuf/struct.pbjson.dart | 2 +- .../src/google/protobuf/struct.pbserver.dart | 2 +- .../lib/src/google/protobuf/timestamp.pb.dart | 112 +++++++++- .../src/google/protobuf/timestamp.pbenum.dart | 2 +- .../src/google/protobuf/timestamp.pbjson.dart | 2 +- .../google/protobuf/timestamp.pbserver.dart | 2 +- .../lib/src/google/type/latlng.pb.dart | 23 +- .../lib/src/google/type/latlng.pbenum.dart | 2 +- .../lib/src/google/type/latlng.pbjson.dart | 2 +- .../lib/src/google/type/latlng.pbserver.dart | 2 +- 20 files changed, 467 insertions(+), 35 deletions(-) diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart index c3324d19..7103ed79 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import @@ -18,8 +18,25 @@ import '../../../../protobuf/struct.pbenum.dart' as $2; import '../../../../protobuf/timestamp.pb.dart' as $0; import '../../../../type/latlng.pb.dart' as $1; +/// The data within all Firestore document events. class DocumentEventData extends $pb.GeneratedMessage { - factory DocumentEventData() => create(); + factory DocumentEventData({ + Document? value, + Document? oldValue, + DocumentMask? updateMask, + }) { + final result = create(); + if (value != null) { + result.value = value; + } + if (oldValue != null) { + result.oldValue = oldValue; + } + if (updateMask != null) { + result.updateMask = updateMask; + } + return result; + } DocumentEventData._() : super(); factory DocumentEventData.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -64,6 +81,8 @@ class DocumentEventData extends $pb.GeneratedMessage { $pb.GeneratedMessage.$_defaultFor(create); static DocumentEventData? _defaultInstance; + /// A Document object containing a post-operation document snapshot. + /// This is not populated for delete events. @$pb.TagNumber(1) Document get value => $_getN(0); @$pb.TagNumber(1) @@ -78,6 +97,8 @@ class DocumentEventData extends $pb.GeneratedMessage { @$pb.TagNumber(1) Document ensureValue() => $_ensure(0); + /// A Document object containing a pre-operation document snapshot. + /// This is only populated for update and delete events. @$pb.TagNumber(2) Document get oldValue => $_getN(1); @$pb.TagNumber(2) @@ -92,6 +113,8 @@ class DocumentEventData extends $pb.GeneratedMessage { @$pb.TagNumber(2) Document ensureOldValue() => $_ensure(1); + /// A DocumentMask object that lists changed fields. + /// This is only populated for update events. @$pb.TagNumber(3) DocumentMask get updateMask => $_getN(2); @$pb.TagNumber(3) @@ -107,8 +130,17 @@ class DocumentEventData extends $pb.GeneratedMessage { DocumentMask ensureUpdateMask() => $_ensure(2); } +/// A set of field paths on a document. class DocumentMask extends $pb.GeneratedMessage { - factory DocumentMask() => create(); + factory DocumentMask({ + $core.Iterable<$core.String>? fieldPaths, + }) { + final result = create(); + if (fieldPaths != null) { + result.fieldPaths.addAll(fieldPaths); + } + return result; + } DocumentMask._() : super(); factory DocumentMask.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -148,12 +180,36 @@ class DocumentMask extends $pb.GeneratedMessage { $pb.GeneratedMessage.$_defaultFor(create); static DocumentMask? _defaultInstance; + /// The list of field paths in the mask. + /// See [Document.fields][google.cloud.firestore.v1.events.Document.fields] + /// for a field path syntax reference. @$pb.TagNumber(1) $core.List<$core.String> get fieldPaths => $_getList(0); } +/// A Firestore document. class Document extends $pb.GeneratedMessage { - factory Document() => create(); + factory Document({ + $core.String? name, + $core.Map<$core.String, Value>? fields, + $0.Timestamp? createTime, + $0.Timestamp? updateTime, + }) { + final result = create(); + if (name != null) { + result.name = name; + } + if (fields != null) { + result.fields.addAll(fields); + } + if (createTime != null) { + result.createTime = createTime; + } + if (updateTime != null) { + result.updateTime = updateTime; + } + return result; + } Document._() : super(); factory Document.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -202,6 +258,8 @@ class Document extends $pb.GeneratedMessage { _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Document? _defaultInstance; + /// The resource name of the document. For example: + /// `projects/{project_id}/databases/{database_id}/documents/{document_path}` @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) @@ -214,9 +272,38 @@ class Document extends $pb.GeneratedMessage { @$pb.TagNumber(1) void clearName() => clearField(1); + /// The document's fields. + /// + /// The map keys represent field names. + /// + /// A simple field name contains only characters `a` to `z`, `A` to `Z`, + /// `0` to `9`, or `_`, and must not start with `0` to `9`. For example, + /// `foo_bar_17`. + /// + /// Field names matching the regular expression `__.*__` are reserved. Reserved + /// field names are forbidden except in certain documented contexts. The map + /// keys, represented as UTF-8, must not exceed 1,500 bytes and cannot be + /// empty. + /// + /// Field paths may be used in other contexts to refer to structured fields + /// defined here. For `map_value`, the field path is represented by the simple + /// or quoted field names of the containing fields, delimited by `.`. For + /// example, the structured field + /// `"foo" : { map_value: { "x&y" : { string_value: "hello" }}}` would be + /// represented by the field path `foo.x&y`. + /// + /// Within a field path, a quoted field name starts and ends with `` ` `` and + /// may contain any character. Some characters, including `` ` ``, must be + /// escaped using a `\`. For example, `` `x&y` `` represents `x&y` and + /// `` `bak\`tik` `` represents `` bak`tik ``. @$pb.TagNumber(2) $core.Map<$core.String, Value> get fields => $_getMap(1); + /// The time at which the document was created. + /// + /// This value increases monotonically when a document is deleted then + /// recreated. It can also be compared to values from other documents and + /// the `read_time` of a query. @$pb.TagNumber(3) $0.Timestamp get createTime => $_getN(2); @$pb.TagNumber(3) @@ -231,6 +318,11 @@ class Document extends $pb.GeneratedMessage { @$pb.TagNumber(3) $0.Timestamp ensureCreateTime() => $_ensure(2); + /// The time at which the document was last changed. + /// + /// This value is initially set to the `create_time` then increases + /// monotonically with each change to the document. It can also be + /// compared to values from other documents and the `read_time` of a query. @$pb.TagNumber(4) $0.Timestamp get updateTime => $_getN(3); @$pb.TagNumber(4) @@ -261,8 +353,57 @@ enum Value_ValueType { notSet } +/// A message that can hold any of the supported value types. class Value extends $pb.GeneratedMessage { - factory Value() => create(); + factory Value({ + $core.bool? booleanValue, + $fixnum.Int64? integerValue, + $core.double? doubleValue, + $core.String? referenceValue, + MapValue? mapValue, + $1.LatLng? geoPointValue, + ArrayValue? arrayValue, + $0.Timestamp? timestampValue, + $2.NullValue? nullValue, + $core.String? stringValue, + $core.List<$core.int>? bytesValue, + }) { + final result = create(); + if (booleanValue != null) { + result.booleanValue = booleanValue; + } + if (integerValue != null) { + result.integerValue = integerValue; + } + if (doubleValue != null) { + result.doubleValue = doubleValue; + } + if (referenceValue != null) { + result.referenceValue = referenceValue; + } + if (mapValue != null) { + result.mapValue = mapValue; + } + if (geoPointValue != null) { + result.geoPointValue = geoPointValue; + } + if (arrayValue != null) { + result.arrayValue = arrayValue; + } + if (timestampValue != null) { + result.timestampValue = timestampValue; + } + if (nullValue != null) { + result.nullValue = nullValue; + } + if (stringValue != null) { + result.stringValue = stringValue; + } + if (bytesValue != null) { + result.bytesValue = bytesValue; + } + return result; + } Value._() : super(); factory Value.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -338,6 +479,7 @@ class Value extends $pb.GeneratedMessage { Value_ValueType whichValueType() => _Value_ValueTypeByTag[$_whichOneof(0)]!; void clearValueType() => clearField($_whichOneof(0)); + /// A boolean value. @$pb.TagNumber(1) $core.bool get booleanValue => $_getBF(0); @$pb.TagNumber(1) @@ -350,6 +492,7 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(1) void clearBooleanValue() => clearField(1); + /// An integer value. @$pb.TagNumber(2) $fixnum.Int64 get integerValue => $_getI64(1); @$pb.TagNumber(2) @@ -362,6 +505,7 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(2) void clearIntegerValue() => clearField(2); + /// A double value. @$pb.TagNumber(3) $core.double get doubleValue => $_getN(2); @$pb.TagNumber(3) @@ -374,6 +518,8 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(3) void clearDoubleValue() => clearField(3); + /// A reference to a document. For example: + /// `projects/{project_id}/databases/{database_id}/documents/{document_path}`. @$pb.TagNumber(5) $core.String get referenceValue => $_getSZ(3); @$pb.TagNumber(5) @@ -386,6 +532,7 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(5) void clearReferenceValue() => clearField(5); + /// A map value. @$pb.TagNumber(6) MapValue get mapValue => $_getN(4); @$pb.TagNumber(6) @@ -400,6 +547,7 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(6) MapValue ensureMapValue() => $_ensure(4); + /// A geo point value representing a point on the surface of Earth. @$pb.TagNumber(8) $1.LatLng get geoPointValue => $_getN(5); @$pb.TagNumber(8) @@ -414,6 +562,10 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(8) $1.LatLng ensureGeoPointValue() => $_ensure(5); + /// An array value. + /// + /// Cannot directly contain another array value, though can contain an + /// map which contains another array. @$pb.TagNumber(9) ArrayValue get arrayValue => $_getN(6); @$pb.TagNumber(9) @@ -428,6 +580,10 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(9) ArrayValue ensureArrayValue() => $_ensure(6); + /// A timestamp value. + /// + /// Precise only to microseconds. When stored, any additional precision is + /// rounded down. @$pb.TagNumber(10) $0.Timestamp get timestampValue => $_getN(7); @$pb.TagNumber(10) @@ -442,6 +598,7 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(10) $0.Timestamp ensureTimestampValue() => $_ensure(7); + /// A null value. @$pb.TagNumber(11) $2.NullValue get nullValue => $_getN(8); @$pb.TagNumber(11) @@ -454,6 +611,11 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(11) void clearNullValue() => clearField(11); + /// A string value. + /// + /// The string, represented as UTF-8, must not exceed 1 MiB - 89 bytes. + /// Only the first 1,500 bytes of the UTF-8 representation are considered by + /// queries. @$pb.TagNumber(17) $core.String get stringValue => $_getSZ(9); @$pb.TagNumber(17) @@ -466,6 +628,10 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(17) void clearStringValue() => clearField(17); + /// A bytes value. + /// + /// Must not exceed 1 MiB - 89 bytes. + /// Only the first 1,500 bytes are considered by queries. @$pb.TagNumber(18) $core.List<$core.int> get bytesValue => $_getN(10); @$pb.TagNumber(18) @@ -479,8 +645,17 @@ class Value extends $pb.GeneratedMessage { void clearBytesValue() => clearField(18); } +/// An array value. class ArrayValue extends $pb.GeneratedMessage { - factory ArrayValue() => create(); + factory ArrayValue({ + $core.Iterable? values, + }) { + final result = create(); + if (values != null) { + result.values.addAll(values); + } + return result; + } ArrayValue._() : super(); factory ArrayValue.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -519,12 +694,22 @@ class ArrayValue extends $pb.GeneratedMessage { $pb.GeneratedMessage.$_defaultFor(create); static ArrayValue? _defaultInstance; + /// Values in the array. @$pb.TagNumber(1) $core.List get values => $_getList(0); } +/// A map value. class MapValue extends $pb.GeneratedMessage { - factory MapValue() => create(); + factory MapValue({ + $core.Map<$core.String, Value>? fields, + }) { + final result = create(); + if (fields != null) { + result.fields.addAll(fields); + } + return result; + } MapValue._() : super(); factory MapValue.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -568,6 +753,12 @@ class MapValue extends $pb.GeneratedMessage { _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static MapValue? _defaultInstance; + /// The map's fields. + /// + /// The map keys represent field names. Field names matching the regular + /// expression `__.*__` are reserved. Reserved field names are forbidden except + /// in certain documented contexts. The map keys, represented as UTF-8, must + /// not exceed 1,500 bytes and cannot be empty. @$pb.TagNumber(1) $core.Map<$core.String, Value> get fields => $_getMap(0); } diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart index 65e98756..9a3f9f14 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart index e095a3ec..6c6b7a9f 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart index 686c3a94..632e8dd3 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart index c4095974..45495112 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import @@ -15,8 +15,17 @@ import 'package:protobuf/protobuf.dart' as $pb; import 'data.pb.dart' as $3; +/// The CloudEvent raised when a Firestore document is created. class DocumentCreatedEvent extends $pb.GeneratedMessage { - factory DocumentCreatedEvent() => create(); + factory DocumentCreatedEvent({ + $3.DocumentEventData? data, + }) { + final result = create(); + if (data != null) { + result.data = data; + } + return result; + } DocumentCreatedEvent._() : super(); factory DocumentCreatedEvent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -58,6 +67,7 @@ class DocumentCreatedEvent extends $pb.GeneratedMessage { $pb.GeneratedMessage.$_defaultFor(create); static DocumentCreatedEvent? _defaultInstance; + /// The data associated with the event. @$pb.TagNumber(1) $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) @@ -73,8 +83,17 @@ class DocumentCreatedEvent extends $pb.GeneratedMessage { $3.DocumentEventData ensureData() => $_ensure(0); } +/// The CloudEvent raised when a Firestore document is updated. class DocumentUpdatedEvent extends $pb.GeneratedMessage { - factory DocumentUpdatedEvent() => create(); + factory DocumentUpdatedEvent({ + $3.DocumentEventData? data, + }) { + final result = create(); + if (data != null) { + result.data = data; + } + return result; + } DocumentUpdatedEvent._() : super(); factory DocumentUpdatedEvent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -116,6 +135,7 @@ class DocumentUpdatedEvent extends $pb.GeneratedMessage { $pb.GeneratedMessage.$_defaultFor(create); static DocumentUpdatedEvent? _defaultInstance; + /// The data associated with the event. @$pb.TagNumber(1) $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) @@ -131,8 +151,17 @@ class DocumentUpdatedEvent extends $pb.GeneratedMessage { $3.DocumentEventData ensureData() => $_ensure(0); } +/// The CloudEvent raised when a Firestore document is deleted. class DocumentDeletedEvent extends $pb.GeneratedMessage { - factory DocumentDeletedEvent() => create(); + factory DocumentDeletedEvent({ + $3.DocumentEventData? data, + }) { + final result = create(); + if (data != null) { + result.data = data; + } + return result; + } DocumentDeletedEvent._() : super(); factory DocumentDeletedEvent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -174,6 +203,7 @@ class DocumentDeletedEvent extends $pb.GeneratedMessage { $pb.GeneratedMessage.$_defaultFor(create); static DocumentDeletedEvent? _defaultInstance; + /// The data associated with the event. @$pb.TagNumber(1) $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) @@ -189,8 +219,18 @@ class DocumentDeletedEvent extends $pb.GeneratedMessage { $3.DocumentEventData ensureData() => $_ensure(0); } +/// The CloudEvent raised when a Firestore document is created, updated or +/// deleted. class DocumentWrittenEvent extends $pb.GeneratedMessage { - factory DocumentWrittenEvent() => create(); + factory DocumentWrittenEvent({ + $3.DocumentEventData? data, + }) { + final result = create(); + if (data != null) { + result.data = data; + } + return result; + } DocumentWrittenEvent._() : super(); factory DocumentWrittenEvent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -232,6 +272,7 @@ class DocumentWrittenEvent extends $pb.GeneratedMessage { $pb.GeneratedMessage.$_defaultFor(create); static DocumentWrittenEvent? _defaultInstance; + /// The data associated with the event. @$pb.TagNumber(1) $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart index edcaedee..3d31dddb 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart index c2f15ffe..745023db 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart index 9b15856c..cc2e10bd 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart index 6a227c35..fa1e3e72 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import @@ -18,8 +18,24 @@ import 'struct.pbenum.dart'; export 'struct.pbenum.dart'; +/// `Struct` represents a structured data value, consisting of fields +/// which map to dynamically typed values. In some languages, `Struct` +/// might be supported by a native representation. For example, in +/// scripting languages like JS a struct is represented as an +/// object. The details of that representation are described together +/// with the proto support for the language. +/// +/// The JSON representation for `Struct` is JSON object. class Struct extends $pb.GeneratedMessage with $mixin.StructMixin { - factory Struct() => create(); + factory Struct({ + $core.Map<$core.String, Value>? fields, + }) { + final result = create(); + if (fields != null) { + result.fields.addAll(fields); + } + return result; + } Struct._() : super(); factory Struct.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -65,6 +81,7 @@ class Struct extends $pb.GeneratedMessage with $mixin.StructMixin { _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Struct? _defaultInstance; + /// Unordered map of dynamically typed values. @$pb.TagNumber(1) $core.Map<$core.String, Value> get fields => $_getMap(0); } @@ -79,8 +96,42 @@ enum Value_Kind { notSet } +/// `Value` represents a dynamically typed value which can be either +/// null, a number, a string, a boolean, a recursive struct value, or a +/// list of values. A producer of value is expected to set one of these +/// variants. Absence of any variant indicates an error. +/// +/// The JSON representation for `Value` is JSON value. class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { - factory Value() => create(); + factory Value({ + NullValue? nullValue, + $core.double? numberValue, + $core.String? stringValue, + $core.bool? boolValue, + Struct? structValue, + ListValue? listValue, + }) { + final result = create(); + if (nullValue != null) { + result.nullValue = nullValue; + } + if (numberValue != null) { + result.numberValue = numberValue; + } + if (stringValue != null) { + result.stringValue = stringValue; + } + if (boolValue != null) { + result.boolValue = boolValue; + } + if (structValue != null) { + result.structValue = structValue; + } + if (listValue != null) { + result.listValue = listValue; + } + return result; + } Value._() : super(); factory Value.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -144,6 +195,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { Value_Kind whichKind() => _Value_KindByTag[$_whichOneof(0)]!; void clearKind() => clearField($_whichOneof(0)); + /// Represents a null value. @$pb.TagNumber(1) NullValue get nullValue => $_getN(0); @$pb.TagNumber(1) @@ -156,6 +208,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { @$pb.TagNumber(1) void clearNullValue() => clearField(1); + /// Represents a double value. @$pb.TagNumber(2) $core.double get numberValue => $_getN(1); @$pb.TagNumber(2) @@ -168,6 +221,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { @$pb.TagNumber(2) void clearNumberValue() => clearField(2); + /// Represents a string value. @$pb.TagNumber(3) $core.String get stringValue => $_getSZ(2); @$pb.TagNumber(3) @@ -180,6 +234,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { @$pb.TagNumber(3) void clearStringValue() => clearField(3); + /// Represents a boolean value. @$pb.TagNumber(4) $core.bool get boolValue => $_getBF(3); @$pb.TagNumber(4) @@ -192,6 +247,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { @$pb.TagNumber(4) void clearBoolValue() => clearField(4); + /// Represents a structured value. @$pb.TagNumber(5) Struct get structValue => $_getN(4); @$pb.TagNumber(5) @@ -206,6 +262,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { @$pb.TagNumber(5) Struct ensureStructValue() => $_ensure(4); + /// Represents a repeated `Value`. @$pb.TagNumber(6) ListValue get listValue => $_getN(5); @$pb.TagNumber(6) @@ -221,8 +278,19 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { ListValue ensureListValue() => $_ensure(5); } +/// `ListValue` is a wrapper around a repeated field of values. +/// +/// The JSON representation for `ListValue` is JSON array. class ListValue extends $pb.GeneratedMessage with $mixin.ListValueMixin { - factory ListValue() => create(); + factory ListValue({ + $core.Iterable? values, + }) { + final result = create(); + if (values != null) { + result.values.addAll(values); + } + return result; + } ListValue._() : super(); factory ListValue.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -263,6 +331,7 @@ class ListValue extends $pb.GeneratedMessage with $mixin.ListValueMixin { _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static ListValue? _defaultInstance; + /// Repeated field of dynamically typed values. @$pb.TagNumber(1) $core.List get values => $_getList(0); } diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart index 931f9e1f..7f9bf0cb 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import @@ -13,6 +13,10 @@ import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; +/// `NullValue` is a singleton enumeration to represent the null value for the +/// `Value` type union. +/// +/// The JSON representation for `NullValue` is JSON `null`. class NullValue extends $pb.ProtobufEnum { static const NullValue NULL_VALUE = NullValue._(0, _omitEnumNames ? '' : 'NULL_VALUE'); diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart index f2a645ca..c0693f57 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart index 6a4f9e88..3044bbcd 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart index a4244b26..3282fc27 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import @@ -15,8 +15,109 @@ import 'package:fixnum/fixnum.dart' as $fixnum; import 'package:protobuf/protobuf.dart' as $pb; import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin; +/// A Timestamp represents a point in time independent of any time zone or local +/// calendar, encoded as a count of seconds and fractions of seconds at +/// nanosecond resolution. The count is relative to an epoch at UTC midnight on +/// January 1, 1970, in the proleptic Gregorian calendar which extends the +/// Gregorian calendar backwards to year one. +/// +/// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap +/// second table is needed for interpretation, using a [24-hour linear +/// smear](https://developers.google.com/time/smear). +/// +/// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By +/// restricting to that range, we ensure that we can convert to and from [RFC +/// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings. +/// +/// # Examples +/// +/// Example 1: Compute Timestamp from POSIX `time()`. +/// +/// Timestamp timestamp; +/// timestamp.set_seconds(time(NULL)); +/// timestamp.set_nanos(0); +/// +/// Example 2: Compute Timestamp from POSIX `gettimeofday()`. +/// +/// struct timeval tv; +/// gettimeofday(&tv, NULL); +/// +/// Timestamp timestamp; +/// timestamp.set_seconds(tv.tv_sec); +/// timestamp.set_nanos(tv.tv_usec * 1000); +/// +/// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`. +/// +/// FILETIME ft; +/// GetSystemTimeAsFileTime(&ft); +/// UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime; +/// +/// // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z +/// // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z. +/// Timestamp timestamp; +/// timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL)); +/// timestamp.set_nanos((INT32) ((ticks % 10000000) * 100)); +/// +/// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`. +/// +/// long millis = System.currentTimeMillis(); +/// +/// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) +/// .setNanos((int) ((millis % 1000) * 1000000)).build(); +/// +/// Example 5: Compute Timestamp from Java `Instant.now()`. +/// +/// Instant now = Instant.now(); +/// +/// Timestamp timestamp = +/// Timestamp.newBuilder().setSeconds(now.getEpochSecond()) +/// .setNanos(now.getNano()).build(); +/// +/// Example 6: Compute Timestamp from current time in Python. +/// +/// timestamp = Timestamp() +/// timestamp.GetCurrentTime() +/// +/// # JSON Mapping +/// +/// In JSON format, the Timestamp type is encoded as a string in the +/// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the +/// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z" +/// where {year} is always expressed using four digits while {month}, {day}, +/// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional +/// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), +/// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone +/// is required. A proto3 JSON serializer should always use UTC (as indicated by +/// "Z") when printing the Timestamp type and a proto3 JSON parser should be +/// able to accept both UTC and other timezones (as indicated by an offset). +/// +/// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past +/// 01:30 UTC on January 15, 2017. +/// +/// In JavaScript, one can convert a Date object to this format using the +/// standard +/// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) +/// method. In Python, a standard `datetime.datetime` object can be converted +/// to this format using +/// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with +/// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use +/// the Joda Time's [`ISODateTimeFormat.dateTime()`]( +/// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime() +/// ) to obtain a formatter capable of generating timestamps in this format. class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin { - factory Timestamp() => create(); + factory Timestamp({ + $fixnum.Int64? seconds, + $core.int? nanos, + }) { + final result = create(); + if (seconds != null) { + result.seconds = seconds; + } + if (nanos != null) { + result.nanos = nanos; + } + return result; + } Timestamp._() : super(); factory Timestamp.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -57,6 +158,9 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin { _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Timestamp? _defaultInstance; + /// Represents seconds of UTC time since Unix epoch + /// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to + /// 9999-12-31T23:59:59Z inclusive. @$pb.TagNumber(1) $fixnum.Int64 get seconds => $_getI64(0); @$pb.TagNumber(1) @@ -69,6 +173,10 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin { @$pb.TagNumber(1) void clearSeconds() => clearField(1); + /// Non-negative fractions of a second at nanosecond resolution. Negative + /// second values with fractions must still have non-negative nanos values + /// that count forward in time. Must be from 0 to 999,999,999 + /// inclusive. @$pb.TagNumber(2) $core.int get nanos => $_getIZ(1); @$pb.TagNumber(2) diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart index 2f5d300e..a194b805 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart index a668eeb3..39ab20fa 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart index 9ba8b8fc..113d2b12 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart index b3e768a4..dc665bcf 100644 --- a/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import @@ -13,8 +13,25 @@ import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; +/// An object that represents a latitude/longitude pair. This is expressed as a +/// pair of doubles to represent degrees latitude and degrees longitude. Unless +/// specified otherwise, this must conform to the +/// WGS84 +/// standard. Values must be within normalized ranges. class LatLng extends $pb.GeneratedMessage { - factory LatLng() => create(); + factory LatLng({ + $core.double? latitude, + $core.double? longitude, + }) { + final result = create(); + if (latitude != null) { + result.latitude = latitude; + } + if (longitude != null) { + result.longitude = longitude; + } + return result; + } LatLng._() : super(); factory LatLng.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => @@ -52,6 +69,7 @@ class LatLng extends $pb.GeneratedMessage { _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static LatLng? _defaultInstance; + /// The latitude in degrees. It must be in the range [-90.0, +90.0]. @$pb.TagNumber(1) $core.double get latitude => $_getN(0); @$pb.TagNumber(1) @@ -64,6 +82,7 @@ class LatLng extends $pb.GeneratedMessage { @$pb.TagNumber(1) void clearLatitude() => clearField(1); + /// The longitude in degrees. It must be in the range [-180.0, +180.0]. @$pb.TagNumber(2) $core.double get longitude => $_getN(1); @$pb.TagNumber(2) diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart index c122c230..76cae745 100644 --- a/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart +++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart index 0bb914d9..45d99883 100644 --- a/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart +++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart index cd027dc3..80232746 100644 --- a/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart +++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart @@ -4,7 +4,7 @@ // // @dart = 2.12 -// ignore_for_file: annotate_overrides, camel_case_types +// ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields From d148e66611754f900fb66cb58164c926d5c70974 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 16:57:39 -0700 Subject: [PATCH 04/43] build(deps): bump actions/setup-go from 4.0.1 to 4.1.0 (#432) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/fac708d6674e30b6ba41289acaab6d4b75aa0753...93397bea11091df50f3d7e59dc26a7711a8bcfbe) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 995d0a34..8ce75108 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -26,7 +26,7 @@ jobs: os:ubuntu-latest - name: Setup Go - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 + uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe with: go-version: '^1.16' From 8d4bb239f83dc2216dd48219f191b58a3be3d47e Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Tue, 19 Sep 2023 17:27:14 -0700 Subject: [PATCH 05/43] chore: bump dart_flutter_team_lints (#434) --- analysis_options.yaml | 5 ----- dartfn/CHANGELOG.md | 4 ++++ dartfn/lib/src/generators/cloudevent.g.dart | 2 +- dartfn/lib/src/generators/helloworld.g.dart | 2 +- dartfn/lib/src/generators/json.g.dart | 2 +- dartfn/lib/src/version.dart | 2 +- dartfn/pubspec.yaml | 4 ++-- dartfn/templates/cloudevent/pubspec.yaml | 2 +- dartfn/templates/helloworld/pubspec.yaml | 2 +- dartfn/templates/json/pubspec.yaml | 2 +- examples/fullstack/backend/pubspec.yaml | 2 +- examples/fullstack/frontend-cli/pubspec.yaml | 2 +- examples/fullstack/frontend/pubspec.yaml | 2 +- examples/hello/pubspec.yaml | 2 +- examples/json/pubspec.yaml | 2 +- examples/protobuf_firestore/pubspec.yaml | 2 +- examples/raw_cloudevent/pubspec.yaml | 2 +- functions_framework/pubspec.yaml | 2 +- functions_framework_builder/pubspec.yaml | 2 +- google_cloud/pubspec.yaml | 2 +- integration_test/pubspec.yaml | 2 +- 21 files changed, 24 insertions(+), 25 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index bb84eec2..d1e72ff8 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -19,18 +19,13 @@ linter: - avoid_void_async - cancel_subscriptions - cascade_invocations - - comment_references - join_return_with_assignment - literal_only_boolean_expressions - missing_whitespace_between_adjacent_strings - no_runtimeType_toString - package_api_docs - - prefer_const_constructors - prefer_const_declarations - prefer_expression_function_bodies - prefer_final_locals - - prefer_relative_imports - require_trailing_commas - - test_types_in_equals - use_string_buffers - - use_super_parameters diff --git a/dartfn/CHANGELOG.md b/dartfn/CHANGELOG.md index d517a110..11ed8c05 100644 --- a/dartfn/CHANGELOG.md +++ b/dartfn/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.7-wip + +- Use latest `dart_flutter_team_lints` version. + ## 0.4.6 - Ignore file cleanup. diff --git a/dartfn/lib/src/generators/cloudevent.g.dart b/dartfn/lib/src/generators/cloudevent.g.dart index 3b69af9e..04dca95e 100644 --- a/dartfn/lib/src/generators/cloudevent.g.dart +++ b/dartfn/lib/src/generators/cloudevent.g.dart @@ -165,7 +165,7 @@ MAojIGhvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQpwdWJsaXNoX3RvOiBub25lCgpl bnZpcm9ubWVudDoKICBzZGs6IF4zLjAuMAoKZGVwZW5kZW5jaWVzOgogIGZ1bmN0aW9uc19mcmFt ZXdvcms6IF4wLjQuMAogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBlbmRlbmNpZXM6CiAgYnVpbGRf cnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1aWxkZXI6IF4wLjQuMAogIGh0 -dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAgZGFydF9mbHV0dGVyX3RlYW1fbGludHM6IF4xLjAuMAog +dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAgZGFydF9mbHV0dGVyX3RlYW1fbGludHM6IF4yLjAuMAog IHRlc3Q6IF4xLjE1LjAKICB0ZXN0X3Byb2Nlc3M6IF4yLjAuMAo=''', 'sample/data.json', 'text', diff --git a/dartfn/lib/src/generators/helloworld.g.dart b/dartfn/lib/src/generators/helloworld.g.dart index 1680b428..3f6e273e 100644 --- a/dartfn/lib/src/generators/helloworld.g.dart +++ b/dartfn/lib/src/generators/helloworld.g.dart @@ -153,7 +153,7 @@ Z2U6IGh0dHBzOi8vd3d3LmV4YW1wbGUuY29tCnB1Ymxpc2hfdG86IG5vbmUKCmVudmlyb25tZW50 OgogIHNkazogXjMuMC4wCgpkZXBlbmRlbmNpZXM6CiAgZnVuY3Rpb25zX2ZyYW1ld29yazogXjAu NC4wCiAgc2hlbGY6IF4xLjAuMAoKZGV2X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4y LjAuMAogIGZ1bmN0aW9uc19mcmFtZXdvcmtfYnVpbGRlcjogXjAuNC4wCiAgaHR0cDogJz49MC4x -My4wIDwyLjAuMCcKICBkYXJ0X2ZsdXR0ZXJfdGVhbV9saW50czogXjEuMC4wCiAgdGVzdDogXjEu +My4wIDwyLjAuMCcKICBkYXJ0X2ZsdXR0ZXJfdGVhbV9saW50czogXjIuMC4wCiAgdGVzdDogXjEu MTUuNwogIHRlc3RfcHJvY2VzczogXjIuMC4wCg==''', 'test/function_test.dart', 'text', diff --git a/dartfn/lib/src/generators/json.g.dart b/dartfn/lib/src/generators/json.g.dart index f290b3ce..8970d4c2 100644 --- a/dartfn/lib/src/generators/json.g.dart +++ b/dartfn/lib/src/generators/json.g.dart @@ -246,7 +246,7 @@ bnQ6CiAgc2RrOiBeMy4wLjAKCmRlcGVuZGVuY2llczoKICBmdW5jdGlvbnNfZnJhbWV3b3JrOiBe MC40LjAKICBqc29uX2Fubm90YXRpb246IF40LjguMQogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBl bmRlbmNpZXM6CiAgYnVpbGRfcnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1 aWxkZXI6IF4wLjQuMAogIGh0dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAganNvbl9zZXJpYWxpemFi -bGU6IF42LjAuMAogIGRhcnRfZmx1dHRlcl90ZWFtX2xpbnRzOiBeMS4wLjAKICB0ZXN0OiBeMS4x +bGU6IF42LjAuMAogIGRhcnRfZmx1dHRlcl90ZWFtX2xpbnRzOiBeMi4wLjAKICB0ZXN0OiBeMS4x NS43CiAgdGVzdF9wcm9jZXNzOiBeMi4wLjAK''', 'test/function_test.dart', 'text', diff --git a/dartfn/lib/src/version.dart b/dartfn/lib/src/version.dart index 43354d98..4faf2784 100644 --- a/dartfn/lib/src/version.dart +++ b/dartfn/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '0.4.6'; +const packageVersion = '0.4.7-wip'; diff --git a/dartfn/pubspec.yaml b/dartfn/pubspec.yaml index 51fde546..28a796b0 100644 --- a/dartfn/pubspec.yaml +++ b/dartfn/pubspec.yaml @@ -2,7 +2,7 @@ name: dartfn description: > A tools package for managing FaaS (Function as a service) portable Dart functions projects # After changing the version, run `pub run build_runner build`. -version: 0.4.6 +version: 0.4.7-wip homepage: https://github.com/GoogleCloudPlatform/functions-framework-dart environment: @@ -25,7 +25,7 @@ dev_dependencies: build_runner: ^2.0.4 build_verify: ^3.0.0 build_version: ^2.1.1 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 glob: ^2.0.0 grinder: ^0.9.0 source_gen: ^1.0.0 diff --git a/dartfn/templates/cloudevent/pubspec.yaml b/dartfn/templates/cloudevent/pubspec.yaml index 16951f43..7ec574e6 100644 --- a/dartfn/templates/cloudevent/pubspec.yaml +++ b/dartfn/templates/cloudevent/pubspec.yaml @@ -15,6 +15,6 @@ dev_dependencies: build_runner: ^2.0.0 functions_framework_builder: ^0.4.0 http: '>=0.13.0 <2.0.0' - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 test: ^1.15.0 test_process: ^2.0.0 diff --git a/dartfn/templates/helloworld/pubspec.yaml b/dartfn/templates/helloworld/pubspec.yaml index 8e7c9fdf..b1160f5e 100644 --- a/dartfn/templates/helloworld/pubspec.yaml +++ b/dartfn/templates/helloworld/pubspec.yaml @@ -15,6 +15,6 @@ dev_dependencies: build_runner: ^2.0.0 functions_framework_builder: ^0.4.0 http: '>=0.13.0 <2.0.0' - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 test: ^1.15.7 test_process: ^2.0.0 diff --git a/dartfn/templates/json/pubspec.yaml b/dartfn/templates/json/pubspec.yaml index 71ce322f..5b50f0bd 100644 --- a/dartfn/templates/json/pubspec.yaml +++ b/dartfn/templates/json/pubspec.yaml @@ -17,6 +17,6 @@ dev_dependencies: functions_framework_builder: ^0.4.0 http: '>=0.13.0 <2.0.0' json_serializable: ^6.0.0 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 test: ^1.15.7 test_process: ^2.0.0 diff --git a/examples/fullstack/backend/pubspec.yaml b/examples/fullstack/backend/pubspec.yaml index 91a8b44b..45d89bd6 100644 --- a/examples/fullstack/backend/pubspec.yaml +++ b/examples/fullstack/backend/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 functions_framework_builder: ^0.4.0 http: '>=0.13.0 <2.0.0' json_serializable: ^6.0.0 diff --git a/examples/fullstack/frontend-cli/pubspec.yaml b/examples/fullstack/frontend-cli/pubspec.yaml index 83b64302..5080bc5f 100644 --- a/examples/fullstack/frontend-cli/pubspec.yaml +++ b/examples/fullstack/frontend-cli/pubspec.yaml @@ -14,6 +14,6 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 json_serializable: ^6.0.0 test: ^1.14.4 diff --git a/examples/fullstack/frontend/pubspec.yaml b/examples/fullstack/frontend/pubspec.yaml index a213fc14..0eeefa7a 100644 --- a/examples/fullstack/frontend/pubspec.yaml +++ b/examples/fullstack/frontend/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 flutter_test: sdk: flutter json_serializable: ^6.0.0 diff --git a/examples/hello/pubspec.yaml b/examples/hello/pubspec.yaml index cc261bb7..b58095b5 100644 --- a/examples/hello/pubspec.yaml +++ b/examples/hello/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 functions_framework_builder: ^0.4.0 http: '>=0.13.0 <2.0.0' test: ^1.15.7 diff --git a/examples/json/pubspec.yaml b/examples/json/pubspec.yaml index 8c038b1e..43865d5b 100644 --- a/examples/json/pubspec.yaml +++ b/examples/json/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 functions_framework_builder: ^0.4.0 http: '>=0.13.0 <2.0.0' json_serializable: ^6.0.0 diff --git a/examples/protobuf_firestore/pubspec.yaml b/examples/protobuf_firestore/pubspec.yaml index dd825d73..776267e6 100644 --- a/examples/protobuf_firestore/pubspec.yaml +++ b/examples/protobuf_firestore/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 functions_framework_builder: ^0.4.0 http: '>=0.13.0 <2.0.0' test: ^1.15.0 diff --git a/examples/raw_cloudevent/pubspec.yaml b/examples/raw_cloudevent/pubspec.yaml index dc9bbf03..3bee2ff4 100644 --- a/examples/raw_cloudevent/pubspec.yaml +++ b/examples/raw_cloudevent/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 functions_framework_builder: ^0.4.0 http: '>=0.13.0 <2.0.0' test: ^1.15.0 diff --git a/functions_framework/pubspec.yaml b/functions_framework/pubspec.yaml index 5013b945..d822b03d 100644 --- a/functions_framework/pubspec.yaml +++ b/functions_framework/pubspec.yaml @@ -22,6 +22,6 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 build_verify: ^3.0.0 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 json_serializable: ^6.0.0 test: ^1.15.7 diff --git a/functions_framework_builder/pubspec.yaml b/functions_framework_builder/pubspec.yaml index 319090b5..37c46dd6 100644 --- a/functions_framework_builder/pubspec.yaml +++ b/functions_framework_builder/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: dev_dependencies: build_test: ^2.0.0 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 package_config: ^2.0.0 stream_transform: ^2.0.0 test: ^1.15.7 diff --git a/google_cloud/pubspec.yaml b/google_cloud/pubspec.yaml index 89f99633..aee357b4 100644 --- a/google_cloud/pubspec.yaml +++ b/google_cloud/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: stack_trace: ^1.11.0 dev_dependencies: - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 googleapis: ^11.0.0 googleapis_auth: ^1.3.1 test: ^1.22.0 diff --git a/integration_test/pubspec.yaml b/integration_test/pubspec.yaml index 5fdb5e60..8b3f7e8b 100644 --- a/integration_test/pubspec.yaml +++ b/integration_test/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 build_verify: ^3.0.0 - dart_flutter_team_lints: ^1.0.0 + dart_flutter_team_lints: ^2.0.0 functions_framework_builder: any google_cloud: ^0.2.0 http: '>=0.13.1 <2.0.0' From 4fe8bd0df3df7cc4df4db1a035a1d24d8c4127b8 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Tue, 19 Sep 2023 18:47:41 -0700 Subject: [PATCH 06/43] chore: skip failing windows test (#436) --- google_cloud/test/gcp_test.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/google_cloud/test/gcp_test.dart b/google_cloud/test/gcp_test.dart index a2d381c3..dd8f65c3 100644 --- a/google_cloud/test/gcp_test.dart +++ b/google_cloud/test/gcp_test.dart @@ -22,7 +22,9 @@ void main() { group('currentProjectId', () { const projectIdPrint = 'test/src/project_id_print.dart'; - test('not environment', () async { + test('not environment', onPlatform: { + 'windows': const Skip('Cannot validate tests on windows.'), + }, () async { final proc = await _run(projectIdPrint); final errorOut = await proc.stderrStream().toList(); From baf04ae1d3b7a1f0e48a7001ca89bd8dcf81433b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 12:47:31 -0700 Subject: [PATCH 07/43] build(deps): bump GoogleCloudPlatform/functions-framework-conformance (#438) Bumps [GoogleCloudPlatform/functions-framework-conformance](https://github.com/googlecloudplatform/functions-framework-conformance) from 1.8.5 to 1.8.6. - [Release notes](https://github.com/googlecloudplatform/functions-framework-conformance/releases) - [Commits](https://github.com/googlecloudplatform/functions-framework-conformance/compare/v1.8.5...v1.8.6) --- updated-dependencies: - dependency-name: GoogleCloudPlatform/functions-framework-conformance dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 8ce75108..6ea3fa18 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -40,7 +40,7 @@ jobs: working-directory: integration_test - name: Run HTTP conformance tests - uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.8.5 + uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.8.6 with: functionType: 'http' useBuildpacks: false @@ -49,7 +49,7 @@ jobs: startDelay: 3 - name: Run CloudEvent conformance tests - uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.8.5 + uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.8.6 with: functionType: 'cloudevent' useBuildpacks: false From e6ff476e67d4ed249f1cc7007bbd0aec96c527f8 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 1 Nov 2023 11:46:07 -0700 Subject: [PATCH 08/43] Update mono_repo (#444) --- .github/workflows/lint.yml | 4 ++-- .github/workflows/unit.yml | 2 +- tool/ci.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 367341b1..7edfe70d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.5.7 +# Created with package:mono_repo v6.6.0 name: Dart Lint CI on: push: @@ -35,7 +35,7 @@ jobs: name: Checkout repository uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - name: mono_repo self validate - run: dart pub global activate mono_repo 6.5.7 + run: dart pub global activate mono_repo 6.6.0 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 8ecfc6cf..53859572 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.5.7 +# Created with package:mono_repo v6.6.0 name: Dart Unit CI on: push: diff --git a/tool/ci.sh b/tool/ci.sh index 7f1172ce..2dfc85d0 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created with package:mono_repo v6.5.7 +# Created with package:mono_repo v6.6.0 # Support built in commands on windows out of the box. # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") From abf66dfc7fe1a5204d54a21a4fd16e9917efdf68 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 8 Nov 2023 14:16:06 -0800 Subject: [PATCH 09/43] chore: dartfn-Use standard newline for code, use async await (#446) --- dartfn/lib/src/cli/command/generate.dart | 23 +- dartfn/lib/src/cli/directory.dart | 7 +- dartfn/lib/src/generators/cloudevent.g.dart | 518 ++++++++++---------- dartfn/lib/src/generators/helloworld.g.dart | 262 +++++----- dartfn/lib/src/generators/json.g.dart | 452 ++++++++--------- dartfn/lib/src/stagehand/stagehand.dart | 6 +- dartfn/tool/builder/src/code_generator.dart | 2 +- 7 files changed, 634 insertions(+), 636 deletions(-) diff --git a/dartfn/lib/src/cli/command/generate.dart b/dartfn/lib/src/cli/command/generate.dart index b9e3c2d8..488afb32 100644 --- a/dartfn/lib/src/cli/command/generate.dart +++ b/dartfn/lib/src/cli/command/generate.dart @@ -81,7 +81,7 @@ class GenerateCommand extends Command { return await _generate(generatorName); } - Future _generate(String generatorName) { + Future _generate(String generatorName) async { final generator = _getGenerator(generatorName); if (generator == null) { usageException("'$generatorName' is not a valid generator.\n"); @@ -99,17 +99,16 @@ class GenerateCommand extends Command { final vars = {}; - final f = generator.generate(projectName, target, additionalVars: vars); - return f.then((_) { - write('${generator.numFiles()} files written.'); - - var message = generator.getInstallInstructions(); - if (message.isNotEmpty) { - message = message.trim(); - message = message.split('\n').map((line) => '--> $line').join('\n'); - write('\n$message'); - } - }); + await generator.generate(projectName, target, additionalVars: vars); + + write('${generator.numFiles()} files written.'); + + var message = generator.getInstallInstructions(); + if (message.isNotEmpty) { + message = message.trim(); + message = message.split('\n').map((line) => '--> $line').join('\n'); + write('\n$message'); + } } String _createMachineInfo(List generators) { diff --git a/dartfn/lib/src/cli/directory.dart b/dartfn/lib/src/cli/directory.dart index 78436fe1..842dbcb4 100644 --- a/dartfn/lib/src/cli/directory.dart +++ b/dartfn/lib/src/cli/directory.dart @@ -29,14 +29,13 @@ class DirectoryGeneratorTarget extends GeneratorTarget { } @override - Future createFile(String path, List contents) { + Future createFile(String path, List contents) async { final file = io.File(p.join(dir.path, path)); printer.write(' ${file.path}'); - return file - .create(recursive: true) - .then((_) => file.writeAsBytes(contents)); + await file.create(recursive: true); + await file.writeAsBytes(contents); } } diff --git a/dartfn/lib/src/generators/cloudevent.g.dart b/dartfn/lib/src/generators/cloudevent.g.dart index 04dca95e..4e8b1d0d 100644 --- a/dartfn/lib/src/generators/cloudevent.g.dart +++ b/dartfn/lib/src/generators/cloudevent.g.dart @@ -10,312 +10,312 @@ const _data = [ '.gitignore', 'text', ''' -IyBTZWUgaHR0cHM6Ly9kYXJ0LmRldi9ndWlkZXMvbGlicmFyaWVzL3ByaXZhdGUtZmlsZXMKCiMg -RmlsZXMgYW5kIGRpcmVjdG9yaWVzIGNyZWF0ZWQgYnkgcHViCi5kYXJ0X3Rvb2wvCnB1YnNwZWMu +IyBTZWUgaHR0cHM6Ly9kYXJ0LmRldi9ndWlkZXMvbGlicmFyaWVzL3ByaXZhdGUtZmlsZXMKCiMg +RmlsZXMgYW5kIGRpcmVjdG9yaWVzIGNyZWF0ZWQgYnkgcHViCi5kYXJ0X3Rvb2wvCnB1YnNwZWMu bG9jawo=''', 'Dockerfile', 'text', ''' -IyBPZmZpY2lhbCBEYXJ0IGltYWdlOiBodHRwczovL2h1Yi5kb2NrZXIuY29tL18vZGFydAojIFNw -ZWNpZnkgdGhlIERhcnQgU0RLIGJhc2UgaW1hZ2UgdmVyc2lvbiB1c2luZyBkYXJ0Ojx2ZXJzaW9u -PiAoZXg6IGRhcnQ6Mi4xNCkKRlJPTSBkYXJ0OnN0YWJsZSBBUyBidWlsZAoKIyByZXNvbHZlIGFw -cCBkZXBlbmRlbmNpZXMuCldPUktESVIgL2FwcApDT1BZIHB1YnNwZWMuKiAuLwpSVU4gZGFydCBw -dWIgZ2V0CgojIGNvcHkgYXBwIHNvdXJjZSBjb2RlIGFuZCBhb3QgY29tcGlsZSBpdC4KQ09QWSAu -IC4KIyBlbnN1cmUgcGFja2FnZXMgYXJlIHN0aWxsIHVwLXRvLWRhdGUgaWYgYW55dGhpbmcgaGFz -IGNoYW5nZWQKUlVOIGRhcnQgcHViIGdldCAtLW9mZmxpbmUKUlVOIGRhcnQgcHViIHJ1biBidWls -ZF9ydW5uZXIgYnVpbGQgLS1kZWxldGUtY29uZmxpY3Rpbmctb3V0cHV0cwpSVU4gZGFydCBjb21w -aWxlIGV4ZSBiaW4vc2VydmVyLmRhcnQgLW8gYmluL3NlcnZlcgoKIyBidWlsZCBtaW5pbWFsIHNl -cnZpbmcgaW1hZ2UgZnJvbSBhb3QtY29tcGlsZWQgYC9zZXJ2ZXJgIGFuZCByZXF1aXJlZCBzeXN0 -ZW0KIyBsaWJyYXJpZXMgYW5kIGNvbmZpZ3VyYXRpb24gZmlsZXMgc3RvcmVkIGluIGAvcnVudGlt -ZS9gIGZyb20gdGhlIGJ1aWxkIHN0YWdlLgpGUk9NIHNjcmF0Y2gKQ09QWSAtLWZyb209YnVpbGQg -L3J1bnRpbWUvIC8KQ09QWSAtLWZyb209YnVpbGQgL2FwcC9iaW4vc2VydmVyIC9hcHAvYmluLwoK -IyBzdGFydCBzZXJ2ZXIuCkVYUE9TRSA4MDgwCkVOVFJZUE9JTlQgWyIvYXBwL2Jpbi9zZXJ2ZXIi +IyBPZmZpY2lhbCBEYXJ0IGltYWdlOiBodHRwczovL2h1Yi5kb2NrZXIuY29tL18vZGFydAojIFNw +ZWNpZnkgdGhlIERhcnQgU0RLIGJhc2UgaW1hZ2UgdmVyc2lvbiB1c2luZyBkYXJ0Ojx2ZXJzaW9u +PiAoZXg6IGRhcnQ6Mi4xNCkKRlJPTSBkYXJ0OnN0YWJsZSBBUyBidWlsZAoKIyByZXNvbHZlIGFw +cCBkZXBlbmRlbmNpZXMuCldPUktESVIgL2FwcApDT1BZIHB1YnNwZWMuKiAuLwpSVU4gZGFydCBw +dWIgZ2V0CgojIGNvcHkgYXBwIHNvdXJjZSBjb2RlIGFuZCBhb3QgY29tcGlsZSBpdC4KQ09QWSAu +IC4KIyBlbnN1cmUgcGFja2FnZXMgYXJlIHN0aWxsIHVwLXRvLWRhdGUgaWYgYW55dGhpbmcgaGFz +IGNoYW5nZWQKUlVOIGRhcnQgcHViIGdldCAtLW9mZmxpbmUKUlVOIGRhcnQgcHViIHJ1biBidWls +ZF9ydW5uZXIgYnVpbGQgLS1kZWxldGUtY29uZmxpY3Rpbmctb3V0cHV0cwpSVU4gZGFydCBjb21w +aWxlIGV4ZSBiaW4vc2VydmVyLmRhcnQgLW8gYmluL3NlcnZlcgoKIyBidWlsZCBtaW5pbWFsIHNl +cnZpbmcgaW1hZ2UgZnJvbSBhb3QtY29tcGlsZWQgYC9zZXJ2ZXJgIGFuZCByZXF1aXJlZCBzeXN0 +ZW0KIyBsaWJyYXJpZXMgYW5kIGNvbmZpZ3VyYXRpb24gZmlsZXMgc3RvcmVkIGluIGAvcnVudGlt +ZS9gIGZyb20gdGhlIGJ1aWxkIHN0YWdlLgpGUk9NIHNjcmF0Y2gKQ09QWSAtLWZyb209YnVpbGQg +L3J1bnRpbWUvIC8KQ09QWSAtLWZyb209YnVpbGQgL2FwcC9iaW4vc2VydmVyIC9hcHAvYmluLwoK +IyBzdGFydCBzZXJ2ZXIuCkVYUE9TRSA4MDgwCkVOVFJZUE9JTlQgWyIvYXBwL2Jpbi9zZXJ2ZXIi LCAiLS1zaWduYXR1cmUtdHlwZT1jbG91ZGV2ZW50Il0K''', 'Makefile', 'text', ''' -LlBIT05ZOiBjbGVhbgoKRlVOQ1RJT05fVEFSR0VUID0gZnVuY3Rpb24KUE9SVCA9IDgwODAKCiMg -YmluL3NlcnZlci5kYXJ0IGlzIHRoZSBnZW5lcmF0ZWQgdGFyZ2V0IGZvciBsaWIvZnVuY3Rpb25z -LmRhcnQKYmluL3NlcnZlci5kYXJ0OgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGJ1aWxkIC0tZGVs -ZXRlLWNvbmZsaWN0aW5nLW91dHB1dHMKCmJ1aWxkOiBiaW4vc2VydmVyLmRhcnQKCnRlc3Q6IGNs -ZWFuIGJ1aWxkCglkYXJ0IHRlc3QKCmNsZWFuOgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGNsZWFu -CglybSAtcmYgYmluL3NlcnZlci5kYXJ0CgpydW46IGJ1aWxkCglkYXJ0IHJ1biBiaW4vc2VydmVy +LlBIT05ZOiBjbGVhbgoKRlVOQ1RJT05fVEFSR0VUID0gZnVuY3Rpb24KUE9SVCA9IDgwODAKCiMg +YmluL3NlcnZlci5kYXJ0IGlzIHRoZSBnZW5lcmF0ZWQgdGFyZ2V0IGZvciBsaWIvZnVuY3Rpb25z +LmRhcnQKYmluL3NlcnZlci5kYXJ0OgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGJ1aWxkIC0tZGVs +ZXRlLWNvbmZsaWN0aW5nLW91dHB1dHMKCmJ1aWxkOiBiaW4vc2VydmVyLmRhcnQKCnRlc3Q6IGNs +ZWFuIGJ1aWxkCglkYXJ0IHRlc3QKCmNsZWFuOgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGNsZWFu +CglybSAtcmYgYmluL3NlcnZlci5kYXJ0CgpydW46IGJ1aWxkCglkYXJ0IHJ1biBiaW4vc2VydmVy LmRhcnQgLS1wb3J0PSQoUE9SVCkgLS10YXJnZXQ9JChGVU5DVElPTl9UQVJHRVQpCg==''', 'README.md', 'text', ''' -IyBCYXNpYyBDbG91ZEV2ZW50IGV4YW1wbGUKClRoaXMgZXhhbXBsZSBkZW1vbnN0cmF0ZXMgd3Jp -dGluZyBhIGZ1bmN0aW9uIHRvIGhhbmRsZSBhIENsb3VkRXZlbnQuCgpDbG91ZEV2ZW50IGZ1bmN0 -aW9uIGhhbmRsZXJzIGRvbid0IHJldHVybiBhIHJlc3BvbnNlIHRvIHNlbmQgdG8gdGhlIGV2ZW50 -CnByb2R1Y2VyLiBUaGV5IGdlbmVyYWxseSBwZXJmb3JtIHNvbWUgd29yayBhbmQgcHJpbnQgb3V0 -cHV0IGZvciBsb2dnaW5nLgoKVGhlIGJhc2ljIHNoYXBlIG9mIHRoZSBmdW5jdGlvbiBoYW5kbGVy -IGxvb2tzIGxpa2UgdGhpczoKCmBgYGRhcnQKQENsb3VkRnVuY3Rpb24oKQp2b2lkIGZ1bmN0aW9u -KENsb3VkRXZlbnQgZXZlbnQsIFJlcXVlc3RDb250ZXh0IGNvbnRleHQpIHsKfQpgYGAKCk9yIGxp -a2UgdGhpcyBpZiBpdCBuZWVkcyB0byBwZXJmb3JtIHdvcmsgdGhhdCB3aWxsIGNvbXBsZXRlIHNv -bWV0aW1lIGluIHRoZQpmdXR1cmU6CgpgYGBkYXJ0CkBDbG91ZEZ1bmN0aW9uKCkKRnV0dXJlT3I8 -dm9pZD4gZnVuY3Rpb24oQ2xvdWRFdmVudCBldmVudCwgUmVxdWVzdENvbnRleHQgY29udGV4dCkg -YXN5bmMgewp9CmBgYAoKVGhlIGZ1bGwgY29kZSBvZiB0aGUgZnVuY3Rpb24gZm9yIHRoaXMgZXhh -bXBsZSBpcyBzaG93biBiZWxvdzoKCmxpYi9mdW5jdGlvbnMuZGFydAoKYGBgZGFydAppbXBvcnQg -J2RhcnQ6Y29udmVydCc7CmltcG9ydCAnZGFydDppbyc7CgppbXBvcnQgJ3BhY2thZ2U6ZnVuY3Rp -b25zX2ZyYW1ld29yay9mdW5jdGlvbnNfZnJhbWV3b3JrLmRhcnQnOwoKY29uc3QgX2VuY29kZXIg -PSBKc29uRW5jb2Rlci53aXRoSW5kZW50KCcgJyk7CgpAQ2xvdWRGdW5jdGlvbigpCnZvaWQgZnVu -Y3Rpb24oQ2xvdWRFdmVudCBldmVudCwgUmVxdWVzdENvbnRleHQgY29udGV4dCkgewogIGNvbnRl -eHQubG9nZ2VyLmluZm8oJ2V2ZW50IHN1YmplY3Q6ICR7ZXZlbnQuc3ViamVjdH0nKTsKICBzdGRl -cnIud3JpdGVsbihfZW5jb2Rlci5jb252ZXJ0KGV2ZW50KSk7Cn0KYGBgCgpBbGwgdGhlIGZ1bmN0 -aW9uIGRvZXMgaXMgbG9nIHRoZSBzb3VyY2UgYW5kIHN1YmplY3Qgb2YgdGhlIENsb3VkRXZlbnQg -dGhhdAp0cmlnZ2VyZWQgaXQsIGFuZCB0aGVuIHByaW50cyBvdXQgdGhlIGVudGlyZSBldmVudCBK -U09OIG9iamVjdCBmb3IgaW5mb3JtYXRpb25hbApwdXJwb3Nlcy4KCiMjIEdlbmVyYXRlIHByb2pl -Y3QgZmlsZXMKClRoZSBEYXJ0IGBidWlsZF9ydW5uZXJgIHRvb2wgZ2VuZXJhdGVzIGBiaW4vc2Vy -dmVyLmRhcnRgLCB0aGUgbWFpbiBlbnRyeSBwb2ludApmb3IgdGhlIGZ1bmN0aW9uIHNlcnZlciBh -cHAsIHdoaWNoIGludm9rZXMgdGhlIGZ1bmN0aW9uIGluIGBsaWIvZnVuY3Rpb25zLmRhcnRgLgoK -UnVuIHRoZSBgYnVpbGRfcnVubmVyYCB0b29sLCBhcyBzaG93biBoZXJlOgoKYGBgc2hlbGwKJCBk -YXJ0IHJ1biBidWlsZF9ydW5uZXIgYnVpbGQKW0lORk9dIEdlbmVyYXRpbmcgYnVpbGQgc2NyaXB0 -IGNvbXBsZXRlZCwgdG9vayAzMzdtcwpbSU5GT10gUmVhZGluZyBjYWNoZWQgYXNzZXQgZ3JhcGgg -Y29tcGxldGVkLCB0b29rIDQ4bXMKW0lORk9dIENoZWNraW5nIGZvciB1cGRhdGVzIHNpbmNlIGxh -c3QgYnVpbGQgY29tcGxldGVkLCB0b29rIDQyNm1zCltJTkZPXSBSdW5uaW5nIGJ1aWxkIGNvbXBs -ZXRlZCwgdG9vayAxM21zCltJTkZPXSBDYWNoaW5nIGZpbmFsaXplZCBkZXBlbmRlbmN5IGdyYXBo -IGNvbXBsZXRlZCwgdG9vayAyOW1zCltJTkZPXSBTdWNjZWVkZWQgYWZ0ZXIgNTFtcyB3aXRoIDAg -b3V0cHV0cyAoMCBhY3Rpb25zKQpgYGAKCiMjIFRlc3QgdGhlIGZ1bmN0aW9uCgpgYGBzaGVsbAok -IGRhcnQgdGVzdAowMDowMiArMTogQWxsIHRlc3RzIHBhc3NlZCEKYGBgCgojIyBSdW4gdGhlIGZ1 -bmN0aW9uCgpUaGUgZGVmYXVsdCBzaWduYXR1cmUgdHlwZSBmb3IgYSBmdW5jdGlvbiBpcyBmb3Ig -aGFuZGxpbmcgbm9ybWFsIEhUVFAgcmVxdWVzdHMuCldoZW4gcnVubmluZyBhIGZ1bmN0aW9uIGZv -ciBoYW5kbGluZyBhIGNsb3VkZXZlbnQsIHlvdSBtdXN0IGVpdGhlciBzZXQKdGhlIGBGVU5DVElP -Tl9TSUdOQVRVUkVfVFlQRWAgZW52aXJvbm1lbnQgdmFyaWFibGUgb3IgdGhlCmAtLXNpZ25hdHVy -ZS10eXBlYCBjb21tYW5kIGxpbmUgb3B0aW9uIHRvIGBjbG91ZGV2ZW50YCwgYXMgc2hvd24gYmVs -b3c6CgpgYGBzaGVsbAokIGRhcnQgcnVuIGJpbi9zZXJ2ZXIuZGFydCAtLXNpZ25hdHVyZS10eXBl -IGNsb3VkZXZlbnQKTGlzdGVuaW5nIG9uIDo4MDgwCmBgYAoKRnJvbSBhbm90aGVyIHRlcm1pbmFs -LCB0cmlnZ2VyIHRoZSBDbG91ZEV2ZW50IGJ5IHBvc3RpbmcgZXZlbnQgZGF0YToKCmBgYHNoZWxs -CiQgY3VybCAtLWRhdGEtYmluYXJ5IEBzYW1wbGUvZGF0YS5qc29uIC1IICdjb250ZW50LXR5cGU6 -IGFwcGxpY2F0aW9uL2pzb24nIC13ICcle2h0dHBfY29kZX1cbicgbG9jYWxob3N0OjgwODAKMjAw -CmBgYAoKVG9vbHMgbGlrZSBbY3VybF0gKGFuZCBbcG9zdG1hbl0pIGFyZSBnb29kIGZvciBzZW5k -aW5nIEhUVFAgcmVxdWVzdHMuIFRoZQpvcHRpb25zIHVzZWQgaW4gdGhpcyBleGFtcGxlIGFyZToK -Ci0gYC0tZGF0YS1iaW5hcnkgQHNhbXBsZS9kYXRhLmpzb25gIC0gc2V0IHRoZSByZXF1ZXN0IGJv -ZHkgdG8gYSBKU09OIGRvY3VtZW50CiAgcmVhZCBmcm9tIHRoZSBmaWxlIGBzYW1wbGUvZGF0YS5q -c29uYAotIGAtSCAiY29udGVudC10eXBlOiBhcHBsaWNhdGlvbi9qc29uImAgLSBzZXQgYW4gSFRU -UCBoZWFkZXIgdG8gaW5kaWNhdGUgdGhhdAogIHRoZSBib2R5IGlzIGEgSlNPTiBkb2N1bWVudAot -IGAtdyAnJXtodHRwX2NvZGV9XG4nYCAtIHByaW50IHRoZSBIVFRQIHN0YXR1cyBjb2RlIChleHBl -Y3QgMjAwIGZvciBzdWNjZXNzKQoKQWx0ZXJuYXRpdmVseSwgaW5zdGVhZCBvZiBydW5uaW5nIGBj -dXJsYCwgeW91IGNhbiBydW4gZWl0aGVyIG9mIHRoZSBmb2xsb3dpbmcKRGFydCBzY3JpcHRzIGV4 -YW1wbGVzIHVuZGVyIHRoZSBgZXhhbXBsZXMvcmF3X2Nsb3VkZXZlbnQvdG9vbGAgZGlyZWN0b3J5 -OgoKLSBgZGFydCBydW4gdG9vbC9iaW5hcnlfbW9kZV9yZXF1ZXN0LmRhcnRgCi0gYGRhcnQgcnVu -IHRvb2wvc3RydWN0dXJlZF9tb2RlX3JlcXVlc3QuZGFydGAKCkZvciBtb3JlIGRldGFpbHMgb24g -Z2V0dGluZyBzdGFydGVkIG9yIHRvIHNlZSBob3cgdG8gcnVuIHRoZSBmdW5jdGlvbiBsb2NhbGx5 -IG9uCkRvY2tlciBvciBkZXBsb3kgdG8gQ2xvdWQgUnVuLCBzZWUgdGhlc2UgcXVpY2sgc3RhcnQg -Z3VpZGVzOgoKLSBbUXVpY2tzdGFydDogRGFydF0KLSBbUXVpY2tzdGFydDogRG9ja2VyXQotIFtR -dWlja3N0YXJ0OiBDbG91ZCBSdW5dCgo8IS0tIHJlZmVyZW5jZSBsaW5rcyAtLT4KW2N1cmxdOiBo -dHRwczovL2N1cmwuc2UvZG9jcy9tYW51YWwuaHRtbApbUXVpY2tzdGFydDogRGFydF06IGh0dHBz -Oi8vZ2l0aHViLmNvbS9Hb29nbGVDbG91ZFBsYXRmb3JtL2Z1bmN0aW9ucy1mcmFtZXdvcmstZGFy -dC9ibG9iL21haW4vZG9jcy9xdWlja3N0YXJ0cy8wMS1xdWlja3N0YXJ0LWRhcnQubWQKW1F1aWNr -c3RhcnQ6IERvY2tlcl06IGh0dHBzOi8vZ2l0aHViLmNvbS9Hb29nbGVDbG91ZFBsYXRmb3JtL2Z1 -bmN0aW9ucy1mcmFtZXdvcmstZGFydC9ibG9iL21haW4vZG9jcy9xdWlja3N0YXJ0cy8wMi1xdWlj -a3N0YXJ0LWRvY2tlci5tZApbUXVpY2tzdGFydDogQ2xvdWQgUnVuXTogaHR0cHM6Ly9naXRodWIu -Y29tL0dvb2dsZUNsb3VkUGxhdGZvcm0vZnVuY3Rpb25zLWZyYW1ld29yay1kYXJ0L2Jsb2IvbWFp -bi9kb2NzL3F1aWNrc3RhcnRzLzAzLXF1aWNrc3RhcnQtY2xvdWRydW4ubWQKW3Bvc3RtYW5dOiBo +IyBCYXNpYyBDbG91ZEV2ZW50IGV4YW1wbGUKClRoaXMgZXhhbXBsZSBkZW1vbnN0cmF0ZXMgd3Jp +dGluZyBhIGZ1bmN0aW9uIHRvIGhhbmRsZSBhIENsb3VkRXZlbnQuCgpDbG91ZEV2ZW50IGZ1bmN0 +aW9uIGhhbmRsZXJzIGRvbid0IHJldHVybiBhIHJlc3BvbnNlIHRvIHNlbmQgdG8gdGhlIGV2ZW50 +CnByb2R1Y2VyLiBUaGV5IGdlbmVyYWxseSBwZXJmb3JtIHNvbWUgd29yayBhbmQgcHJpbnQgb3V0 +cHV0IGZvciBsb2dnaW5nLgoKVGhlIGJhc2ljIHNoYXBlIG9mIHRoZSBmdW5jdGlvbiBoYW5kbGVy +IGxvb2tzIGxpa2UgdGhpczoKCmBgYGRhcnQKQENsb3VkRnVuY3Rpb24oKQp2b2lkIGZ1bmN0aW9u +KENsb3VkRXZlbnQgZXZlbnQsIFJlcXVlc3RDb250ZXh0IGNvbnRleHQpIHsKfQpgYGAKCk9yIGxp +a2UgdGhpcyBpZiBpdCBuZWVkcyB0byBwZXJmb3JtIHdvcmsgdGhhdCB3aWxsIGNvbXBsZXRlIHNv +bWV0aW1lIGluIHRoZQpmdXR1cmU6CgpgYGBkYXJ0CkBDbG91ZEZ1bmN0aW9uKCkKRnV0dXJlT3I8 +dm9pZD4gZnVuY3Rpb24oQ2xvdWRFdmVudCBldmVudCwgUmVxdWVzdENvbnRleHQgY29udGV4dCkg +YXN5bmMgewp9CmBgYAoKVGhlIGZ1bGwgY29kZSBvZiB0aGUgZnVuY3Rpb24gZm9yIHRoaXMgZXhh +bXBsZSBpcyBzaG93biBiZWxvdzoKCmxpYi9mdW5jdGlvbnMuZGFydAoKYGBgZGFydAppbXBvcnQg +J2RhcnQ6Y29udmVydCc7CmltcG9ydCAnZGFydDppbyc7CgppbXBvcnQgJ3BhY2thZ2U6ZnVuY3Rp +b25zX2ZyYW1ld29yay9mdW5jdGlvbnNfZnJhbWV3b3JrLmRhcnQnOwoKY29uc3QgX2VuY29kZXIg +PSBKc29uRW5jb2Rlci53aXRoSW5kZW50KCcgJyk7CgpAQ2xvdWRGdW5jdGlvbigpCnZvaWQgZnVu +Y3Rpb24oQ2xvdWRFdmVudCBldmVudCwgUmVxdWVzdENvbnRleHQgY29udGV4dCkgewogIGNvbnRl +eHQubG9nZ2VyLmluZm8oJ2V2ZW50IHN1YmplY3Q6ICR7ZXZlbnQuc3ViamVjdH0nKTsKICBzdGRl +cnIud3JpdGVsbihfZW5jb2Rlci5jb252ZXJ0KGV2ZW50KSk7Cn0KYGBgCgpBbGwgdGhlIGZ1bmN0 +aW9uIGRvZXMgaXMgbG9nIHRoZSBzb3VyY2UgYW5kIHN1YmplY3Qgb2YgdGhlIENsb3VkRXZlbnQg +dGhhdAp0cmlnZ2VyZWQgaXQsIGFuZCB0aGVuIHByaW50cyBvdXQgdGhlIGVudGlyZSBldmVudCBK +U09OIG9iamVjdCBmb3IgaW5mb3JtYXRpb25hbApwdXJwb3Nlcy4KCiMjIEdlbmVyYXRlIHByb2pl +Y3QgZmlsZXMKClRoZSBEYXJ0IGBidWlsZF9ydW5uZXJgIHRvb2wgZ2VuZXJhdGVzIGBiaW4vc2Vy +dmVyLmRhcnRgLCB0aGUgbWFpbiBlbnRyeSBwb2ludApmb3IgdGhlIGZ1bmN0aW9uIHNlcnZlciBh +cHAsIHdoaWNoIGludm9rZXMgdGhlIGZ1bmN0aW9uIGluIGBsaWIvZnVuY3Rpb25zLmRhcnRgLgoK +UnVuIHRoZSBgYnVpbGRfcnVubmVyYCB0b29sLCBhcyBzaG93biBoZXJlOgoKYGBgc2hlbGwKJCBk +YXJ0IHJ1biBidWlsZF9ydW5uZXIgYnVpbGQKW0lORk9dIEdlbmVyYXRpbmcgYnVpbGQgc2NyaXB0 +IGNvbXBsZXRlZCwgdG9vayAzMzdtcwpbSU5GT10gUmVhZGluZyBjYWNoZWQgYXNzZXQgZ3JhcGgg +Y29tcGxldGVkLCB0b29rIDQ4bXMKW0lORk9dIENoZWNraW5nIGZvciB1cGRhdGVzIHNpbmNlIGxh +c3QgYnVpbGQgY29tcGxldGVkLCB0b29rIDQyNm1zCltJTkZPXSBSdW5uaW5nIGJ1aWxkIGNvbXBs +ZXRlZCwgdG9vayAxM21zCltJTkZPXSBDYWNoaW5nIGZpbmFsaXplZCBkZXBlbmRlbmN5IGdyYXBo +IGNvbXBsZXRlZCwgdG9vayAyOW1zCltJTkZPXSBTdWNjZWVkZWQgYWZ0ZXIgNTFtcyB3aXRoIDAg +b3V0cHV0cyAoMCBhY3Rpb25zKQpgYGAKCiMjIFRlc3QgdGhlIGZ1bmN0aW9uCgpgYGBzaGVsbAok +IGRhcnQgdGVzdAowMDowMiArMTogQWxsIHRlc3RzIHBhc3NlZCEKYGBgCgojIyBSdW4gdGhlIGZ1 +bmN0aW9uCgpUaGUgZGVmYXVsdCBzaWduYXR1cmUgdHlwZSBmb3IgYSBmdW5jdGlvbiBpcyBmb3Ig +aGFuZGxpbmcgbm9ybWFsIEhUVFAgcmVxdWVzdHMuCldoZW4gcnVubmluZyBhIGZ1bmN0aW9uIGZv +ciBoYW5kbGluZyBhIGNsb3VkZXZlbnQsIHlvdSBtdXN0IGVpdGhlciBzZXQKdGhlIGBGVU5DVElP +Tl9TSUdOQVRVUkVfVFlQRWAgZW52aXJvbm1lbnQgdmFyaWFibGUgb3IgdGhlCmAtLXNpZ25hdHVy +ZS10eXBlYCBjb21tYW5kIGxpbmUgb3B0aW9uIHRvIGBjbG91ZGV2ZW50YCwgYXMgc2hvd24gYmVs +b3c6CgpgYGBzaGVsbAokIGRhcnQgcnVuIGJpbi9zZXJ2ZXIuZGFydCAtLXNpZ25hdHVyZS10eXBl +IGNsb3VkZXZlbnQKTGlzdGVuaW5nIG9uIDo4MDgwCmBgYAoKRnJvbSBhbm90aGVyIHRlcm1pbmFs +LCB0cmlnZ2VyIHRoZSBDbG91ZEV2ZW50IGJ5IHBvc3RpbmcgZXZlbnQgZGF0YToKCmBgYHNoZWxs +CiQgY3VybCAtLWRhdGEtYmluYXJ5IEBzYW1wbGUvZGF0YS5qc29uIC1IICdjb250ZW50LXR5cGU6 +IGFwcGxpY2F0aW9uL2pzb24nIC13ICcle2h0dHBfY29kZX1cbicgbG9jYWxob3N0OjgwODAKMjAw +CmBgYAoKVG9vbHMgbGlrZSBbY3VybF0gKGFuZCBbcG9zdG1hbl0pIGFyZSBnb29kIGZvciBzZW5k +aW5nIEhUVFAgcmVxdWVzdHMuIFRoZQpvcHRpb25zIHVzZWQgaW4gdGhpcyBleGFtcGxlIGFyZToK +Ci0gYC0tZGF0YS1iaW5hcnkgQHNhbXBsZS9kYXRhLmpzb25gIC0gc2V0IHRoZSByZXF1ZXN0IGJv +ZHkgdG8gYSBKU09OIGRvY3VtZW50CiAgcmVhZCBmcm9tIHRoZSBmaWxlIGBzYW1wbGUvZGF0YS5q +c29uYAotIGAtSCAiY29udGVudC10eXBlOiBhcHBsaWNhdGlvbi9qc29uImAgLSBzZXQgYW4gSFRU +UCBoZWFkZXIgdG8gaW5kaWNhdGUgdGhhdAogIHRoZSBib2R5IGlzIGEgSlNPTiBkb2N1bWVudAot +IGAtdyAnJXtodHRwX2NvZGV9XG4nYCAtIHByaW50IHRoZSBIVFRQIHN0YXR1cyBjb2RlIChleHBl +Y3QgMjAwIGZvciBzdWNjZXNzKQoKQWx0ZXJuYXRpdmVseSwgaW5zdGVhZCBvZiBydW5uaW5nIGBj +dXJsYCwgeW91IGNhbiBydW4gZWl0aGVyIG9mIHRoZSBmb2xsb3dpbmcKRGFydCBzY3JpcHRzIGV4 +YW1wbGVzIHVuZGVyIHRoZSBgZXhhbXBsZXMvcmF3X2Nsb3VkZXZlbnQvdG9vbGAgZGlyZWN0b3J5 +OgoKLSBgZGFydCBydW4gdG9vbC9iaW5hcnlfbW9kZV9yZXF1ZXN0LmRhcnRgCi0gYGRhcnQgcnVu +IHRvb2wvc3RydWN0dXJlZF9tb2RlX3JlcXVlc3QuZGFydGAKCkZvciBtb3JlIGRldGFpbHMgb24g +Z2V0dGluZyBzdGFydGVkIG9yIHRvIHNlZSBob3cgdG8gcnVuIHRoZSBmdW5jdGlvbiBsb2NhbGx5 +IG9uCkRvY2tlciBvciBkZXBsb3kgdG8gQ2xvdWQgUnVuLCBzZWUgdGhlc2UgcXVpY2sgc3RhcnQg +Z3VpZGVzOgoKLSBbUXVpY2tzdGFydDogRGFydF0KLSBbUXVpY2tzdGFydDogRG9ja2VyXQotIFtR +dWlja3N0YXJ0OiBDbG91ZCBSdW5dCgo8IS0tIHJlZmVyZW5jZSBsaW5rcyAtLT4KW2N1cmxdOiBo +dHRwczovL2N1cmwuc2UvZG9jcy9tYW51YWwuaHRtbApbUXVpY2tzdGFydDogRGFydF06IGh0dHBz +Oi8vZ2l0aHViLmNvbS9Hb29nbGVDbG91ZFBsYXRmb3JtL2Z1bmN0aW9ucy1mcmFtZXdvcmstZGFy +dC9ibG9iL21haW4vZG9jcy9xdWlja3N0YXJ0cy8wMS1xdWlja3N0YXJ0LWRhcnQubWQKW1F1aWNr +c3RhcnQ6IERvY2tlcl06IGh0dHBzOi8vZ2l0aHViLmNvbS9Hb29nbGVDbG91ZFBsYXRmb3JtL2Z1 +bmN0aW9ucy1mcmFtZXdvcmstZGFydC9ibG9iL21haW4vZG9jcy9xdWlja3N0YXJ0cy8wMi1xdWlj +a3N0YXJ0LWRvY2tlci5tZApbUXVpY2tzdGFydDogQ2xvdWQgUnVuXTogaHR0cHM6Ly9naXRodWIu +Y29tL0dvb2dsZUNsb3VkUGxhdGZvcm0vZnVuY3Rpb25zLWZyYW1ld29yay1kYXJ0L2Jsb2IvbWFp +bi9kb2NzL3F1aWNrc3RhcnRzLzAzLXF1aWNrc3RhcnQtY2xvdWRydW4ubWQKW3Bvc3RtYW5dOiBo dHRwczovL3d3dy5wb3N0bWFuLmNvbS9wcm9kdWN0L2FwaS1jbGllbnQvCg==''', 'analysis_options.yaml', 'text', ''' -IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q -ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v -cHViLmRldi9wYWNrYWdlcy9saW50cy4KaW5jbHVkZTogcGFja2FnZTpsaW50cy9yZWNvbW1lbmRl -ZC55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFuZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2Rh -cnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xpbnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFk -ZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgojICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90 -eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRlOgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmls +IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v +cHViLmRldi9wYWNrYWdlcy9saW50cy4KaW5jbHVkZTogcGFja2FnZTpsaW50cy9yZWNvbW1lbmRl +ZC55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFuZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2Rh +cnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xpbnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFk +ZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgojICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90 +eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRlOgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmls ZXMvKioK''', 'bin/server.dart', 'text', ''' -Ly8gR0VORVJBVEVEIENPREUgLSBETyBOT1QgTU9ESUZZIEJZIEhBTkQKLy8gQ29weXJpZ2h0IDIw -MjEgR29vZ2xlIExMQwovLwovLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZl -cnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBl -eGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgovLyBZb3UgbWF5IG9idGFpbiBh -IGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLy8KLy8gICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9s -aWNlbnNlcy9MSUNFTlNFLTIuMAovLwovLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBs -YXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi8vIGRpc3RyaWJ1dGVkIHVuZGVy -IHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi8vIFdJVEhP -VVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBv -ciBpbXBsaWVkLgovLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBn -b3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNl -LgoKaW1wb3J0ICdwYWNrYWdlOl9fcHJvamVjdE5hbWVfXy9mdW5jdGlvbnMuZGFydCcgYXMgZnVu -Y3Rpb25fbGlicmFyeTsKaW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvc2VydmUu -ZGFydCc7CgpGdXR1cmU8dm9pZD4gbWFpbihMaXN0PFN0cmluZz4gYXJncykgYXN5bmMgewogIGF3 -YWl0IHNlcnZlKGFyZ3MsIF9uYW1lVG9GdW5jdGlvblRhcmdldCk7Cn0KCkZ1bmN0aW9uVGFyZ2V0 -PyBfbmFtZVRvRnVuY3Rpb25UYXJnZXQoU3RyaW5nIG5hbWUpID0+IHN3aXRjaCAobmFtZSkgewog -ICAgICAnZnVuY3Rpb24nID0+IEZ1bmN0aW9uVGFyZ2V0LmNsb3VkRXZlbnRXaXRoQ29udGV4dCgK -ICAgICAgICAgIGZ1bmN0aW9uX2xpYnJhcnkuZnVuY3Rpb24sCiAgICAgICAgKSwKICAgICAgXyA9 +Ly8gR0VORVJBVEVEIENPREUgLSBETyBOT1QgTU9ESUZZIEJZIEhBTkQKLy8gQ29weXJpZ2h0IDIw +MjEgR29vZ2xlIExMQwovLwovLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZl +cnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBl +eGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgovLyBZb3UgbWF5IG9idGFpbiBh +IGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLy8KLy8gICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9s +aWNlbnNlcy9MSUNFTlNFLTIuMAovLwovLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBs +YXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi8vIGRpc3RyaWJ1dGVkIHVuZGVy +IHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi8vIFdJVEhP +VVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBv +ciBpbXBsaWVkLgovLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBn +b3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNl +LgoKaW1wb3J0ICdwYWNrYWdlOl9fcHJvamVjdE5hbWVfXy9mdW5jdGlvbnMuZGFydCcgYXMgZnVu +Y3Rpb25fbGlicmFyeTsKaW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvc2VydmUu +ZGFydCc7CgpGdXR1cmU8dm9pZD4gbWFpbihMaXN0PFN0cmluZz4gYXJncykgYXN5bmMgewogIGF3 +YWl0IHNlcnZlKGFyZ3MsIF9uYW1lVG9GdW5jdGlvblRhcmdldCk7Cn0KCkZ1bmN0aW9uVGFyZ2V0 +PyBfbmFtZVRvRnVuY3Rpb25UYXJnZXQoU3RyaW5nIG5hbWUpID0+IHN3aXRjaCAobmFtZSkgewog +ICAgICAnZnVuY3Rpb24nID0+IEZ1bmN0aW9uVGFyZ2V0LmNsb3VkRXZlbnRXaXRoQ29udGV4dCgK +ICAgICAgICAgIGZ1bmN0aW9uX2xpYnJhcnkuZnVuY3Rpb24sCiAgICAgICAgKSwKICAgICAgXyA9 PiBudWxsCiAgICB9Owo=''', 'lib/functions.dart', 'text', ''' -aW1wb3J0ICdkYXJ0OmNvbnZlcnQnOwppbXBvcnQgJ2RhcnQ6aW8nOwoKaW1wb3J0ICdwYWNrYWdl -OmZ1bmN0aW9uc19mcmFtZXdvcmsvZnVuY3Rpb25zX2ZyYW1ld29yay5kYXJ0JzsKCmNvbnN0IF9l -bmNvZGVyID0gSnNvbkVuY29kZXIoKTsKCkBDbG91ZEZ1bmN0aW9uKCkKdm9pZCBmdW5jdGlvbihD -bG91ZEV2ZW50IGV2ZW50LCBSZXF1ZXN0Q29udGV4dCBjb250ZXh0KSB7CiAgY29udGV4dC5sb2dn -ZXIKICAgICAgLmluZm8oJ1tDbG91ZEV2ZW50XSBzb3VyY2U6ICR7ZXZlbnQuc291cmNlfSwgc3Vi -amVjdDogJHtldmVudC5zdWJqZWN0fScpOwogIHN0ZGVyci53cml0ZWxuKAogICAgX2VuY29kZXIu -Y29udmVydCgKICAgICAgewogICAgICAgICdtZXNzYWdlJzogZXZlbnQsCiAgICAgICAgJ3NldmVy +aW1wb3J0ICdkYXJ0OmNvbnZlcnQnOwppbXBvcnQgJ2RhcnQ6aW8nOwoKaW1wb3J0ICdwYWNrYWdl +OmZ1bmN0aW9uc19mcmFtZXdvcmsvZnVuY3Rpb25zX2ZyYW1ld29yay5kYXJ0JzsKCmNvbnN0IF9l +bmNvZGVyID0gSnNvbkVuY29kZXIoKTsKCkBDbG91ZEZ1bmN0aW9uKCkKdm9pZCBmdW5jdGlvbihD +bG91ZEV2ZW50IGV2ZW50LCBSZXF1ZXN0Q29udGV4dCBjb250ZXh0KSB7CiAgY29udGV4dC5sb2dn +ZXIKICAgICAgLmluZm8oJ1tDbG91ZEV2ZW50XSBzb3VyY2U6ICR7ZXZlbnQuc291cmNlfSwgc3Vi +amVjdDogJHtldmVudC5zdWJqZWN0fScpOwogIHN0ZGVyci53cml0ZWxuKAogICAgX2VuY29kZXIu +Y29udmVydCgKICAgICAgewogICAgICAgICdtZXNzYWdlJzogZXZlbnQsCiAgICAgICAgJ3NldmVy aXR5JzogTG9nU2V2ZXJpdHkuaW5mbywKICAgICAgfSwKICAgICksCiAgKTsKfQo=''', 'pubspec.yaml', 'text', ''' -bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBGdW5jdGlvbnMgRnJh -bWV3b3JrIHByb2plY3QgZm9yIGhhbmRsaW5nIGEgY2xvdWRldmVudC4KIyB2ZXJzaW9uOiAwLjEu -MAojIGhvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQpwdWJsaXNoX3RvOiBub25lCgpl -bnZpcm9ubWVudDoKICBzZGs6IF4zLjAuMAoKZGVwZW5kZW5jaWVzOgogIGZ1bmN0aW9uc19mcmFt -ZXdvcms6IF4wLjQuMAogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBlbmRlbmNpZXM6CiAgYnVpbGRf -cnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1aWxkZXI6IF4wLjQuMAogIGh0 -dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAgZGFydF9mbHV0dGVyX3RlYW1fbGludHM6IF4yLjAuMAog +bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBGdW5jdGlvbnMgRnJh +bWV3b3JrIHByb2plY3QgZm9yIGhhbmRsaW5nIGEgY2xvdWRldmVudC4KIyB2ZXJzaW9uOiAwLjEu +MAojIGhvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQpwdWJsaXNoX3RvOiBub25lCgpl +bnZpcm9ubWVudDoKICBzZGs6IF4zLjAuMAoKZGVwZW5kZW5jaWVzOgogIGZ1bmN0aW9uc19mcmFt +ZXdvcms6IF4wLjQuMAogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBlbmRlbmNpZXM6CiAgYnVpbGRf +cnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1aWxkZXI6IF4wLjQuMAogIGh0 +dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAgZGFydF9mbHV0dGVyX3RlYW1fbGludHM6IF4yLjAuMAog IHRlc3Q6IF4xLjE1LjAKICB0ZXN0X3Byb2Nlc3M6IF4yLjAuMAo=''', 'sample/data.json', 'text', ''' -ewogICJzcGVjdmVyc2lvbiI6ICIxLjAiLAogICJ0eXBlIjogImdvb2dsZS5jbG91ZC5wdWJzdWIu -dG9waWMucHVibGlzaCIsCiAgInRpbWUiOiAiMjAyMC0wOS0wNVQwMzo1NjoyNC4wMDBaIiwKICAi -aWQiOiAiMTIzNC0xMjM0LTEyMzQiLAogICJzb3VyY2UiOiAidXJuOnV1aWQ6NmU4YmM0MzAtOWMz -YS0xMWQ5LTk2NjktMDgwMDIwMGM5YTY2IiwKICAic3ViamVjdCI6ICJTVFJVQ1RVUkVEX01PREVf -Q0xPVURFVkVOVF9TQU1QTEUiLAogICJkYXRhIjogewogICAgInN1YnNjcmlwdGlvbiI6ICJwcm9q -ZWN0cy9teS1wcm9qZWN0L3N1YnNjcmlwdGlvbnMvbXktc3Vic2NyaXB0aW9uIiwKICAgICJtZXNz -YWdlIjogewogICAgICAiQHR5cGUiOiAidHlwZS5nb29nbGVhcGlzLmNvbS9nb29nbGUucHVic3Vi -LnYxLlB1YnN1Yk1lc3NhZ2UiLAogICAgICAiYXR0cmlidXRlcyI6IHsKICAgICAgICAiYXR0cjEi -OiJhdHRyMS12YWx1ZSIKICAgICAgfSwKICAgICAgImRhdGEiOiAiZEdWemRDQnRaWE56WVdkbElE +ewogICJzcGVjdmVyc2lvbiI6ICIxLjAiLAogICJ0eXBlIjogImdvb2dsZS5jbG91ZC5wdWJzdWIu +dG9waWMucHVibGlzaCIsCiAgInRpbWUiOiAiMjAyMC0wOS0wNVQwMzo1NjoyNC4wMDBaIiwKICAi +aWQiOiAiMTIzNC0xMjM0LTEyMzQiLAogICJzb3VyY2UiOiAidXJuOnV1aWQ6NmU4YmM0MzAtOWMz +YS0xMWQ5LTk2NjktMDgwMDIwMGM5YTY2IiwKICAic3ViamVjdCI6ICJTVFJVQ1RVUkVEX01PREVf +Q0xPVURFVkVOVF9TQU1QTEUiLAogICJkYXRhIjogewogICAgInN1YnNjcmlwdGlvbiI6ICJwcm9q +ZWN0cy9teS1wcm9qZWN0L3N1YnNjcmlwdGlvbnMvbXktc3Vic2NyaXB0aW9uIiwKICAgICJtZXNz +YWdlIjogewogICAgICAiQHR5cGUiOiAidHlwZS5nb29nbGVhcGlzLmNvbS9nb29nbGUucHVic3Vi +LnYxLlB1YnN1Yk1lc3NhZ2UiLAogICAgICAiYXR0cmlidXRlcyI6IHsKICAgICAgICAiYXR0cjEi +OiJhdHRyMS12YWx1ZSIKICAgICAgfSwKICAgICAgImRhdGEiOiAiZEdWemRDQnRaWE56WVdkbElE TT0iCiAgICB9CiAgfQp9Cg==''', 'test/function_test.dart', 'text', ''' -QFRpbWVvdXQoRHVyYXRpb24oc2Vjb25kczogMykpCmltcG9ydCAnZGFydDpjb252ZXJ0JzsKCmlt -cG9ydCAncGFja2FnZTpodHRwL2h0dHAuZGFydCc7CmltcG9ydCAncGFja2FnZTp0ZXN0L3Rlc3Qu -ZGFydCc7CmltcG9ydCAncGFja2FnZTp0ZXN0X3Byb2Nlc3MvdGVzdF9wcm9jZXNzLmRhcnQnOwoK -aW1wb3J0ICdzcmMvdGVzdF91dGlscy5kYXJ0JzsKCnZvaWQgbWFpbigpIHsKICBncm91cCgnYmlu -YXJ5LW1vZGUgbWVzc2FnZScsICgpIHsKICAgIHRlc3QoJ3ZhbGlkIGlucHV0JywgKCkgYXN5bmMg -ewogICAgICBmaW5hbCBwcm9jID0gYXdhaXQgX2hvc3RDbG91ZEV2ZW50SGFuZGxlcigpOwoKICAg -ICAgY29uc3QgYm9keSA9IHInJycKewogInN1YnNjcmlwdGlvbiI6ICJwcm9qZWN0cy9teS1wcm9q -ZWN0L3N1YnNjcmlwdGlvbnMvbXktc3Vic2NyaXB0aW9uIiwKICJtZXNzYWdlIjogewogICAiQHR5 -cGUiOiAidHlwZS5nb29nbGVhcGlzLmNvbS9nb29nbGUucHVic3ViLnYxLlB1YnN1Yk1lc3NhZ2Ui -LAogICAiYXR0cmlidXRlcyI6IHsKICAgICAiYXR0cjEiOiJhdHRyMS12YWx1ZSIKICAgfSwKICAg -ImRhdGEiOiAiZEdWemRDQnRaWE56WVdkbElETT0iCiB9Cn0nJyc7CgogICAgICBmaW5hbCByZXNw -b25zZSA9IGF3YWl0IF9tYWtlUmVxdWVzdCgKICAgICAgICBib2R5LAogICAgICAgIHsKICAgICAg -ICAgICdDb250ZW50LVR5cGUnOiAnYXBwbGljYXRpb24vanNvbjsgY2hhcnNldD11dGYtOCcsCiAg -ICAgICAgICAnY2Utc3BlY3ZlcnNpb24nOiAnMS4wJywKICAgICAgICAgICdjZS10eXBlJzogJ2dv -b2dsZS5jbG91ZC5wdWJzdWIudG9waWMucHVibGlzaCcsCiAgICAgICAgICAnY2UtdGltZSc6ICcy -MDIwLTA5LTA1VDAzOjU2OjI0WicsCiAgICAgICAgICAnY2UtaWQnOiAnMTIzNC0xMjM0LTEyMzQn -LAogICAgICAgICAgJ2NlLXNvdXJjZSc6ICd1cm46dXVpZDo2ZThiYzQzMC05YzNhLTExZDktOTY2 -OS0wODAwMjAwYzlhNjYnLAogICAgICAgIH0sCiAgICAgICk7CiAgICAgIGV4cGVjdChyZXNwb25z -ZS5zdGF0dXNDb2RlLCAyMDApOwogICAgICBleHBlY3QocmVzcG9uc2UuYm9keSwgaXNFbXB0eSk7 -CgogICAgICBhd2FpdCBmaW5pc2hTZXJ2ZXJUZXN0KAogICAgICAgIHByb2MsCiAgICAgICAgcmVx -dWVzdE91dHB1dDogbWF0Y2hlcyhmaW5pc2hlZFBhdHRlcm4oJ1BPU1QnLCAyMDApKSwKICAgICAg -KTsKCiAgICAgIGZpbmFsIHN0ZGVyck91dHB1dCA9IGF3YWl0IHByb2Muc3RkZXJyU3RyZWFtKCku -am9pbignXG4nKTsKICAgICAgZmluYWwganNvbiA9IGpzb25EZWNvZGUoc3RkZXJyT3V0cHV0KSBh -cyBNYXA8U3RyaW5nLCBkeW5hbWljPjsKCiAgICAgIGV4cGVjdChqc29uLCB7CiAgICAgICAgJ21l -c3NhZ2UnOiB7CiAgICAgICAgICAnaWQnOiAnMTIzNC0xMjM0LTEyMzQnLAogICAgICAgICAgJ3Nw -ZWN2ZXJzaW9uJzogJzEuMCcsCiAgICAgICAgICAndHlwZSc6ICdnb29nbGUuY2xvdWQucHVic3Vi -LnRvcGljLnB1Ymxpc2gnLAogICAgICAgICAgJ2RhdGFjb250ZW50dHlwZSc6ICdhcHBsaWNhdGlv -bi9qc29uOyBjaGFyc2V0PXV0Zi04JywKICAgICAgICAgICd0aW1lJzogJzIwMjAtMDktMDVUMDM6 -NTY6MjQuMDAwWicsCiAgICAgICAgICAnc291cmNlJzogJ3Vybjp1dWlkOjZlOGJjNDMwLTljM2Et -MTFkOS05NjY5LTA4MDAyMDBjOWE2NicsCiAgICAgICAgICAnZGF0YSc6IGpzb25EZWNvZGUoYm9k -eSksCiAgICAgICAgfSwKICAgICAgICAnc2V2ZXJpdHknOiAnSU5GTycsCiAgICAgIH0pOwogICAg -fSk7CiAgfSk7CgogIGdyb3VwKCdzdHJ1Y3R1cmVkLW1vZGUgbWVzc2FnZScsICgpIHsKICAgIHRl -c3QoJ3ZhbGlkIHJlcXVlc3QnLCAoKSBhc3luYyB7CiAgICAgIGZpbmFsIHByb2MgPSBhd2FpdCBf -aG9zdENsb3VkRXZlbnRIYW5kbGVyKCk7CgogICAgICBjb25zdCBib2R5ID0gcicnJwp7CiAgInNw -ZWN2ZXJzaW9uIjogIjEuMCIsCiAgInR5cGUiOiAiZ29vZ2xlLmNsb3VkLnB1YnN1Yi50b3BpYy5w -dWJsaXNoIiwKICAidGltZSI6ICIyMDIwLTA5LTA1VDAzOjU2OjI0LjAwMFoiLAogICJpZCI6ICIx -MjM0LTEyMzQtMTIzNCIsCiAgInNvdXJjZSI6ICJ1cm46dXVpZDo2ZThiYzQzMC05YzNhLTExZDkt -OTY2OS0wODAwMjAwYzlhNjYiLAogICJkYXRhIjogewogICAgInN1YnNjcmlwdGlvbiI6ICJwcm9q -ZWN0cy9teS1wcm9qZWN0L3N1YnNjcmlwdGlvbnMvbXktc3Vic2NyaXB0aW9uIiwKICAgICJtZXNz -YWdlIjogewogICAgICAiQHR5cGUiOiAidHlwZS5nb29nbGVhcGlzLmNvbS9nb29nbGUucHVic3Vi -LnYxLlB1YnN1Yk1lc3NhZ2UiLAogICAgICAiYXR0cmlidXRlcyI6IHsKICAgICAgICAiYXR0cjEi -OiJhdHRyMS12YWx1ZSIKICAgICAgfSwKICAgICAgImRhdGEiOiAiZEdWemRDQnRaWE56WVdkbElE -TT0iCiAgICB9CiAgfQp9JycnOwogICAgICBmaW5hbCByZXNwb25zZSA9IGF3YWl0IF9tYWtlUmVx -dWVzdChib2R5LCB7CiAgICAgICAgJ0NvbnRlbnQtVHlwZSc6ICdhcHBsaWNhdGlvbi9qc29uOyBj -aGFyc2V0PXV0Zi04JywKICAgICAgfSk7CiAgICAgIGV4cGVjdChyZXNwb25zZS5zdGF0dXNDb2Rl -LCAyMDApOwogICAgICBleHBlY3QocmVzcG9uc2UuYm9keSwgaXNFbXB0eSk7CgogICAgICBhd2Fp -dCBmaW5pc2hTZXJ2ZXJUZXN0KAogICAgICAgIHByb2MsCiAgICAgICAgcmVxdWVzdE91dHB1dDog -bWF0Y2hlcyhmaW5pc2hlZFBhdHRlcm4oJ1BPU1QnLCAyMDApKSwKICAgICAgKTsKCiAgICAgIGZp -bmFsIHN0ZGVyck91dHB1dCA9IGF3YWl0IHByb2Muc3RkZXJyU3RyZWFtKCkuam9pbignXG4nKTsK -CiAgICAgIGZpbmFsIGpzb24gPSBqc29uRGVjb2RlKHN0ZGVyck91dHB1dCkgYXMgTWFwPFN0cmlu -ZywgZHluYW1pYz47CgogICAgICBleHBlY3QoCiAgICAgICAganNvbiwKICAgICAgICB7CiAgICAg -ICAgICAnbWVzc2FnZSc6IHsKICAgICAgICAgICAgLi4uanNvbkRlY29kZShib2R5KSBhcyBNYXA8 -U3RyaW5nLCBkeW5hbWljPiwKICAgICAgICAgICAgJ2RhdGFjb250ZW50dHlwZSc6ICdhcHBsaWNh -dGlvbi9qc29uOyBjaGFyc2V0PXV0Zi04JywKICAgICAgICAgIH0sCiAgICAgICAgICAnc2V2ZXJp -dHknOiAnSU5GTycsCiAgICAgICAgfSwKICAgICAgKTsKICAgIH0pOwogIH0pOwp9CgpGdXR1cmU8 -UmVzcG9uc2U+IF9tYWtlUmVxdWVzdChTdHJpbmcgYm9keSwgTWFwPFN0cmluZywgU3RyaW5nPiBo -ZWFkZXJzKSBhc3luYyB7CiAgZmluYWwgcmVxdWVzdFVybCA9IFVyaS5wYXJzZSgnaHR0cDovL2xv -Y2FsaG9zdDokYXV0b1BvcnQvJyk7CgogIGZpbmFsIHJlc3BvbnNlID0gYXdhaXQgcG9zdCgKICAg -IHJlcXVlc3RVcmwsCiAgICBib2R5OiBib2R5LAogICAgaGVhZGVyczogaGVhZGVycywKICApOwog -IHJldHVybiByZXNwb25zZTsKfQoKRnV0dXJlPFRlc3RQcm9jZXNzPiBfaG9zdENsb3VkRXZlbnRI -YW5kbGVyKCkgYXN5bmMgewogIGZpbmFsIHByb2MgPSBhd2FpdCBzdGFydFNlcnZlclRlc3QoCiAg -ICBhcmd1bWVudHM6IFsKICAgICAgJy0tc2lnbmF0dXJlLXR5cGUnLAogICAgICAnY2xvdWRldmVu -dCcsCiAgICBdLAogICAgZXhwZWN0ZWRMaXN0ZW5pbmdQb3J0OiAwLAogICk7CiAgcmV0dXJuIHBy +QFRpbWVvdXQoRHVyYXRpb24oc2Vjb25kczogMykpCmltcG9ydCAnZGFydDpjb252ZXJ0JzsKCmlt +cG9ydCAncGFja2FnZTpodHRwL2h0dHAuZGFydCc7CmltcG9ydCAncGFja2FnZTp0ZXN0L3Rlc3Qu +ZGFydCc7CmltcG9ydCAncGFja2FnZTp0ZXN0X3Byb2Nlc3MvdGVzdF9wcm9jZXNzLmRhcnQnOwoK +aW1wb3J0ICdzcmMvdGVzdF91dGlscy5kYXJ0JzsKCnZvaWQgbWFpbigpIHsKICBncm91cCgnYmlu +YXJ5LW1vZGUgbWVzc2FnZScsICgpIHsKICAgIHRlc3QoJ3ZhbGlkIGlucHV0JywgKCkgYXN5bmMg +ewogICAgICBmaW5hbCBwcm9jID0gYXdhaXQgX2hvc3RDbG91ZEV2ZW50SGFuZGxlcigpOwoKICAg +ICAgY29uc3QgYm9keSA9IHInJycKewogInN1YnNjcmlwdGlvbiI6ICJwcm9qZWN0cy9teS1wcm9q +ZWN0L3N1YnNjcmlwdGlvbnMvbXktc3Vic2NyaXB0aW9uIiwKICJtZXNzYWdlIjogewogICAiQHR5 +cGUiOiAidHlwZS5nb29nbGVhcGlzLmNvbS9nb29nbGUucHVic3ViLnYxLlB1YnN1Yk1lc3NhZ2Ui +LAogICAiYXR0cmlidXRlcyI6IHsKICAgICAiYXR0cjEiOiJhdHRyMS12YWx1ZSIKICAgfSwKICAg +ImRhdGEiOiAiZEdWemRDQnRaWE56WVdkbElETT0iCiB9Cn0nJyc7CgogICAgICBmaW5hbCByZXNw +b25zZSA9IGF3YWl0IF9tYWtlUmVxdWVzdCgKICAgICAgICBib2R5LAogICAgICAgIHsKICAgICAg +ICAgICdDb250ZW50LVR5cGUnOiAnYXBwbGljYXRpb24vanNvbjsgY2hhcnNldD11dGYtOCcsCiAg +ICAgICAgICAnY2Utc3BlY3ZlcnNpb24nOiAnMS4wJywKICAgICAgICAgICdjZS10eXBlJzogJ2dv +b2dsZS5jbG91ZC5wdWJzdWIudG9waWMucHVibGlzaCcsCiAgICAgICAgICAnY2UtdGltZSc6ICcy +MDIwLTA5LTA1VDAzOjU2OjI0WicsCiAgICAgICAgICAnY2UtaWQnOiAnMTIzNC0xMjM0LTEyMzQn +LAogICAgICAgICAgJ2NlLXNvdXJjZSc6ICd1cm46dXVpZDo2ZThiYzQzMC05YzNhLTExZDktOTY2 +OS0wODAwMjAwYzlhNjYnLAogICAgICAgIH0sCiAgICAgICk7CiAgICAgIGV4cGVjdChyZXNwb25z +ZS5zdGF0dXNDb2RlLCAyMDApOwogICAgICBleHBlY3QocmVzcG9uc2UuYm9keSwgaXNFbXB0eSk7 +CgogICAgICBhd2FpdCBmaW5pc2hTZXJ2ZXJUZXN0KAogICAgICAgIHByb2MsCiAgICAgICAgcmVx +dWVzdE91dHB1dDogbWF0Y2hlcyhmaW5pc2hlZFBhdHRlcm4oJ1BPU1QnLCAyMDApKSwKICAgICAg +KTsKCiAgICAgIGZpbmFsIHN0ZGVyck91dHB1dCA9IGF3YWl0IHByb2Muc3RkZXJyU3RyZWFtKCku +am9pbignXG4nKTsKICAgICAgZmluYWwganNvbiA9IGpzb25EZWNvZGUoc3RkZXJyT3V0cHV0KSBh +cyBNYXA8U3RyaW5nLCBkeW5hbWljPjsKCiAgICAgIGV4cGVjdChqc29uLCB7CiAgICAgICAgJ21l +c3NhZ2UnOiB7CiAgICAgICAgICAnaWQnOiAnMTIzNC0xMjM0LTEyMzQnLAogICAgICAgICAgJ3Nw +ZWN2ZXJzaW9uJzogJzEuMCcsCiAgICAgICAgICAndHlwZSc6ICdnb29nbGUuY2xvdWQucHVic3Vi +LnRvcGljLnB1Ymxpc2gnLAogICAgICAgICAgJ2RhdGFjb250ZW50dHlwZSc6ICdhcHBsaWNhdGlv +bi9qc29uOyBjaGFyc2V0PXV0Zi04JywKICAgICAgICAgICd0aW1lJzogJzIwMjAtMDktMDVUMDM6 +NTY6MjQuMDAwWicsCiAgICAgICAgICAnc291cmNlJzogJ3Vybjp1dWlkOjZlOGJjNDMwLTljM2Et +MTFkOS05NjY5LTA4MDAyMDBjOWE2NicsCiAgICAgICAgICAnZGF0YSc6IGpzb25EZWNvZGUoYm9k +eSksCiAgICAgICAgfSwKICAgICAgICAnc2V2ZXJpdHknOiAnSU5GTycsCiAgICAgIH0pOwogICAg +fSk7CiAgfSk7CgogIGdyb3VwKCdzdHJ1Y3R1cmVkLW1vZGUgbWVzc2FnZScsICgpIHsKICAgIHRl +c3QoJ3ZhbGlkIHJlcXVlc3QnLCAoKSBhc3luYyB7CiAgICAgIGZpbmFsIHByb2MgPSBhd2FpdCBf +aG9zdENsb3VkRXZlbnRIYW5kbGVyKCk7CgogICAgICBjb25zdCBib2R5ID0gcicnJwp7CiAgInNw +ZWN2ZXJzaW9uIjogIjEuMCIsCiAgInR5cGUiOiAiZ29vZ2xlLmNsb3VkLnB1YnN1Yi50b3BpYy5w +dWJsaXNoIiwKICAidGltZSI6ICIyMDIwLTA5LTA1VDAzOjU2OjI0LjAwMFoiLAogICJpZCI6ICIx +MjM0LTEyMzQtMTIzNCIsCiAgInNvdXJjZSI6ICJ1cm46dXVpZDo2ZThiYzQzMC05YzNhLTExZDkt +OTY2OS0wODAwMjAwYzlhNjYiLAogICJkYXRhIjogewogICAgInN1YnNjcmlwdGlvbiI6ICJwcm9q +ZWN0cy9teS1wcm9qZWN0L3N1YnNjcmlwdGlvbnMvbXktc3Vic2NyaXB0aW9uIiwKICAgICJtZXNz +YWdlIjogewogICAgICAiQHR5cGUiOiAidHlwZS5nb29nbGVhcGlzLmNvbS9nb29nbGUucHVic3Vi +LnYxLlB1YnN1Yk1lc3NhZ2UiLAogICAgICAiYXR0cmlidXRlcyI6IHsKICAgICAgICAiYXR0cjEi +OiJhdHRyMS12YWx1ZSIKICAgICAgfSwKICAgICAgImRhdGEiOiAiZEdWemRDQnRaWE56WVdkbElE +TT0iCiAgICB9CiAgfQp9JycnOwogICAgICBmaW5hbCByZXNwb25zZSA9IGF3YWl0IF9tYWtlUmVx +dWVzdChib2R5LCB7CiAgICAgICAgJ0NvbnRlbnQtVHlwZSc6ICdhcHBsaWNhdGlvbi9qc29uOyBj +aGFyc2V0PXV0Zi04JywKICAgICAgfSk7CiAgICAgIGV4cGVjdChyZXNwb25zZS5zdGF0dXNDb2Rl +LCAyMDApOwogICAgICBleHBlY3QocmVzcG9uc2UuYm9keSwgaXNFbXB0eSk7CgogICAgICBhd2Fp +dCBmaW5pc2hTZXJ2ZXJUZXN0KAogICAgICAgIHByb2MsCiAgICAgICAgcmVxdWVzdE91dHB1dDog +bWF0Y2hlcyhmaW5pc2hlZFBhdHRlcm4oJ1BPU1QnLCAyMDApKSwKICAgICAgKTsKCiAgICAgIGZp +bmFsIHN0ZGVyck91dHB1dCA9IGF3YWl0IHByb2Muc3RkZXJyU3RyZWFtKCkuam9pbignXG4nKTsK +CiAgICAgIGZpbmFsIGpzb24gPSBqc29uRGVjb2RlKHN0ZGVyck91dHB1dCkgYXMgTWFwPFN0cmlu +ZywgZHluYW1pYz47CgogICAgICBleHBlY3QoCiAgICAgICAganNvbiwKICAgICAgICB7CiAgICAg +ICAgICAnbWVzc2FnZSc6IHsKICAgICAgICAgICAgLi4uanNvbkRlY29kZShib2R5KSBhcyBNYXA8 +U3RyaW5nLCBkeW5hbWljPiwKICAgICAgICAgICAgJ2RhdGFjb250ZW50dHlwZSc6ICdhcHBsaWNh +dGlvbi9qc29uOyBjaGFyc2V0PXV0Zi04JywKICAgICAgICAgIH0sCiAgICAgICAgICAnc2V2ZXJp +dHknOiAnSU5GTycsCiAgICAgICAgfSwKICAgICAgKTsKICAgIH0pOwogIH0pOwp9CgpGdXR1cmU8 +UmVzcG9uc2U+IF9tYWtlUmVxdWVzdChTdHJpbmcgYm9keSwgTWFwPFN0cmluZywgU3RyaW5nPiBo +ZWFkZXJzKSBhc3luYyB7CiAgZmluYWwgcmVxdWVzdFVybCA9IFVyaS5wYXJzZSgnaHR0cDovL2xv +Y2FsaG9zdDokYXV0b1BvcnQvJyk7CgogIGZpbmFsIHJlc3BvbnNlID0gYXdhaXQgcG9zdCgKICAg +IHJlcXVlc3RVcmwsCiAgICBib2R5OiBib2R5LAogICAgaGVhZGVyczogaGVhZGVycywKICApOwog +IHJldHVybiByZXNwb25zZTsKfQoKRnV0dXJlPFRlc3RQcm9jZXNzPiBfaG9zdENsb3VkRXZlbnRI +YW5kbGVyKCkgYXN5bmMgewogIGZpbmFsIHByb2MgPSBhd2FpdCBzdGFydFNlcnZlclRlc3QoCiAg +ICBhcmd1bWVudHM6IFsKICAgICAgJy0tc2lnbmF0dXJlLXR5cGUnLAogICAgICAnY2xvdWRldmVu +dCcsCiAgICBdLAogICAgZXhwZWN0ZWRMaXN0ZW5pbmdQb3J0OiAwLAogICk7CiAgcmV0dXJuIHBy b2M7Cn0K''', 'test/src/test_utils.dart', 'text', ''' -aW1wb3J0ICdkYXJ0OmlvJzsKCmltcG9ydCAncGFja2FnZTp0ZXN0L3Rlc3QuZGFydCc7CmltcG9y -dCAncGFja2FnZTp0ZXN0X3Byb2Nlc3MvdGVzdF9wcm9jZXNzLmRhcnQnOwoKY29uc3QgZGVmYXVs -dFBvcnQgPSA4MDgwOwoKZmluYWwgX2xpc3RlbmluZ1BhdHRlcm4gPSBSZWdFeHAocidMaXN0ZW5p -bmcgb24gOihcZCspJyk7CgpsYXRlIGludCBfYXV0b1BvcnQ7CgppbnQgZ2V0IGF1dG9Qb3J0ID0+ -IF9hdXRvUG9ydDsKCkZ1dHVyZTxUZXN0UHJvY2Vzcz4gc3RhcnRTZXJ2ZXJUZXN0KHsKICBib29s -IHNob3VsZEZhaWwgPSBmYWxzZSwKICBpbnQgZXhwZWN0ZWRMaXN0ZW5pbmdQb3J0ID0gZGVmYXVs -dFBvcnQsCiAgTWFwPFN0cmluZywgU3RyaW5nPj8gZW52LAogIEl0ZXJhYmxlPFN0cmluZz4gYXJn -dW1lbnRzID0gY29uc3QgPFN0cmluZz5bXSwKfSkgYXN5bmMgewogIGlmIChleHBlY3RlZExpc3Rl -bmluZ1BvcnQgPT0gMCkgewogICAgZXhwZWN0KGFyZ3VtZW50cywgaXNOb3QoY29udGFpbnMoJy0t -cG9ydCcpKSk7CiAgICBpZiAoZW52ICE9IG51bGwpIHsKICAgICAgZXhwZWN0KGVudiwgaXNOb3Qo -Y29udGFpbnMoJ1BPUlQnKSkpOwogICAgfQogIH0KICBmaW5hbCBhcmdzID0gWwogICAgJ2Jpbi9z -ZXJ2ZXIuZGFydCcsCiAgICAuLi5hcmd1bWVudHMsCiAgICBpZiAoZXhwZWN0ZWRMaXN0ZW5pbmdQ -b3J0ID09IDApIC4uLlsnLS1wb3J0JywgJzAnXSwKICBdOwogIGZpbmFsIHByb2MgPSBhd2FpdCBU -ZXN0UHJvY2Vzcy5zdGFydCgnZGFydCcsIGFyZ3MsIGVudmlyb25tZW50OiBlbnYpOwoKICBpZiAo -IXNob3VsZEZhaWwpIHsKICAgIGZpbmFsIG91dHB1dCA9IGF3YWl0IHByb2Muc3Rkb3V0Lm5leHQ7 -CiAgICBmaW5hbCBtYXRjaCA9IF9saXN0ZW5pbmdQYXR0ZXJuLmZpcnN0TWF0Y2gob3V0cHV0KSE7 -CiAgICBfYXV0b1BvcnQgPSBpbnQucGFyc2UobWF0Y2hbMV0hKTsKICAgIGlmIChleHBlY3RlZExp -c3RlbmluZ1BvcnQgPT0gMCkgewogICAgICBleHBlY3QoX2F1dG9Qb3J0LCBncmVhdGVyVGhhbigw -KSk7CiAgICB9IGVsc2UgewogICAgICBleHBlY3QoX2F1dG9Qb3J0LCBleHBlY3RlZExpc3Rlbmlu -Z1BvcnQpOwogICAgfQogIH0KCiAgcmV0dXJuIHByb2M7Cn0KCkZ1dHVyZTx2b2lkPiBmaW5pc2hT -ZXJ2ZXJUZXN0KAogIFRlc3RQcm9jZXNzIHByb2MsIHsKICBQcm9jZXNzU2lnbmFsIHNpZ25hbCA9 -IFByb2Nlc3NTaWduYWwuc2lndGVybSwKICBPYmplY3Q/IHJlcXVlc3RPdXRwdXQsCn0pIGFzeW5j -IHsKICByZXF1ZXN0T3V0cHV0ID8/PSBmaW5pc2hlZFBhdHRlcm4oJ0dFVCcsIDIwMCk7CiAgYXdh -aXQgZXhwZWN0TGF0ZXIoCiAgICBwcm9jLnN0ZG91dCwKICAgIHJlcXVlc3RPdXRwdXQgaXMgU3Ry -ZWFtTWF0Y2hlcgogICAgICAgID8gcmVxdWVzdE91dHB1dAogICAgICAgIDogZW1pdHNUaHJvdWdo -KHJlcXVlc3RPdXRwdXQpLAogICk7CiAgcHJvYy5zaWduYWwoc2lnbmFsKTsKICBhd2FpdCBwcm9j -LnNob3VsZEV4aXQoMCk7CiAgYXdhaXQgZXhwZWN0TGF0ZXIoCiAgICBwcm9jLnN0ZG91dCwKICAg -IGVtaXRzVGhyb3VnaCgnUmVjZWl2ZWQgc2lnbmFsICRzaWduYWwgLSBjbG9zaW5nJyksCiAgKTsK -fQoKUmVnRXhwIGZpbmlzaGVkUGF0dGVybihTdHJpbmcgbWV0aG9kLCBpbnQgc3RhdHVzQ29kZSkg +aW1wb3J0ICdkYXJ0OmlvJzsKCmltcG9ydCAncGFja2FnZTp0ZXN0L3Rlc3QuZGFydCc7CmltcG9y +dCAncGFja2FnZTp0ZXN0X3Byb2Nlc3MvdGVzdF9wcm9jZXNzLmRhcnQnOwoKY29uc3QgZGVmYXVs +dFBvcnQgPSA4MDgwOwoKZmluYWwgX2xpc3RlbmluZ1BhdHRlcm4gPSBSZWdFeHAocidMaXN0ZW5p +bmcgb24gOihcZCspJyk7CgpsYXRlIGludCBfYXV0b1BvcnQ7CgppbnQgZ2V0IGF1dG9Qb3J0ID0+ +IF9hdXRvUG9ydDsKCkZ1dHVyZTxUZXN0UHJvY2Vzcz4gc3RhcnRTZXJ2ZXJUZXN0KHsKICBib29s +IHNob3VsZEZhaWwgPSBmYWxzZSwKICBpbnQgZXhwZWN0ZWRMaXN0ZW5pbmdQb3J0ID0gZGVmYXVs +dFBvcnQsCiAgTWFwPFN0cmluZywgU3RyaW5nPj8gZW52LAogIEl0ZXJhYmxlPFN0cmluZz4gYXJn +dW1lbnRzID0gY29uc3QgPFN0cmluZz5bXSwKfSkgYXN5bmMgewogIGlmIChleHBlY3RlZExpc3Rl +bmluZ1BvcnQgPT0gMCkgewogICAgZXhwZWN0KGFyZ3VtZW50cywgaXNOb3QoY29udGFpbnMoJy0t +cG9ydCcpKSk7CiAgICBpZiAoZW52ICE9IG51bGwpIHsKICAgICAgZXhwZWN0KGVudiwgaXNOb3Qo +Y29udGFpbnMoJ1BPUlQnKSkpOwogICAgfQogIH0KICBmaW5hbCBhcmdzID0gWwogICAgJ2Jpbi9z +ZXJ2ZXIuZGFydCcsCiAgICAuLi5hcmd1bWVudHMsCiAgICBpZiAoZXhwZWN0ZWRMaXN0ZW5pbmdQ +b3J0ID09IDApIC4uLlsnLS1wb3J0JywgJzAnXSwKICBdOwogIGZpbmFsIHByb2MgPSBhd2FpdCBU +ZXN0UHJvY2Vzcy5zdGFydCgnZGFydCcsIGFyZ3MsIGVudmlyb25tZW50OiBlbnYpOwoKICBpZiAo +IXNob3VsZEZhaWwpIHsKICAgIGZpbmFsIG91dHB1dCA9IGF3YWl0IHByb2Muc3Rkb3V0Lm5leHQ7 +CiAgICBmaW5hbCBtYXRjaCA9IF9saXN0ZW5pbmdQYXR0ZXJuLmZpcnN0TWF0Y2gob3V0cHV0KSE7 +CiAgICBfYXV0b1BvcnQgPSBpbnQucGFyc2UobWF0Y2hbMV0hKTsKICAgIGlmIChleHBlY3RlZExp +c3RlbmluZ1BvcnQgPT0gMCkgewogICAgICBleHBlY3QoX2F1dG9Qb3J0LCBncmVhdGVyVGhhbigw +KSk7CiAgICB9IGVsc2UgewogICAgICBleHBlY3QoX2F1dG9Qb3J0LCBleHBlY3RlZExpc3Rlbmlu +Z1BvcnQpOwogICAgfQogIH0KCiAgcmV0dXJuIHByb2M7Cn0KCkZ1dHVyZTx2b2lkPiBmaW5pc2hT +ZXJ2ZXJUZXN0KAogIFRlc3RQcm9jZXNzIHByb2MsIHsKICBQcm9jZXNzU2lnbmFsIHNpZ25hbCA9 +IFByb2Nlc3NTaWduYWwuc2lndGVybSwKICBPYmplY3Q/IHJlcXVlc3RPdXRwdXQsCn0pIGFzeW5j +IHsKICByZXF1ZXN0T3V0cHV0ID8/PSBmaW5pc2hlZFBhdHRlcm4oJ0dFVCcsIDIwMCk7CiAgYXdh +aXQgZXhwZWN0TGF0ZXIoCiAgICBwcm9jLnN0ZG91dCwKICAgIHJlcXVlc3RPdXRwdXQgaXMgU3Ry +ZWFtTWF0Y2hlcgogICAgICAgID8gcmVxdWVzdE91dHB1dAogICAgICAgIDogZW1pdHNUaHJvdWdo +KHJlcXVlc3RPdXRwdXQpLAogICk7CiAgcHJvYy5zaWduYWwoc2lnbmFsKTsKICBhd2FpdCBwcm9j +LnNob3VsZEV4aXQoMCk7CiAgYXdhaXQgZXhwZWN0TGF0ZXIoCiAgICBwcm9jLnN0ZG91dCwKICAg +IGVtaXRzVGhyb3VnaCgnUmVjZWl2ZWQgc2lnbmFsICRzaWduYWwgLSBjbG9zaW5nJyksCiAgKTsK +fQoKUmVnRXhwIGZpbmlzaGVkUGF0dGVybihTdHJpbmcgbWV0aG9kLCBpbnQgc3RhdHVzQ29kZSkg PT4KICAgIFJlZ0V4cCgnJG1ldGhvZC4rWyR7c3RhdHVzQ29kZS50b1N0cmluZygpfV0nKTsK''', 'tool/binary_mode_request.dart', 'text', ''' -aW1wb3J0ICdkYXJ0OmFzeW5jJzsKCmltcG9ydCAncGFja2FnZTpodHRwL2h0dHAuZGFydCc7CgpG -dXR1cmVPcjx2b2lkPiBtYWluKCkgYXN5bmMgewogIGNvbnN0IHJlcXVlc3RVcmwgPSAnaHR0cDov -L2xvY2FsaG9zdDo4MDgwJzsKCiAgY29uc3QgaGVhZGVycyA9IHsKICAgICdjb250ZW50LXR5cGUn -OiAnYXBwbGljYXRpb24vanNvbicsCiAgICAnY2Utc3BlY3ZlcnNpb24nOiAnMS4wJywKICAgICdj -ZS10eXBlJzogJ2dvb2dsZS5jbG91ZC5wdWJzdWIudG9waWMucHVibGlzaCcsCiAgICAnY2UtdGlt -ZSc6ICcyMDIwLTA5LTA1VDAzOjU2OjI0WicsCiAgICAnY2UtaWQnOiAnMTIzNC0xMjM0LTEyMzQn -LAogICAgJ2NlLXNvdXJjZSc6ICd1cm46dXVpZDo2ZThiYzQzMC05YzNhLTExZDktOTY2OS0wODAw -MjAwYzlhNjYnLAogICAgJ2NlLXN1YmplY3QnOiAnQklOQVJZX01PREVfQ0xPVURFVkVOVF9TQU1Q -TEUnLAogIH07CgogIGNvbnN0IGJvZHkgPSByJycnCnsKICJzdWJzY3JpcHRpb24iOiAicHJvamVj -dHMvbXktcHJvamVjdC9zdWJzY3JpcHRpb25zL215LXN1YnNjcmlwdGlvbiIsCiAibWVzc2FnZSI6 -IHsKICAgIkB0eXBlIjogInR5cGUuZ29vZ2xlYXBpcy5jb20vZ29vZ2xlLnB1YnN1Yi52MS5QdWJz -dWJNZXNzYWdlIiwKICAgImF0dHJpYnV0ZXMiOiB7CiAgICAgImF0dHIxIjoiYXR0cjEtdmFsdWUi -CiAgIH0sCiAgICJkYXRhIjogImRHVnpkQ0J0WlhOellXZGxJRE09IgogfQp9JycnOwoKICBmaW5h -bCByZXNwb25zZSA9CiAgICAgIGF3YWl0IHBvc3QoVXJpLnBhcnNlKHJlcXVlc3RVcmwpLCBoZWFk -ZXJzOiBoZWFkZXJzLCBib2R5OiBib2R5KTsKICBwcmludCgncmVzcG9uc2Uuc3RhdHVzQ29kZTog +aW1wb3J0ICdkYXJ0OmFzeW5jJzsKCmltcG9ydCAncGFja2FnZTpodHRwL2h0dHAuZGFydCc7CgpG +dXR1cmVPcjx2b2lkPiBtYWluKCkgYXN5bmMgewogIGNvbnN0IHJlcXVlc3RVcmwgPSAnaHR0cDov +L2xvY2FsaG9zdDo4MDgwJzsKCiAgY29uc3QgaGVhZGVycyA9IHsKICAgICdjb250ZW50LXR5cGUn +OiAnYXBwbGljYXRpb24vanNvbicsCiAgICAnY2Utc3BlY3ZlcnNpb24nOiAnMS4wJywKICAgICdj +ZS10eXBlJzogJ2dvb2dsZS5jbG91ZC5wdWJzdWIudG9waWMucHVibGlzaCcsCiAgICAnY2UtdGlt +ZSc6ICcyMDIwLTA5LTA1VDAzOjU2OjI0WicsCiAgICAnY2UtaWQnOiAnMTIzNC0xMjM0LTEyMzQn +LAogICAgJ2NlLXNvdXJjZSc6ICd1cm46dXVpZDo2ZThiYzQzMC05YzNhLTExZDktOTY2OS0wODAw +MjAwYzlhNjYnLAogICAgJ2NlLXN1YmplY3QnOiAnQklOQVJZX01PREVfQ0xPVURFVkVOVF9TQU1Q +TEUnLAogIH07CgogIGNvbnN0IGJvZHkgPSByJycnCnsKICJzdWJzY3JpcHRpb24iOiAicHJvamVj +dHMvbXktcHJvamVjdC9zdWJzY3JpcHRpb25zL215LXN1YnNjcmlwdGlvbiIsCiAibWVzc2FnZSI6 +IHsKICAgIkB0eXBlIjogInR5cGUuZ29vZ2xlYXBpcy5jb20vZ29vZ2xlLnB1YnN1Yi52MS5QdWJz +dWJNZXNzYWdlIiwKICAgImF0dHJpYnV0ZXMiOiB7CiAgICAgImF0dHIxIjoiYXR0cjEtdmFsdWUi +CiAgIH0sCiAgICJkYXRhIjogImRHVnpkQ0J0WlhOellXZGxJRE09IgogfQp9JycnOwoKICBmaW5h +bCByZXNwb25zZSA9CiAgICAgIGF3YWl0IHBvc3QoVXJpLnBhcnNlKHJlcXVlc3RVcmwpLCBoZWFk +ZXJzOiBoZWFkZXJzLCBib2R5OiBib2R5KTsKICBwcmludCgncmVzcG9uc2Uuc3RhdHVzQ29kZTog JHtyZXNwb25zZS5zdGF0dXNDb2RlfScpOwp9Cg==''', 'tool/structured_mode_request.dart', 'text', ''' -aW1wb3J0ICdkYXJ0OmFzeW5jJzsKCmltcG9ydCAncGFja2FnZTpodHRwL2h0dHAuZGFydCc7CgpG -dXR1cmVPcjx2b2lkPiBtYWluKCkgYXN5bmMgewogIGNvbnN0IHJlcXVlc3RVcmwgPSAnaHR0cDov -L2xvY2FsaG9zdDo4MDgwJzsKCiAgY29uc3QgaGVhZGVycyA9IHsKICAgICdjb250ZW50LXR5cGUn -OiAnYXBwbGljYXRpb24vanNvbicsCiAgfTsKCiAgY29uc3QgYm9keSA9IHInJycKewogICJzcGVj -dmVyc2lvbiI6ICIxLjAiLAogICJ0eXBlIjogImdvb2dsZS5jbG91ZC5wdWJzdWIudG9waWMucHVi -bGlzaCIsCiAgInRpbWUiOiAiMjAyMC0wOS0wNVQwMzo1NjoyNC4wMDBaIiwKICAiaWQiOiAiMTIz -NC0xMjM0LTEyMzQiLAogICJzb3VyY2UiOiAidXJuOnV1aWQ6NmU4YmM0MzAtOWMzYS0xMWQ5LTk2 -NjktMDgwMDIwMGM5YTY2IiwKICAic3ViamVjdCI6ICJTVFJVQ1RVUkVEX01PREVfQ0xPVURFVkVO -VF9TQU1QTEUiLAogICJkYXRhIjogewogICAgInN1YnNjcmlwdGlvbiI6ICJwcm9qZWN0cy9teS1w -cm9qZWN0L3N1YnNjcmlwdGlvbnMvbXktc3Vic2NyaXB0aW9uIiwKICAgICJtZXNzYWdlIjogewog -ICAgICAiQHR5cGUiOiAidHlwZS5nb29nbGVhcGlzLmNvbS9nb29nbGUucHVic3ViLnYxLlB1YnN1 -Yk1lc3NhZ2UiLAogICAgICAiYXR0cmlidXRlcyI6IHsKICAgICAgICAiYXR0cjEiOiJhdHRyMS12 -YWx1ZSIKICAgICAgfSwKICAgICAgImRhdGEiOiAiZEdWemRDQnRaWE56WVdkbElETT0iCiAgICB9 -CiAgfQp9JycnOwoKICBmaW5hbCByZXNwb25zZSA9CiAgICAgIGF3YWl0IHBvc3QoVXJpLnBhcnNl -KHJlcXVlc3RVcmwpLCBoZWFkZXJzOiBoZWFkZXJzLCBib2R5OiBib2R5KTsKICBwcmludCgncmVz +aW1wb3J0ICdkYXJ0OmFzeW5jJzsKCmltcG9ydCAncGFja2FnZTpodHRwL2h0dHAuZGFydCc7CgpG +dXR1cmVPcjx2b2lkPiBtYWluKCkgYXN5bmMgewogIGNvbnN0IHJlcXVlc3RVcmwgPSAnaHR0cDov +L2xvY2FsaG9zdDo4MDgwJzsKCiAgY29uc3QgaGVhZGVycyA9IHsKICAgICdjb250ZW50LXR5cGUn +OiAnYXBwbGljYXRpb24vanNvbicsCiAgfTsKCiAgY29uc3QgYm9keSA9IHInJycKewogICJzcGVj +dmVyc2lvbiI6ICIxLjAiLAogICJ0eXBlIjogImdvb2dsZS5jbG91ZC5wdWJzdWIudG9waWMucHVi +bGlzaCIsCiAgInRpbWUiOiAiMjAyMC0wOS0wNVQwMzo1NjoyNC4wMDBaIiwKICAiaWQiOiAiMTIz +NC0xMjM0LTEyMzQiLAogICJzb3VyY2UiOiAidXJuOnV1aWQ6NmU4YmM0MzAtOWMzYS0xMWQ5LTk2 +NjktMDgwMDIwMGM5YTY2IiwKICAic3ViamVjdCI6ICJTVFJVQ1RVUkVEX01PREVfQ0xPVURFVkVO +VF9TQU1QTEUiLAogICJkYXRhIjogewogICAgInN1YnNjcmlwdGlvbiI6ICJwcm9qZWN0cy9teS1w +cm9qZWN0L3N1YnNjcmlwdGlvbnMvbXktc3Vic2NyaXB0aW9uIiwKICAgICJtZXNzYWdlIjogewog +ICAgICAiQHR5cGUiOiAidHlwZS5nb29nbGVhcGlzLmNvbS9nb29nbGUucHVic3ViLnYxLlB1YnN1 +Yk1lc3NhZ2UiLAogICAgICAiYXR0cmlidXRlcyI6IHsKICAgICAgICAiYXR0cjEiOiJhdHRyMS12 +YWx1ZSIKICAgICAgfSwKICAgICAgImRhdGEiOiAiZEdWemRDQnRaWE56WVdkbElETT0iCiAgICB9 +CiAgfQp9JycnOwoKICBmaW5hbCByZXNwb25zZSA9CiAgICAgIGF3YWl0IHBvc3QoVXJpLnBhcnNl +KHJlcXVlc3RVcmwpLCBoZWFkZXJzOiBoZWFkZXJzLCBib2R5OiBib2R5KTsKICBwcmludCgncmVz cG9uc2Uuc3RhdHVzQ29kZTogJHtyZXNwb25zZS5zdGF0dXNDb2RlfScpOwp9Cg==''' ]; diff --git a/dartfn/lib/src/generators/helloworld.g.dart b/dartfn/lib/src/generators/helloworld.g.dart index 3f6e273e..fa0dfccf 100644 --- a/dartfn/lib/src/generators/helloworld.g.dart +++ b/dartfn/lib/src/generators/helloworld.g.dart @@ -10,168 +10,168 @@ const _data = [ '.gitignore', 'text', ''' -IyBTZWUgaHR0cHM6Ly9kYXJ0LmRldi9ndWlkZXMvbGlicmFyaWVzL3ByaXZhdGUtZmlsZXMKCiMg -RmlsZXMgYW5kIGRpcmVjdG9yaWVzIGNyZWF0ZWQgYnkgcHViCi5kYXJ0X3Rvb2wvCnB1YnNwZWMu +IyBTZWUgaHR0cHM6Ly9kYXJ0LmRldi9ndWlkZXMvbGlicmFyaWVzL3ByaXZhdGUtZmlsZXMKCiMg +RmlsZXMgYW5kIGRpcmVjdG9yaWVzIGNyZWF0ZWQgYnkgcHViCi5kYXJ0X3Rvb2wvCnB1YnNwZWMu bG9jawo=''', 'Dockerfile', 'text', ''' -IyBPZmZpY2lhbCBEYXJ0IGltYWdlOiBodHRwczovL2h1Yi5kb2NrZXIuY29tL18vZGFydAojIFNw -ZWNpZnkgdGhlIERhcnQgU0RLIGJhc2UgaW1hZ2UgdmVyc2lvbiB1c2luZyBkYXJ0Ojx2ZXJzaW9u -PiAoZXg6IGRhcnQ6Mi4xNCkKRlJPTSBkYXJ0OnN0YWJsZSBBUyBidWlsZAoKIyBSZXNvbHZlIGFw -cCBkZXBlbmRlbmNpZXMuCldPUktESVIgL2FwcApDT1BZIHB1YnNwZWMuKiAuLwpSVU4gZGFydCBw -dWIgZ2V0CgojIENvcHkgYXBwIHNvdXJjZSBjb2RlIGFuZCBBT1QgY29tcGlsZSBpdC4KQ09QWSAu -IC4KIyBFbnN1cmUgcGFja2FnZXMgYXJlIHN0aWxsIHVwLXRvLWRhdGUgaWYgYW55dGhpbmcgaGFz -IGNoYW5nZWQKUlVOIGRhcnQgcHViIGdldCAtLW9mZmxpbmUKUlVOIGRhcnQgcHViIHJ1biBidWls -ZF9ydW5uZXIgYnVpbGQgLS1kZWxldGUtY29uZmxpY3Rpbmctb3V0cHV0cwpSVU4gZGFydCBjb21w -aWxlIGV4ZSBiaW4vc2VydmVyLmRhcnQgLW8gYmluL3NlcnZlcgoKIyBCdWlsZCBtaW5pbWFsIHNl -cnZpbmcgaW1hZ2UgZnJvbSBBT1QtY29tcGlsZWQgYC9zZXJ2ZXJgIGFuZCByZXF1aXJlZCBzeXN0 -ZW0KIyBsaWJyYXJpZXMgYW5kIGNvbmZpZ3VyYXRpb24gZmlsZXMgc3RvcmVkIGluIGAvcnVudGlt -ZS9gIGZyb20gdGhlIGJ1aWxkIHN0YWdlLgpGUk9NIHNjcmF0Y2gKQ09QWSAtLWZyb209YnVpbGQg -L3J1bnRpbWUvIC8KQ09QWSAtLWZyb209YnVpbGQgL2FwcC9iaW4vc2VydmVyIC9hcHAvYmluLwoK -IyBTdGFydCBzZXJ2ZXIuCkVYUE9TRSA4MDgwCkVOVFJZUE9JTlQgWyIvYXBwL2Jpbi9zZXJ2ZXIi +IyBPZmZpY2lhbCBEYXJ0IGltYWdlOiBodHRwczovL2h1Yi5kb2NrZXIuY29tL18vZGFydAojIFNw +ZWNpZnkgdGhlIERhcnQgU0RLIGJhc2UgaW1hZ2UgdmVyc2lvbiB1c2luZyBkYXJ0Ojx2ZXJzaW9u +PiAoZXg6IGRhcnQ6Mi4xNCkKRlJPTSBkYXJ0OnN0YWJsZSBBUyBidWlsZAoKIyBSZXNvbHZlIGFw +cCBkZXBlbmRlbmNpZXMuCldPUktESVIgL2FwcApDT1BZIHB1YnNwZWMuKiAuLwpSVU4gZGFydCBw +dWIgZ2V0CgojIENvcHkgYXBwIHNvdXJjZSBjb2RlIGFuZCBBT1QgY29tcGlsZSBpdC4KQ09QWSAu +IC4KIyBFbnN1cmUgcGFja2FnZXMgYXJlIHN0aWxsIHVwLXRvLWRhdGUgaWYgYW55dGhpbmcgaGFz +IGNoYW5nZWQKUlVOIGRhcnQgcHViIGdldCAtLW9mZmxpbmUKUlVOIGRhcnQgcHViIHJ1biBidWls +ZF9ydW5uZXIgYnVpbGQgLS1kZWxldGUtY29uZmxpY3Rpbmctb3V0cHV0cwpSVU4gZGFydCBjb21w +aWxlIGV4ZSBiaW4vc2VydmVyLmRhcnQgLW8gYmluL3NlcnZlcgoKIyBCdWlsZCBtaW5pbWFsIHNl +cnZpbmcgaW1hZ2UgZnJvbSBBT1QtY29tcGlsZWQgYC9zZXJ2ZXJgIGFuZCByZXF1aXJlZCBzeXN0 +ZW0KIyBsaWJyYXJpZXMgYW5kIGNvbmZpZ3VyYXRpb24gZmlsZXMgc3RvcmVkIGluIGAvcnVudGlt +ZS9gIGZyb20gdGhlIGJ1aWxkIHN0YWdlLgpGUk9NIHNjcmF0Y2gKQ09QWSAtLWZyb209YnVpbGQg +L3J1bnRpbWUvIC8KQ09QWSAtLWZyb209YnVpbGQgL2FwcC9iaW4vc2VydmVyIC9hcHAvYmluLwoK +IyBTdGFydCBzZXJ2ZXIuCkVYUE9TRSA4MDgwCkVOVFJZUE9JTlQgWyIvYXBwL2Jpbi9zZXJ2ZXIi XQo=''', 'Makefile', 'text', ''' -LlBIT05ZOiBjbGVhbgoKRlVOQ1RJT05fVEFSR0VUID0gZnVuY3Rpb24KUE9SVCA9IDgwODAKCiMg -YmluL3NlcnZlci5kYXJ0IGlzIHRoZSBnZW5lcmF0ZWQgdGFyZ2V0IGZvciBsaWIvZnVuY3Rpb25z -LmRhcnQKYmluL3NlcnZlci5kYXJ0OgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGJ1aWxkIC0tZGVs -ZXRlLWNvbmZsaWN0aW5nLW91dHB1dHMKCmJ1aWxkOiBiaW4vc2VydmVyLmRhcnQKCnRlc3Q6IGNs -ZWFuIGJ1aWxkCglkYXJ0IHRlc3QKCmNsZWFuOgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGNsZWFu -CglybSAtcmYgYmluL3NlcnZlci5kYXJ0CgpydW46IGJ1aWxkCglkYXJ0IHJ1biBiaW4vc2VydmVy +LlBIT05ZOiBjbGVhbgoKRlVOQ1RJT05fVEFSR0VUID0gZnVuY3Rpb24KUE9SVCA9IDgwODAKCiMg +YmluL3NlcnZlci5kYXJ0IGlzIHRoZSBnZW5lcmF0ZWQgdGFyZ2V0IGZvciBsaWIvZnVuY3Rpb25z +LmRhcnQKYmluL3NlcnZlci5kYXJ0OgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGJ1aWxkIC0tZGVs +ZXRlLWNvbmZsaWN0aW5nLW91dHB1dHMKCmJ1aWxkOiBiaW4vc2VydmVyLmRhcnQKCnRlc3Q6IGNs +ZWFuIGJ1aWxkCglkYXJ0IHRlc3QKCmNsZWFuOgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGNsZWFu +CglybSAtcmYgYmluL3NlcnZlci5kYXJ0CgpydW46IGJ1aWxkCglkYXJ0IHJ1biBiaW4vc2VydmVy LmRhcnQgLS1wb3J0PSQoUE9SVCkgLS10YXJnZXQ9JChGVU5DVElPTl9UQVJHRVQpCg==''', 'README.md', 'text', ''' -IyBIZWxsbyB3b3JsZCBleGFtcGxlCgpUaGlzIGV4YW1wbGUgaGFuZGxlcyBIVFRQIEdFVCByZXF1 -ZXN0cyBieSByZXNwb25kaW5nIHdpdGggJ0hlbGxvLCBXb3JsZCEnLgoKYGBgZGFydAovLyBsaWIv -ZnVuY3Rpb25zLmRhcnQKaW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvZnVuY3Rp -b25zX2ZyYW1ld29yay5kYXJ0JzsKaW1wb3J0ICdwYWNrYWdlOnNoZWxmL3NoZWxmLmRhcnQnOwoK -QENsb3VkRnVuY3Rpb24oKQpSZXNwb25zZSBmdW5jdGlvbihSZXF1ZXN0IHJlcXVlc3QpID0+IFJl -c3BvbnNlLm9rKCdIZWxsbywgV29ybGQhJyk7CmBgYAoKIyMgU2ltdWxhdGUgYSBob3N0ZWQgZW52 -aXJvbm1lbnQgb24geW91ciBvd24gbWFjaGluZQoKWW91IGNhbiBydW4gdGhpcyBmdW5jdGlvbiBl -eGFtcGxlIG9uIHlvdXIgb3duIG1hY2hpbmUgdXNpbmcgRG9ja2VyIHRvIHNpbXVsYXRlCnJ1bm5p -bmcgaW4gYSBob3N0ZWQgZW52aXJvbm1lbnQuCgpgYGBzaGVsbAokIGRvY2tlciBidWlsZCAtdCBo -ZWxsbyAuCi4uLgoKJCBkb2NrZXIgcnVuIC1pdCAtcCA4MDgwOjgwODAgLS1uYW1lIGFwcCBoZWxs -bwpMaXN0ZW5pbmcgb24gOjgwODAKYGBgCgpGcm9tIGFub3RoZXIgdGVybWluYWw6CgpgYGBzaGVs -bApjdXJsIGh0dHA6Ly9sb2NhbGhvc3Q6ODA4MApIZWxsbywgV29ybGQhCmBgYAoKSWYgeW91J3Jl -IGN1cmlvdXMgYWJvdXQgdGhlIHNpemUgb2YgdGhlIGltYWdlIHlvdSBjcmVhdGVkLCBlbnRlcjoK -CmBgYHNoZWxsCiQgZG9ja2VyIGltYWdlIGxzIGhlbGxvClJFUE9TSVRPUlkgICBUQUcgICAgICAg -SU1BR0UgSUQgICAgICAgQ1JFQVRFRCAgICAgICAgICBTSVpFCmhlbGxvICAgICAgICBsYXRlc3Qg -ICAgM2YyM2M3Mzc4NzdiICAgMSBtaW51dGUgYWdvICAgICAxMS42TUIKYGBgCgojIyBFZGl0aW5n -IHRoZSBmdW5jdGlvbiBhbmQgdGVzdGluZyBsb2NhbGx5CgpJZiB5b3Ugd291bGQgbGlrZSB0byBy -ZW5hbWUgdGhlIGhhbmRsZXIgZnVuY3Rpb24gKGBmdW5jdGlvbmApIHRvIHNvbWV0aGluZyBlbHNl -CihleDogYGhhbmRsZUdldGApLCB5b3UgbmVlZCB0byBlbnN1cmUgdGhhdCB0aGUgYEZVTkNUSU9O -X1RBUkdFVGAgZW52aXJvbm1lbnQKdmFyaWFibGUgaXMgc2V0IHRvIHRoZSBuZXcgZnVuY3Rpb24g -bmFtZS4KCkZvciBleGFtcGxlOgoKYGBgZGFydApAQ2xvdWRGdW5jdGlvbigpClJlc3BvbnNlIGhh -bmRsZUdldChSZXF1ZXN0IHJlcXVlc3QpID0+IFJlc3BvbnNlLm9rKCdIZWxsbywgV29ybGQhJyk7 -CmBgYAoKUnVuIHRoZSBgYnVpbGRfcnVubmVyYCB0byByZWdlbmVyYXRlIGBiaW4vc2VydmVyLmRh -cnRgIGZyb20gYGxpYi9mdW5jdGlvbnMuZGFydGAKCmBgYHNoZWxsCiQgZGFydCBydW4gYnVpbGRf -cnVubmVyIGJ1aWxkCltJTkZPXSBHZW5lcmF0aW5nIGJ1aWxkIHNjcmlwdCBjb21wbGV0ZWQsIHRv -b2sgMzA0bXMKW0lORk9dIFJlYWRpbmcgY2FjaGVkIGFzc2V0IGdyYXBoIGNvbXBsZXRlZCwgdG9v -ayA0Nm1zCltJTkZPXSBDaGVja2luZyBmb3IgdXBkYXRlcyBzaW5jZSBsYXN0IGJ1aWxkIGNvbXBs -ZXRlZCwgdG9vayA0MTJtcwpbSU5GT10gUnVubmluZyBidWlsZCBjb21wbGV0ZWQsIHRvb2sgMi4y -cwpbSU5GT10gQ2FjaGluZyBmaW5hbGl6ZWQgZGVwZW5kZW5jeSBncmFwaCBjb21wbGV0ZWQsIHRv -b2sgMjhtcwpbSU5GT10gU3VjY2VlZGVkIGFmdGVyIDIuM3Mgd2l0aCAxIG91dHB1dHMgKDEgYWN0 -aW9ucykKCmBgYAoKUnVuIHRlc3RzIChub3RlIHRoYXQgYEZVTkNUSU9OX1RBUkdFVGAgbXVzdCBu -b3cgYmUgc2V0IGZvciB0aGUgdGVzdCBwcm9jZXNzKToKCmBgYHNoZWxsCiQgRlVOQ1RJT05fVEFS -R0VUPWhhbmRsZUdldCBkYXJ0IHRlc3QKMDA6MDIgKzE6IEFsbCB0ZXN0cyBwYXNzZWQhCmBgYAoK -UnVuIGl0IG9uIHlvdXIgc3lzdGVtOgoKYGBgc2hlbGwKJCBGVU5DVElPTl9UQVJHRVQ9aGFuZGxl -R2V0IGRhcnQgcnVuIGJpbi9zZXJ2ZXIuZGFydApMaXN0ZW5pbmcgb24gOjgwODAKYGBgCgpJZiB5 -b3Ugd2FudCB0byB0ZXN0IHRoaXMgaG9zdGVkIG9uIHlvdXIgbWFjaGluZSwgcmVidWlsZCB0aGUg -aW1hZ2UKCmBgYHNoZWxsCiQgZG9ja2VyIGJ1aWxkIC10IGhlbGxvIC4KLi4uCmBgYAoKSWYgeW91 -IGhhZCBhIHByZXZpb3VzIGNvbnRhaW5lciBydW5uaW5nLCBtYWtlIHN1cmUgdG8gcmVtb3ZlIGl0 -IG5vdy4gQXNzdW1pbmcKeW91IG5hbWVkIHRoZSBjb250YWluZXIgYGFwcGAgKGFzIGRlbW9uc3Ry -YXRlZCBlYXJsaWVyKToKCmBgYHNoZWxsCmRvY2tlciBybSAtZiBhcHAKYGBgCgpOb3cgbGF1bmNo -IGFub3RoZXIgY29udGFpbmVyLCB0aGlzIHRpbWUgZW5zdXJpbmcgdGhlIGVudmlyb25tZW50IHZh -cmlhYmxlIGlzCnBhc3NlZCB0byBEb2NrZXIgc28gdGhhdCBpdCB3aWxsIGJlIHNldCBmb3IgdGhl -IGNvbnRhaW5lcml6ZWQgZnVuY3Rpb246CgpgYGBzaGVsbAokIGRvY2tlciBydW4gLWl0IC1wIDgw -ODA6ODA4MCAtLW5hbWUgYXBwIC1lICdGVU5DVElPTl9UQVJHRVQ9aGFuZGxlR2V0JyBoZWxsbwpB -cHAgbGlzdGVuaW5nIG9uIDo4MDgwCmBgYAoKIyMgQ2xlYW4gdXAKCldoZW4gZmluaXNoZWQsIGNs -ZWFuIHVwIGJ5IGVudGVyaW5nOgoKYGBgc2hlbGwKZG9ja2VyIHJtIC1mIGFwcCAgICAgICAgIyBy -ZW1vdmUgdGhlIGNvbnRhaW5lcgpkb2NrZXIgaW1hZ2Ugcm0gaGVsbG8gICAjIHJlbW92ZSB0aGUg -aW1hZ2UKYGBgCgojIyBNYWtlZmlsZQoKSWYgeW91J3JlIGZhbWlsaWFyIHdpdGggYG1ha2VgIGFu -ZCBoYXZlIGl0IGluIHlvdXIgcGF0aCwgeW91IGNhbiB1c2UgdGhlCnByb3ZpZGVkIGBNYWtlZmls -ZWAgZm9yIGNvbnZlbmllbmNlIHdoaWxlIGRldmVsb3BpbmcgYW5kIHRlc3RpbmcgeW91cgpzb3Vy -Y2UgY29kZSBsb2NhbGx5IHVudGlsIHJlYWR5IHRvIHRlc3QgaW4gYSBjb250YWluZXIgb3IgZGVw -bG95IGl0LiBUaGUKZm9sbG93aW5nIHRhcmdldHMgYXJlIHN1cHBvcnRlZDoKCiogYG1ha2UgYnVp -bGRgIC0gdGhpcyBpcyB0aGUgZGVmYXVsdCB0YXJnZXQgYW5kIHdpbGwgZ2VuZXJhdGUgYGJpbi9z -ZXJ2ZXIuZGFydGAKKiBgbWFrZSBjbGVhbmAgLSBjbGVhcnMgYnVpbGRfcnVubmVyIGNhY2hlIGFu -ZCByZW1vdmVzIHRoZSBgYmluL3NlcnZlci5kYXJ0YAoqIGBtYWtlIHRlc3RgICAtIHJ1bnMgYGNs -ZWFuYCBhbmQgYGJ1aWxkYCB0YXJnZXRzLCB0aGVuIHJ1bnMgdGVzdHMKKiBgbWFrZSBydW5gIC0g -cnVucyB0aGUgYGJ1aWxkYCB0YXJnZXQgYW5kIHRoZW4gc3RhcnRzIHRoZSBEYXJ0IGZ1bmN0aW9u -CiAgc2VydmVyIGxvY2FsbHkKCiMjIFF1aWNrc3RhcnRzCgpTZWUgW1F1aWNrc3RhcnRzXSB0byBs -ZWFybiBtb3JlIGFib3V0IHVzaW5nIHRoZSBEYXJ0IEZ1bmN0aW9ucyBGcmFtZXdvcmsuCgpbUXVp -Y2tzdGFydHNdOgpodHRwczovL2dpdGh1Yi5jb20vR29vZ2xlQ2xvdWRQbGF0Zm9ybS9mdW5jdGlv +IyBIZWxsbyB3b3JsZCBleGFtcGxlCgpUaGlzIGV4YW1wbGUgaGFuZGxlcyBIVFRQIEdFVCByZXF1 +ZXN0cyBieSByZXNwb25kaW5nIHdpdGggJ0hlbGxvLCBXb3JsZCEnLgoKYGBgZGFydAovLyBsaWIv +ZnVuY3Rpb25zLmRhcnQKaW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvZnVuY3Rp +b25zX2ZyYW1ld29yay5kYXJ0JzsKaW1wb3J0ICdwYWNrYWdlOnNoZWxmL3NoZWxmLmRhcnQnOwoK +QENsb3VkRnVuY3Rpb24oKQpSZXNwb25zZSBmdW5jdGlvbihSZXF1ZXN0IHJlcXVlc3QpID0+IFJl +c3BvbnNlLm9rKCdIZWxsbywgV29ybGQhJyk7CmBgYAoKIyMgU2ltdWxhdGUgYSBob3N0ZWQgZW52 +aXJvbm1lbnQgb24geW91ciBvd24gbWFjaGluZQoKWW91IGNhbiBydW4gdGhpcyBmdW5jdGlvbiBl +eGFtcGxlIG9uIHlvdXIgb3duIG1hY2hpbmUgdXNpbmcgRG9ja2VyIHRvIHNpbXVsYXRlCnJ1bm5p +bmcgaW4gYSBob3N0ZWQgZW52aXJvbm1lbnQuCgpgYGBzaGVsbAokIGRvY2tlciBidWlsZCAtdCBo +ZWxsbyAuCi4uLgoKJCBkb2NrZXIgcnVuIC1pdCAtcCA4MDgwOjgwODAgLS1uYW1lIGFwcCBoZWxs +bwpMaXN0ZW5pbmcgb24gOjgwODAKYGBgCgpGcm9tIGFub3RoZXIgdGVybWluYWw6CgpgYGBzaGVs +bApjdXJsIGh0dHA6Ly9sb2NhbGhvc3Q6ODA4MApIZWxsbywgV29ybGQhCmBgYAoKSWYgeW91J3Jl +IGN1cmlvdXMgYWJvdXQgdGhlIHNpemUgb2YgdGhlIGltYWdlIHlvdSBjcmVhdGVkLCBlbnRlcjoK +CmBgYHNoZWxsCiQgZG9ja2VyIGltYWdlIGxzIGhlbGxvClJFUE9TSVRPUlkgICBUQUcgICAgICAg +SU1BR0UgSUQgICAgICAgQ1JFQVRFRCAgICAgICAgICBTSVpFCmhlbGxvICAgICAgICBsYXRlc3Qg +ICAgM2YyM2M3Mzc4NzdiICAgMSBtaW51dGUgYWdvICAgICAxMS42TUIKYGBgCgojIyBFZGl0aW5n +IHRoZSBmdW5jdGlvbiBhbmQgdGVzdGluZyBsb2NhbGx5CgpJZiB5b3Ugd291bGQgbGlrZSB0byBy +ZW5hbWUgdGhlIGhhbmRsZXIgZnVuY3Rpb24gKGBmdW5jdGlvbmApIHRvIHNvbWV0aGluZyBlbHNl +CihleDogYGhhbmRsZUdldGApLCB5b3UgbmVlZCB0byBlbnN1cmUgdGhhdCB0aGUgYEZVTkNUSU9O +X1RBUkdFVGAgZW52aXJvbm1lbnQKdmFyaWFibGUgaXMgc2V0IHRvIHRoZSBuZXcgZnVuY3Rpb24g +bmFtZS4KCkZvciBleGFtcGxlOgoKYGBgZGFydApAQ2xvdWRGdW5jdGlvbigpClJlc3BvbnNlIGhh +bmRsZUdldChSZXF1ZXN0IHJlcXVlc3QpID0+IFJlc3BvbnNlLm9rKCdIZWxsbywgV29ybGQhJyk7 +CmBgYAoKUnVuIHRoZSBgYnVpbGRfcnVubmVyYCB0byByZWdlbmVyYXRlIGBiaW4vc2VydmVyLmRh +cnRgIGZyb20gYGxpYi9mdW5jdGlvbnMuZGFydGAKCmBgYHNoZWxsCiQgZGFydCBydW4gYnVpbGRf +cnVubmVyIGJ1aWxkCltJTkZPXSBHZW5lcmF0aW5nIGJ1aWxkIHNjcmlwdCBjb21wbGV0ZWQsIHRv +b2sgMzA0bXMKW0lORk9dIFJlYWRpbmcgY2FjaGVkIGFzc2V0IGdyYXBoIGNvbXBsZXRlZCwgdG9v +ayA0Nm1zCltJTkZPXSBDaGVja2luZyBmb3IgdXBkYXRlcyBzaW5jZSBsYXN0IGJ1aWxkIGNvbXBs +ZXRlZCwgdG9vayA0MTJtcwpbSU5GT10gUnVubmluZyBidWlsZCBjb21wbGV0ZWQsIHRvb2sgMi4y +cwpbSU5GT10gQ2FjaGluZyBmaW5hbGl6ZWQgZGVwZW5kZW5jeSBncmFwaCBjb21wbGV0ZWQsIHRv +b2sgMjhtcwpbSU5GT10gU3VjY2VlZGVkIGFmdGVyIDIuM3Mgd2l0aCAxIG91dHB1dHMgKDEgYWN0 +aW9ucykKCmBgYAoKUnVuIHRlc3RzIChub3RlIHRoYXQgYEZVTkNUSU9OX1RBUkdFVGAgbXVzdCBu +b3cgYmUgc2V0IGZvciB0aGUgdGVzdCBwcm9jZXNzKToKCmBgYHNoZWxsCiQgRlVOQ1RJT05fVEFS +R0VUPWhhbmRsZUdldCBkYXJ0IHRlc3QKMDA6MDIgKzE6IEFsbCB0ZXN0cyBwYXNzZWQhCmBgYAoK +UnVuIGl0IG9uIHlvdXIgc3lzdGVtOgoKYGBgc2hlbGwKJCBGVU5DVElPTl9UQVJHRVQ9aGFuZGxl +R2V0IGRhcnQgcnVuIGJpbi9zZXJ2ZXIuZGFydApMaXN0ZW5pbmcgb24gOjgwODAKYGBgCgpJZiB5 +b3Ugd2FudCB0byB0ZXN0IHRoaXMgaG9zdGVkIG9uIHlvdXIgbWFjaGluZSwgcmVidWlsZCB0aGUg +aW1hZ2UKCmBgYHNoZWxsCiQgZG9ja2VyIGJ1aWxkIC10IGhlbGxvIC4KLi4uCmBgYAoKSWYgeW91 +IGhhZCBhIHByZXZpb3VzIGNvbnRhaW5lciBydW5uaW5nLCBtYWtlIHN1cmUgdG8gcmVtb3ZlIGl0 +IG5vdy4gQXNzdW1pbmcKeW91IG5hbWVkIHRoZSBjb250YWluZXIgYGFwcGAgKGFzIGRlbW9uc3Ry +YXRlZCBlYXJsaWVyKToKCmBgYHNoZWxsCmRvY2tlciBybSAtZiBhcHAKYGBgCgpOb3cgbGF1bmNo +IGFub3RoZXIgY29udGFpbmVyLCB0aGlzIHRpbWUgZW5zdXJpbmcgdGhlIGVudmlyb25tZW50IHZh +cmlhYmxlIGlzCnBhc3NlZCB0byBEb2NrZXIgc28gdGhhdCBpdCB3aWxsIGJlIHNldCBmb3IgdGhl +IGNvbnRhaW5lcml6ZWQgZnVuY3Rpb246CgpgYGBzaGVsbAokIGRvY2tlciBydW4gLWl0IC1wIDgw +ODA6ODA4MCAtLW5hbWUgYXBwIC1lICdGVU5DVElPTl9UQVJHRVQ9aGFuZGxlR2V0JyBoZWxsbwpB +cHAgbGlzdGVuaW5nIG9uIDo4MDgwCmBgYAoKIyMgQ2xlYW4gdXAKCldoZW4gZmluaXNoZWQsIGNs +ZWFuIHVwIGJ5IGVudGVyaW5nOgoKYGBgc2hlbGwKZG9ja2VyIHJtIC1mIGFwcCAgICAgICAgIyBy +ZW1vdmUgdGhlIGNvbnRhaW5lcgpkb2NrZXIgaW1hZ2Ugcm0gaGVsbG8gICAjIHJlbW92ZSB0aGUg +aW1hZ2UKYGBgCgojIyBNYWtlZmlsZQoKSWYgeW91J3JlIGZhbWlsaWFyIHdpdGggYG1ha2VgIGFu +ZCBoYXZlIGl0IGluIHlvdXIgcGF0aCwgeW91IGNhbiB1c2UgdGhlCnByb3ZpZGVkIGBNYWtlZmls +ZWAgZm9yIGNvbnZlbmllbmNlIHdoaWxlIGRldmVsb3BpbmcgYW5kIHRlc3RpbmcgeW91cgpzb3Vy +Y2UgY29kZSBsb2NhbGx5IHVudGlsIHJlYWR5IHRvIHRlc3QgaW4gYSBjb250YWluZXIgb3IgZGVw +bG95IGl0LiBUaGUKZm9sbG93aW5nIHRhcmdldHMgYXJlIHN1cHBvcnRlZDoKCiogYG1ha2UgYnVp +bGRgIC0gdGhpcyBpcyB0aGUgZGVmYXVsdCB0YXJnZXQgYW5kIHdpbGwgZ2VuZXJhdGUgYGJpbi9z +ZXJ2ZXIuZGFydGAKKiBgbWFrZSBjbGVhbmAgLSBjbGVhcnMgYnVpbGRfcnVubmVyIGNhY2hlIGFu +ZCByZW1vdmVzIHRoZSBgYmluL3NlcnZlci5kYXJ0YAoqIGBtYWtlIHRlc3RgICAtIHJ1bnMgYGNs +ZWFuYCBhbmQgYGJ1aWxkYCB0YXJnZXRzLCB0aGVuIHJ1bnMgdGVzdHMKKiBgbWFrZSBydW5gIC0g +cnVucyB0aGUgYGJ1aWxkYCB0YXJnZXQgYW5kIHRoZW4gc3RhcnRzIHRoZSBEYXJ0IGZ1bmN0aW9u +CiAgc2VydmVyIGxvY2FsbHkKCiMjIFF1aWNrc3RhcnRzCgpTZWUgW1F1aWNrc3RhcnRzXSB0byBs +ZWFybiBtb3JlIGFib3V0IHVzaW5nIHRoZSBEYXJ0IEZ1bmN0aW9ucyBGcmFtZXdvcmsuCgpbUXVp +Y2tzdGFydHNdOgpodHRwczovL2dpdGh1Yi5jb20vR29vZ2xlQ2xvdWRQbGF0Zm9ybS9mdW5jdGlv bnMtZnJhbWV3b3JrLWRhcnQvdHJlZS9tYWluL2RvY3MjcXVpY2tzdGFydHMK''', 'analysis_options.yaml', 'text', ''' -IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q -ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v -cHViLmRldi9wYWNrYWdlcy9saW50cy4KaW5jbHVkZTogcGFja2FnZTpsaW50cy9yZWNvbW1lbmRl -ZC55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFuZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2Rh -cnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xpbnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFk -ZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgojICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90 -eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRlOgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmls +IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v +cHViLmRldi9wYWNrYWdlcy9saW50cy4KaW5jbHVkZTogcGFja2FnZTpsaW50cy9yZWNvbW1lbmRl +ZC55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFuZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2Rh +cnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xpbnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFk +ZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgojICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90 +eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRlOgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmls ZXMvKioK''', 'bin/server.dart', 'text', ''' -Ly8gR0VORVJBVEVEIENPREUgLSBETyBOT1QgTU9ESUZZIEJZIEhBTkQKLy8gQ29weXJpZ2h0IDIw -MjEgR29vZ2xlIExMQwovLwovLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZl -cnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBl -eGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgovLyBZb3UgbWF5IG9idGFpbiBh -IGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLy8KLy8gICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9s -aWNlbnNlcy9MSUNFTlNFLTIuMAovLwovLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBs -YXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi8vIGRpc3RyaWJ1dGVkIHVuZGVy -IHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi8vIFdJVEhP -VVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBv -ciBpbXBsaWVkLgovLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBn -b3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNl -LgoKaW1wb3J0ICdwYWNrYWdlOl9fcHJvamVjdE5hbWVfXy9mdW5jdGlvbnMuZGFydCcgYXMgZnVu -Y3Rpb25fbGlicmFyeTsKaW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvc2VydmUu -ZGFydCc7CgpGdXR1cmU8dm9pZD4gbWFpbihMaXN0PFN0cmluZz4gYXJncykgYXN5bmMgewogIGF3 -YWl0IHNlcnZlKGFyZ3MsIF9uYW1lVG9GdW5jdGlvblRhcmdldCk7Cn0KCkZ1bmN0aW9uVGFyZ2V0 -PyBfbmFtZVRvRnVuY3Rpb25UYXJnZXQoU3RyaW5nIG5hbWUpID0+IHN3aXRjaCAobmFtZSkgewog -ICAgICAnZnVuY3Rpb24nID0+IEZ1bmN0aW9uVGFyZ2V0Lmh0dHAoCiAgICAgICAgICBmdW5jdGlv +Ly8gR0VORVJBVEVEIENPREUgLSBETyBOT1QgTU9ESUZZIEJZIEhBTkQKLy8gQ29weXJpZ2h0IDIw +MjEgR29vZ2xlIExMQwovLwovLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZl +cnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBl +eGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgovLyBZb3UgbWF5IG9idGFpbiBh +IGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLy8KLy8gICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9s +aWNlbnNlcy9MSUNFTlNFLTIuMAovLwovLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBs +YXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi8vIGRpc3RyaWJ1dGVkIHVuZGVy +IHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi8vIFdJVEhP +VVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBv +ciBpbXBsaWVkLgovLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBn +b3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNl +LgoKaW1wb3J0ICdwYWNrYWdlOl9fcHJvamVjdE5hbWVfXy9mdW5jdGlvbnMuZGFydCcgYXMgZnVu +Y3Rpb25fbGlicmFyeTsKaW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvc2VydmUu +ZGFydCc7CgpGdXR1cmU8dm9pZD4gbWFpbihMaXN0PFN0cmluZz4gYXJncykgYXN5bmMgewogIGF3 +YWl0IHNlcnZlKGFyZ3MsIF9uYW1lVG9GdW5jdGlvblRhcmdldCk7Cn0KCkZ1bmN0aW9uVGFyZ2V0 +PyBfbmFtZVRvRnVuY3Rpb25UYXJnZXQoU3RyaW5nIG5hbWUpID0+IHN3aXRjaCAobmFtZSkgewog +ICAgICAnZnVuY3Rpb24nID0+IEZ1bmN0aW9uVGFyZ2V0Lmh0dHAoCiAgICAgICAgICBmdW5jdGlv bl9saWJyYXJ5LmZ1bmN0aW9uLAogICAgICAgICksCiAgICAgIF8gPT4gbnVsbAogICAgfTsK''', 'lib/functions.dart', 'text', ''' -aW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvZnVuY3Rpb25zX2ZyYW1ld29yay5k -YXJ0JzsKaW1wb3J0ICdwYWNrYWdlOnNoZWxmL3NoZWxmLmRhcnQnOwoKQENsb3VkRnVuY3Rpb24o -KQpSZXNwb25zZSBmdW5jdGlvbihSZXF1ZXN0IHJlcXVlc3QpID0+IFJlc3BvbnNlLm9rKCdIZWxs +aW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvZnVuY3Rpb25zX2ZyYW1ld29yay5k +YXJ0JzsKaW1wb3J0ICdwYWNrYWdlOnNoZWxmL3NoZWxmLmRhcnQnOwoKQENsb3VkRnVuY3Rpb24o +KQpSZXNwb25zZSBmdW5jdGlvbihSZXF1ZXN0IHJlcXVlc3QpID0+IFJlc3BvbnNlLm9rKCdIZWxs bywgV29ybGQhJyk7Cg==''', 'pubspec.yaml', 'text', ''' -bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSAiSGVsbG8sIFdvcmxk -ISIgRnVuY3Rpb25zIEZyYW1ld29yayBwcm9qZWN0LgojIHZlcnNpb246IDAuMS4wCiMgaG9tZXBh -Z2U6IGh0dHBzOi8vd3d3LmV4YW1wbGUuY29tCnB1Ymxpc2hfdG86IG5vbmUKCmVudmlyb25tZW50 -OgogIHNkazogXjMuMC4wCgpkZXBlbmRlbmNpZXM6CiAgZnVuY3Rpb25zX2ZyYW1ld29yazogXjAu -NC4wCiAgc2hlbGY6IF4xLjAuMAoKZGV2X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4y -LjAuMAogIGZ1bmN0aW9uc19mcmFtZXdvcmtfYnVpbGRlcjogXjAuNC4wCiAgaHR0cDogJz49MC4x -My4wIDwyLjAuMCcKICBkYXJ0X2ZsdXR0ZXJfdGVhbV9saW50czogXjIuMC4wCiAgdGVzdDogXjEu +bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSAiSGVsbG8sIFdvcmxk +ISIgRnVuY3Rpb25zIEZyYW1ld29yayBwcm9qZWN0LgojIHZlcnNpb246IDAuMS4wCiMgaG9tZXBh +Z2U6IGh0dHBzOi8vd3d3LmV4YW1wbGUuY29tCnB1Ymxpc2hfdG86IG5vbmUKCmVudmlyb25tZW50 +OgogIHNkazogXjMuMC4wCgpkZXBlbmRlbmNpZXM6CiAgZnVuY3Rpb25zX2ZyYW1ld29yazogXjAu +NC4wCiAgc2hlbGY6IF4xLjAuMAoKZGV2X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4y +LjAuMAogIGZ1bmN0aW9uc19mcmFtZXdvcmtfYnVpbGRlcjogXjAuNC4wCiAgaHR0cDogJz49MC4x +My4wIDwyLjAuMCcKICBkYXJ0X2ZsdXR0ZXJfdGVhbV9saW50czogXjIuMC4wCiAgdGVzdDogXjEu MTUuNwogIHRlc3RfcHJvY2VzczogXjIuMC4wCg==''', 'test/function_test.dart', 'text', ''' -aW1wb3J0ICdkYXJ0OmlvJzsKCmltcG9ydCAncGFja2FnZTpodHRwL2h0dHAuZGFydCc7CmltcG9y -dCAncGFja2FnZTp0ZXN0L3Rlc3QuZGFydCc7CmltcG9ydCAncGFja2FnZTp0ZXN0X3Byb2Nlc3Mv -dGVzdF9wcm9jZXNzLmRhcnQnOwoKY29uc3QgZGVmYXVsdFRpbWVvdXQgPSBUaW1lb3V0KER1cmF0 -aW9uKHNlY29uZHM6IDMpKTsKCnZvaWQgbWFpbigpIHsKICB0ZXN0KCdkZWZhdWx0cycsICgpIGFz -eW5jIHsKICAgIGZpbmFsIHByb2MgPSBhd2FpdCBUZXN0UHJvY2Vzcy5zdGFydCgnZGFydCcsIFsn -YmluL3NlcnZlci5kYXJ0J10pOwoKICAgIGF3YWl0IGV4cGVjdExhdGVyKAogICAgICBwcm9jLnN0 -ZG91dCwKICAgICAgZW1pdHNUaHJvdWdoKCdMaXN0ZW5pbmcgb24gOjgwODAnKSwKICAgICk7Cgog -ICAgZmluYWwgcmVzcG9uc2UgPSBhd2FpdCBnZXQoVXJpLnBhcnNlKCdodHRwOi8vbG9jYWxob3N0 -OjgwODAnKSk7CiAgICBleHBlY3QocmVzcG9uc2Uuc3RhdHVzQ29kZSwgMjAwKTsKICAgIGV4cGVj -dChyZXNwb25zZS5ib2R5LCAnSGVsbG8sIFdvcmxkIScpOwoKICAgIGF3YWl0IGV4cGVjdExhdGVy -KAogICAgICBwcm9jLnN0ZG91dCwKICAgICAgZW1pdHNUaHJvdWdoKGVuZHNXaXRoKCdHRVQgICAg -IFsyMDBdIC8nKSksCiAgICApOwoKICAgIHByb2Muc2lnbmFsKFByb2Nlc3NTaWduYWwuc2lndGVy -bSk7CiAgICBhd2FpdCBwcm9jLnNob3VsZEV4aXQoMCk7CgogICAgYXdhaXQgZXhwZWN0TGF0ZXIo -CiAgICAgIHByb2Muc3Rkb3V0LAogICAgICBlbWl0c1Rocm91Z2goJ1JlY2VpdmVkIHNpZ25hbCBT -SUdURVJNIC0gY2xvc2luZycpLAogICAgKTsKICB9LCB0aW1lb3V0OiBkZWZhdWx0VGltZW91dCk7 +aW1wb3J0ICdkYXJ0OmlvJzsKCmltcG9ydCAncGFja2FnZTpodHRwL2h0dHAuZGFydCc7CmltcG9y +dCAncGFja2FnZTp0ZXN0L3Rlc3QuZGFydCc7CmltcG9ydCAncGFja2FnZTp0ZXN0X3Byb2Nlc3Mv +dGVzdF9wcm9jZXNzLmRhcnQnOwoKY29uc3QgZGVmYXVsdFRpbWVvdXQgPSBUaW1lb3V0KER1cmF0 +aW9uKHNlY29uZHM6IDMpKTsKCnZvaWQgbWFpbigpIHsKICB0ZXN0KCdkZWZhdWx0cycsICgpIGFz +eW5jIHsKICAgIGZpbmFsIHByb2MgPSBhd2FpdCBUZXN0UHJvY2Vzcy5zdGFydCgnZGFydCcsIFsn +YmluL3NlcnZlci5kYXJ0J10pOwoKICAgIGF3YWl0IGV4cGVjdExhdGVyKAogICAgICBwcm9jLnN0 +ZG91dCwKICAgICAgZW1pdHNUaHJvdWdoKCdMaXN0ZW5pbmcgb24gOjgwODAnKSwKICAgICk7Cgog +ICAgZmluYWwgcmVzcG9uc2UgPSBhd2FpdCBnZXQoVXJpLnBhcnNlKCdodHRwOi8vbG9jYWxob3N0 +OjgwODAnKSk7CiAgICBleHBlY3QocmVzcG9uc2Uuc3RhdHVzQ29kZSwgMjAwKTsKICAgIGV4cGVj +dChyZXNwb25zZS5ib2R5LCAnSGVsbG8sIFdvcmxkIScpOwoKICAgIGF3YWl0IGV4cGVjdExhdGVy +KAogICAgICBwcm9jLnN0ZG91dCwKICAgICAgZW1pdHNUaHJvdWdoKGVuZHNXaXRoKCdHRVQgICAg +IFsyMDBdIC8nKSksCiAgICApOwoKICAgIHByb2Muc2lnbmFsKFByb2Nlc3NTaWduYWwuc2lndGVy +bSk7CiAgICBhd2FpdCBwcm9jLnNob3VsZEV4aXQoMCk7CgogICAgYXdhaXQgZXhwZWN0TGF0ZXIo +CiAgICAgIHByb2Muc3Rkb3V0LAogICAgICBlbWl0c1Rocm91Z2goJ1JlY2VpdmVkIHNpZ25hbCBT +SUdURVJNIC0gY2xvc2luZycpLAogICAgKTsKICB9LCB0aW1lb3V0OiBkZWZhdWx0VGltZW91dCk7 Cn0K''' ]; diff --git a/dartfn/lib/src/generators/json.g.dart b/dartfn/lib/src/generators/json.g.dart index 8970d4c2..e97624e7 100644 --- a/dartfn/lib/src/generators/json.g.dart +++ b/dartfn/lib/src/generators/json.g.dart @@ -10,267 +10,267 @@ const _data = [ '.gitignore', 'text', ''' -IyBTZWUgaHR0cHM6Ly9kYXJ0LmRldi9ndWlkZXMvbGlicmFyaWVzL3ByaXZhdGUtZmlsZXMKCiMg -RmlsZXMgYW5kIGRpcmVjdG9yaWVzIGNyZWF0ZWQgYnkgcHViCi5kYXJ0X3Rvb2wvCnB1YnNwZWMu +IyBTZWUgaHR0cHM6Ly9kYXJ0LmRldi9ndWlkZXMvbGlicmFyaWVzL3ByaXZhdGUtZmlsZXMKCiMg +RmlsZXMgYW5kIGRpcmVjdG9yaWVzIGNyZWF0ZWQgYnkgcHViCi5kYXJ0X3Rvb2wvCnB1YnNwZWMu bG9jawo=''', 'Dockerfile', 'text', ''' -IyBPZmZpY2lhbCBEYXJ0IGltYWdlOiBodHRwczovL2h1Yi5kb2NrZXIuY29tL18vZGFydAojIFNw -ZWNpZnkgdGhlIERhcnQgU0RLIGJhc2UgaW1hZ2UgdmVyc2lvbiB1c2luZyBkYXJ0Ojx2ZXJzaW9u -PiAoZXg6IGRhcnQ6Mi4xNCkKRlJPTSBkYXJ0OnN0YWJsZSBBUyBidWlsZAoKIyBSZXNvbHZlIGFw -cCBkZXBlbmRlbmNpZXMuCldPUktESVIgL2FwcApDT1BZIHB1YnNwZWMuKiAuLwpSVU4gZGFydCBw -dWIgZ2V0CgojIENvcHkgYXBwIHNvdXJjZSBjb2RlIGFuZCBBT1QgY29tcGlsZSBpdC4KQ09QWSAu -IC4KIyBFbnN1cmUgcGFja2FnZXMgYXJlIHN0aWxsIHVwLXRvLWRhdGUgaWYgYW55dGhpbmcgaGFz -IGNoYW5nZWQKUlVOIGRhcnQgcHViIGdldCAtLW9mZmxpbmUKUlVOIGRhcnQgcHViIHJ1biBidWls -ZF9ydW5uZXIgYnVpbGQgLS1kZWxldGUtY29uZmxpY3Rpbmctb3V0cHV0cwpSVU4gZGFydCBjb21w -aWxlIGV4ZSBiaW4vc2VydmVyLmRhcnQgLW8gYmluL3NlcnZlcgoKIyBCdWlsZCBtaW5pbWFsIHNl -cnZpbmcgaW1hZ2UgZnJvbSBBT1QtY29tcGlsZWQgYC9zZXJ2ZXJgIGFuZCByZXF1aXJlZCBzeXN0 -ZW0KIyBsaWJyYXJpZXMgYW5kIGNvbmZpZ3VyYXRpb24gZmlsZXMgc3RvcmVkIGluIGAvcnVudGlt -ZS9gIGZyb20gdGhlIGJ1aWxkIHN0YWdlLgpGUk9NIHNjcmF0Y2gKQ09QWSAtLWZyb209YnVpbGQg -L3J1bnRpbWUvIC8KQ09QWSAtLWZyb209YnVpbGQgL2FwcC9iaW4vc2VydmVyIC9hcHAvYmluLwoK -IyBTdGFydCBzZXJ2ZXIuCkVYUE9TRSA4MDgwCkVOVFJZUE9JTlQgWyIvYXBwL2Jpbi9zZXJ2ZXIi +IyBPZmZpY2lhbCBEYXJ0IGltYWdlOiBodHRwczovL2h1Yi5kb2NrZXIuY29tL18vZGFydAojIFNw +ZWNpZnkgdGhlIERhcnQgU0RLIGJhc2UgaW1hZ2UgdmVyc2lvbiB1c2luZyBkYXJ0Ojx2ZXJzaW9u +PiAoZXg6IGRhcnQ6Mi4xNCkKRlJPTSBkYXJ0OnN0YWJsZSBBUyBidWlsZAoKIyBSZXNvbHZlIGFw +cCBkZXBlbmRlbmNpZXMuCldPUktESVIgL2FwcApDT1BZIHB1YnNwZWMuKiAuLwpSVU4gZGFydCBw +dWIgZ2V0CgojIENvcHkgYXBwIHNvdXJjZSBjb2RlIGFuZCBBT1QgY29tcGlsZSBpdC4KQ09QWSAu +IC4KIyBFbnN1cmUgcGFja2FnZXMgYXJlIHN0aWxsIHVwLXRvLWRhdGUgaWYgYW55dGhpbmcgaGFz +IGNoYW5nZWQKUlVOIGRhcnQgcHViIGdldCAtLW9mZmxpbmUKUlVOIGRhcnQgcHViIHJ1biBidWls +ZF9ydW5uZXIgYnVpbGQgLS1kZWxldGUtY29uZmxpY3Rpbmctb3V0cHV0cwpSVU4gZGFydCBjb21w +aWxlIGV4ZSBiaW4vc2VydmVyLmRhcnQgLW8gYmluL3NlcnZlcgoKIyBCdWlsZCBtaW5pbWFsIHNl +cnZpbmcgaW1hZ2UgZnJvbSBBT1QtY29tcGlsZWQgYC9zZXJ2ZXJgIGFuZCByZXF1aXJlZCBzeXN0 +ZW0KIyBsaWJyYXJpZXMgYW5kIGNvbmZpZ3VyYXRpb24gZmlsZXMgc3RvcmVkIGluIGAvcnVudGlt +ZS9gIGZyb20gdGhlIGJ1aWxkIHN0YWdlLgpGUk9NIHNjcmF0Y2gKQ09QWSAtLWZyb209YnVpbGQg +L3J1bnRpbWUvIC8KQ09QWSAtLWZyb209YnVpbGQgL2FwcC9iaW4vc2VydmVyIC9hcHAvYmluLwoK +IyBTdGFydCBzZXJ2ZXIuCkVYUE9TRSA4MDgwCkVOVFJZUE9JTlQgWyIvYXBwL2Jpbi9zZXJ2ZXIi XQo=''', 'Makefile', 'text', ''' -LlBIT05ZOiBjbGVhbgoKRlVOQ1RJT05fVEFSR0VUID0gZnVuY3Rpb24KUE9SVCA9IDgwODAKCiMg -YmluL3NlcnZlci5kYXJ0IGlzIHRoZSBnZW5lcmF0ZWQgdGFyZ2V0IGZvciBsaWIvZnVuY3Rpb25z -LmRhcnQKYmluL3NlcnZlci5kYXJ0OgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGJ1aWxkIC0tZGVs -ZXRlLWNvbmZsaWN0aW5nLW91dHB1dHMKCmJ1aWxkOiBiaW4vc2VydmVyLmRhcnQKCnRlc3Q6IGNs -ZWFuIGJ1aWxkCglkYXJ0IHRlc3QKCmNsZWFuOgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGNsZWFu -CglybSAtcmYgYmluL3NlcnZlci5kYXJ0CgpydW46IGJ1aWxkCglkYXJ0IHJ1biBiaW4vc2VydmVy +LlBIT05ZOiBjbGVhbgoKRlVOQ1RJT05fVEFSR0VUID0gZnVuY3Rpb24KUE9SVCA9IDgwODAKCiMg +YmluL3NlcnZlci5kYXJ0IGlzIHRoZSBnZW5lcmF0ZWQgdGFyZ2V0IGZvciBsaWIvZnVuY3Rpb25z +LmRhcnQKYmluL3NlcnZlci5kYXJ0OgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGJ1aWxkIC0tZGVs +ZXRlLWNvbmZsaWN0aW5nLW91dHB1dHMKCmJ1aWxkOiBiaW4vc2VydmVyLmRhcnQKCnRlc3Q6IGNs +ZWFuIGJ1aWxkCglkYXJ0IHRlc3QKCmNsZWFuOgoJZGFydCBydW4gYnVpbGRfcnVubmVyIGNsZWFu +CglybSAtcmYgYmluL3NlcnZlci5kYXJ0CgpydW46IGJ1aWxkCglkYXJ0IHJ1biBiaW4vc2VydmVy LmRhcnQgLS1wb3J0PSQoUE9SVCkgLS10YXJnZXQ9JChGVU5DVElPTl9UQVJHRVQpCg==''', 'README.md', 'text', ''' -IyBKU09OIGV4YW1wbGUKClRoaXMgZXhhbXBsZSBkZW1vbnN0cmF0ZXMgd3JpdGluZyBhIGZ1bmN0 -aW9uIHRoYXQgYWNjZXB0cyBhbmQgcmV0dXJucyBKU09OLgoKVGhlIGJhc2ljIHNoYXBlIG9mIHRo -ZSBmdW5jdGlvbiBoYW5kbGVyIGxvb2tzIGxpa2UgdGhpczoKCmBgYGRhcnQKQENsb3VkRnVuY3Rp -b24oKQpHcmVldGluZ1Jlc3BvbnNlIGZ1bmN0aW9uKEdyZWV0aW5nUmVxdWVzdCByZXF1ZXN0KSB7 -Cn0KYGBgCgpUaGUgY2xpZW50IHdpbGwgc2VuZCBhIEpTT04gZG9jdW1lbnQgdXNpbmcgdGhlIEhU -VFAgUE9TVCBtZXRob2QuIEhlcmUncyBhbgpleGFtcGxlIHJlcXVlc3Q6CgpgYGBqc29uCnsKICAi -bmFtZSI6ICJXb3JsZCIKfQpgYGAKClRoZSBmdW5jdGlvbiB3aWxsIHNlbmQgYSBKU09OIGRvY3Vt -ZW50IGFzIHRoZSByZXNwb25zZS4gSGVyZSdzIGFuIGV4YW1wbGUKcmVzcG9uc2UgYWZ0ZXIgcmVj -ZWl2aW5nIHRoZSBhYm92ZSByZXF1ZXN0OgoKYGBganNvbgp7CiAgInNhbHV0YXRpb24iOiAiSGVs -bG8iLAogICJuYW1lIjogIldvcmxkIgp9CmBgYAoKVGhlIEZ1bmN0aW9ucyBGcmFtZXdvcmsgcGFy -c2VzIHRoZSByZXF1ZXN0IGRhdGEgdG8gZml0IHRoZSBzaGFwZSBvZiBhCmBHcmVldGluZ1JlcXVl -c3RgIG9iamVjdCBmb3IgeW91LiBCZWNhdXNlIGEgbmFtZSBtaWdodCBub3QgaGF2ZSBiZWVuIHNl -bnQgd2l0aAp0aGUgcmVxdWVzdCwgdGhlIGZ1bmN0aW9uIGltcGxlbWVudGF0aW9uIHByb3ZpZGVz -IGEgZGVmYXVsdCBuYW1lOiBgV29ybGRgLgoKYGBgZGFydApAQ2xvdWRGdW5jdGlvbigpCkdyZWV0 -aW5nUmVzcG9uc2UgZnVuY3Rpb24oR3JlZXRpbmdSZXF1ZXN0IHJlcXVlc3QpIHsKICBmaW5hbCBu -YW1lID0gcmVxdWVzdC5uYW1lID8/ICdXb3JsZCc7Cn0KYGBgCgpGaW5hbGx5LCB0aGUgZnVuY3Rp -b24gY3JlYXRlcyBhbiBvYmplY3QgcmV0dXJucyBpdC4gVGhlIEZ1bmN0aW9ucyBGcmFtZXdvcmsg -d2lsbAp0YWtlIHRoaXMgYW5kIGF0dGVtcHQgImRvIHRoZSByaWdodCIgdGhpbmcuIEluIHRoaXMg -Y2FzZSwgdGhlIGZ1bmN0aW9uIGlzIHR5cGVkCnRvIHJldHVybiBhIGBGdXR1cmVPcjxHcmVldGlu -Z1Jlc3BvbnNlPmAsIHdoaWNoIGhhcyBhIGB0b0pzb24oKWAgbWV0aG9kLCBzbyB0aGUKZnJhbWV3 -b3JrIHdpbGwgaW52b2tlIHRoaXMsIHRoZW4gc2V0IHRoZSByZXNwb25zZSBib2R5IHRvIHRoZSBz -dHJpbmdpZmllZCByZXN1bHQKYW5kIHNldCB0aGUgcmVzcG9uc2UgaGVhZGVyIChgY29udGVudC10 -eXBlYCkgdG8gYGFwcGxpY2F0aW9uL2pzb25gKS4KCmBgYGRhcnQKQENsb3VkRnVuY3Rpb24oKQpH -cmVldGluZ1Jlc3BvbnNlIGZ1bmN0aW9uKE1hcDxTdHJpbmcsIGR5bmFtaWM+IHJlcXVlc3QpIHsK -ICBmaW5hbCBuYW1lID0gcmVxdWVzdFsnbmFtZSddIGFzIFN0cmluZyA/PyAnV29ybGQnOwogIGZp -bmFsIGpzb24gPSBHcmVldGluZ1Jlc3BvbnNlKHNhbHV0YXRpb246ICdIZWxsbycsIG5hbWU6IG5h -bWUpOwogIHJldHVybiBqc29uOwp9CmBgYAoKVGhlIGZ1bGwgY29kZSBpcyBzaG93biBiZWxvdzoK -CmxpYi9mdW5jdGlvbnMuZGFydAoKYGBgZGFydAppbXBvcnQgJ2RhcnQ6YXN5bmMnOwoKaW1wb3J0 -ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvZnVuY3Rpb25zX2ZyYW1ld29yay5kYXJ0JzsK -aW1wb3J0ICdwYWNrYWdlOmpzb25fYW5ub3RhdGlvbi9qc29uX2Fubm90YXRpb24uZGFydCc7Cgpw -YXJ0ICdmdW5jdGlvbnMuZy5kYXJ0JzsKCkBKc29uU2VyaWFsaXphYmxlKCkKY2xhc3MgR3JlZXRp -bmdSZXF1ZXN0IHsKICBmaW5hbCBTdHJpbmc/IG5hbWU7CgogIEdyZWV0aW5nUmVxdWVzdCh7dGhp -cy5uYW1lfSk7CgovLyBUaGlzIGNsYXNzIGFsc28gaW5jbHVkZXMgdHdvIG1hcnNoYWxsaW5nIG1l -dGhvZHMgdGhhdCBhcmUKLy8gc3RhbmRhcmQgYm9pbGVycGxhdGUgdGhhdCBkZXBlbmQgb24gZ2Vu -ZXJhdGVkIGNvZGUgaW4gJ2Z1bmN0aW9ucy5nLmRhcnQnCgovLyBUbyBoZWxwIHdpdGggdGVzdGlu -ZywgdGhpcyBjbGFzcyBhbHNvIG92ZXJyaWRlcyB0aGUgZXF1YWxpdHkgKGA9PWApCi8vIG9wZXJh -dG9yLCBhbmQgdGhlcmVmb3JlIGFsc28gYGhhc2hDb2RlYC4KfQoKQEpzb25TZXJpYWxpemFibGUo -KQpjbGFzcyBHcmVldGluZ1Jlc3BvbnNlIHsKICBmaW5hbCBTdHJpbmcgc2FsdXRhdGlvbjsKICBm -aW5hbCBTdHJpbmcgbmFtZTsKCiAgR3JlZXRpbmdSZXNwb25zZSh7cmVxdWlyZWQgdGhpcy5zYWx1 -dGF0aW9uLCByZXF1aXJlZCB0aGlzLm5hbWV9KTsKCi8vIFRoaXMgIGNsYXNzIGFsc28gaW5jbHVk -ZXMgdHdvIG1hcnNoYWxsaW5nIG1ldGhvZHMgdGhhdCBhcmUKLy8gc3RhbmRhcmQgYm9pbGVycGxh -dGUgdGhhdCBkZXBlbmQgb24gZ2VuZXJhdGVkIGNvZGUgaW4gJ2Z1bmN0aW9ucy5nLmRhcnQnCgov -LyBUbyBoZWxwIHdpdGggdGVzdGluZywgdGhpcyBjbGFzcyBhbHNvIG92ZXJyaWRlcyB0aGUgZXF1 -YWxpdHkgKGA9PWApCi8vIG9wZXJhdG9yLCBhbmQgdGhlcmVmb3JlIGFsc28gYGhhc2hDb2RlYC4K -fQoKQENsb3VkRnVuY3Rpb24oKQpHcmVldGluZ1Jlc3BvbnNlIGZ1bmN0aW9uKEdyZWV0aW5nUmVx -dWVzdCByZXF1ZXN0KSB7CiAgZmluYWwgbmFtZSA9IHJlcXVlc3QubmFtZSA/PyAnV29ybGQnOwog -IGZpbmFsIGpzb24gPSBHcmVldGluZ1Jlc3BvbnNlKHNhbHV0YXRpb246ICdIZWxsbycsIG5hbWU6 -IG5hbWUpOwogIHJldHVybiBqc29uOwp9CmBgYAoKIyMgR2VuZXJhdGUgcHJvamVjdCBmaWxlcwoK -VGhlIERhcnQgYGJ1aWxkX3J1bm5lcmAgdG9vbCBnZW5lcmF0ZXMgdGhlIGZvbGxvd2luZyBmaWxl -cwoKLSBgbGliL2Z1bmN0aW9ucy5nLmRhcnRgIC0gdGhlIHBhcnQgZmlsZSBmb3IgYEdyZWV0aW5n -UmVzcG9uc2VgIHNlcmlhbGl6YXRpb24KLSBgYmluL3NlcnZlci5kYXJ0YCAtIHRoZSBtYWluIGVu -dHJ5IHBvaW50IGZvciB0aGUgZnVuY3Rpb24gc2VydmVyIGFwcCwgd2hpY2gKICBpbnZva2VzIHRo -ZSBmdW5jdGlvbgoKUnVuIHRoZSBgYnVpbGRfcnVubmVyYCB0b29sLCBhcyBzaG93biBoZXJlOgoK -YGBgc2hlbGwKJCBkYXJ0IHJ1biBidWlsZF9ydW5uZXIgYnVpbGQKW0lORk9dIEdlbmVyYXRpbmcg -YnVpbGQgc2NyaXB0IGNvbXBsZXRlZCwgdG9vayAzMzdtcwpbSU5GT10gUmVhZGluZyBjYWNoZWQg -YXNzZXQgZ3JhcGggY29tcGxldGVkLCB0b29rIDQ4bXMKW0lORk9dIENoZWNraW5nIGZvciB1cGRh -dGVzIHNpbmNlIGxhc3QgYnVpbGQgY29tcGxldGVkLCB0b29rIDQyNm1zCltJTkZPXSBSdW5uaW5n -IGJ1aWxkIGNvbXBsZXRlZCwgdG9vayAxM21zCltJTkZPXSBDYWNoaW5nIGZpbmFsaXplZCBkZXBl -bmRlbmN5IGdyYXBoIGNvbXBsZXRlZCwgdG9vayAyOW1zCltJTkZPXSBTdWNjZWVkZWQgYWZ0ZXIg -NTFtcyB3aXRoIDAgb3V0cHV0cyAoMCBhY3Rpb25zKQpgYGAKCiMjIFRlc3QgdGhlIGZ1bmN0aW9u -CgpgYGBzaGVsbAokIGRhcnQgdGVzdAowMDowMiArMTogQWxsIHRlc3RzIHBhc3NlZCEKYGBgCgoj -IyBSdW4gdGhlIGZ1bmN0aW9uCgpgYGBzaGVsbAokIGRhcnQgcnVuIGJpbi9zZXJ2ZXIuZGFydApM -aXN0ZW5pbmcgb24gOjgwODAKYGBgCgpGcm9tIGFub3RoZXIgdGVybWluYWwsIHNlbmQgYSBKU09O -IHJlcXVlc3Q6CgpgYGBzaGVsbAokIGN1cmwgLVggUE9TVCAtSCAiY29udGVudC10eXBlOiBhcHBs -aWNhdGlvbi9qc29uIiAtZCAneyAibmFtZSI6ICJXb3JsZCIgfScgLWkgbG9jYWxob3N0OjgwODAK -SFRUUC8xLjEgMjAwIE9LCmRhdGU6IFNhdCwgMTkgRGVjIDIwMjAgMDI6MTc6NDIgR01UCmNvbnRl -bnQtbGVuZ3RoOiAzNwp4LWZyYW1lLW9wdGlvbnM6IFNBTUVPUklHSU4KY29udGVudC10eXBlOiBh -cHBsaWNhdGlvbi9qc29uCngteHNzLXByb3RlY3Rpb246IDE7IG1vZGU9YmxvY2sKeC1jb250ZW50 -LXR5cGUtb3B0aW9uczogbm9zbmlmZgpzZXJ2ZXI6IGRhcnQ6aW8gd2l0aCBTaGVsZgoKeyJzYWx1 -dGF0aW9uIjoiSGVsbG8iLCJuYW1lIjoiV29ybGQifQpgYGAKClRvb2xzIGxpa2UgW2N1cmxdIChh -bmQgW3Bvc3RtYW5dKSBhcmUgZ29vZCBmb3Igc2VuZGluZyBIVFRQIHJlcXVlc3RzLiBUaGUKb3B0 -aW9ucyB1c2VkIGluIHRoaXMgZXhhbXBsZSBhcmU6CgotIGAtWCBQT1NUYCAtIHNlbmQgYW4gSFRU -UCBQT1NUIHJlcXVlc3QKLSBgLUggImNvbnRlbnQtdHlwZTogYXBwbGljYXRpb24vanNvbiJgIC0g -c2V0IGFuIEhUVFAgaGVhZGVyIHRvIGluZGljYXRlIHRoYXQKICB0aGUgYm9keSBpcyBhIEpTT04g -ZG9jdW1lbnQKLSBgLWQgJ3sgIm5hbWUiOiAiV29ybGQiIH0nYCAtIHNldCB0aGUgcmVxdWVzdCBi -b2R5IHRvIGEgSlNPTiBkb2N1bWVudAotIGAtaWAgLSBzaG93IHRoZSByZXNwb25zZSBoZWFkZXJz -ICh0byBjb25maXJtIHRoZSByZXNwb25zZSBib2R5IGNvbnRlbnQgdHlwZSBpcwogIGFsc28gYSBK -U09OIGRvY3VtZW50KQoKVGhlIGxhc3QgbGluZSwgc2VwYXJhdGVkIGJ5IGEgYmxhbmsgbGluZSwg -cHJpbnRzIHRoZSByZXNwb25zZSBib2R5LgoKRm9yIG1vcmUgZGV0YWlscyBvbiBnZXR0aW5nIHN0 -YXJ0ZWQgb3IgdG8gc2VlIGhvdyB0byBydW4gdGhlIGZ1bmN0aW9uIGxvY2FsbHkgb24KRG9ja2Vy -IG9yIGRlcGxveSB0byBDbG91ZCBSdW4sIHNlZSB0aGVzZSBxdWljayBzdGFydCBndWlkZXM6Cgot -IFtRdWlja3N0YXJ0OiBEYXJ0XQotIFtRdWlja3N0YXJ0OiBEb2NrZXJdCi0gW1F1aWNrc3RhcnQ6 -IENsb3VkIFJ1bl0KCjwhLS0gcmVmZXJlbmNlIGxpbmtzIC0tPgpbY3VybF06IGh0dHBzOi8vY3Vy -bC5zZS9kb2NzL21hbnVhbC5odG1sCltRdWlja3N0YXJ0OiBEYXJ0XTogaHR0cHM6Ly9naXRodWIu -Y29tL0dvb2dsZUNsb3VkUGxhdGZvcm0vZnVuY3Rpb25zLWZyYW1ld29yay1kYXJ0L2Jsb2IvbWFp -bi9kb2NzL3F1aWNrc3RhcnRzLzAxLXF1aWNrc3RhcnQtZGFydC5tZApbUXVpY2tzdGFydDogRG9j -a2VyXTogaHR0cHM6Ly9naXRodWIuY29tL0dvb2dsZUNsb3VkUGxhdGZvcm0vZnVuY3Rpb25zLWZy -YW1ld29yay1kYXJ0L2Jsb2IvbWFpbi9kb2NzL3F1aWNrc3RhcnRzLzAyLXF1aWNrc3RhcnQtZG9j -a2VyLm1kCltRdWlja3N0YXJ0OiBDbG91ZCBSdW5dOiBodHRwczovL2dpdGh1Yi5jb20vR29vZ2xl -Q2xvdWRQbGF0Zm9ybS9mdW5jdGlvbnMtZnJhbWV3b3JrLWRhcnQvYmxvYi9tYWluL2RvY3MvcXVp -Y2tzdGFydHMvMDMtcXVpY2tzdGFydC1jbG91ZHJ1bi5tZApbcG9zdG1hbl06IGh0dHBzOi8vd3d3 +IyBKU09OIGV4YW1wbGUKClRoaXMgZXhhbXBsZSBkZW1vbnN0cmF0ZXMgd3JpdGluZyBhIGZ1bmN0 +aW9uIHRoYXQgYWNjZXB0cyBhbmQgcmV0dXJucyBKU09OLgoKVGhlIGJhc2ljIHNoYXBlIG9mIHRo +ZSBmdW5jdGlvbiBoYW5kbGVyIGxvb2tzIGxpa2UgdGhpczoKCmBgYGRhcnQKQENsb3VkRnVuY3Rp +b24oKQpHcmVldGluZ1Jlc3BvbnNlIGZ1bmN0aW9uKEdyZWV0aW5nUmVxdWVzdCByZXF1ZXN0KSB7 +Cn0KYGBgCgpUaGUgY2xpZW50IHdpbGwgc2VuZCBhIEpTT04gZG9jdW1lbnQgdXNpbmcgdGhlIEhU +VFAgUE9TVCBtZXRob2QuIEhlcmUncyBhbgpleGFtcGxlIHJlcXVlc3Q6CgpgYGBqc29uCnsKICAi +bmFtZSI6ICJXb3JsZCIKfQpgYGAKClRoZSBmdW5jdGlvbiB3aWxsIHNlbmQgYSBKU09OIGRvY3Vt +ZW50IGFzIHRoZSByZXNwb25zZS4gSGVyZSdzIGFuIGV4YW1wbGUKcmVzcG9uc2UgYWZ0ZXIgcmVj +ZWl2aW5nIHRoZSBhYm92ZSByZXF1ZXN0OgoKYGBganNvbgp7CiAgInNhbHV0YXRpb24iOiAiSGVs +bG8iLAogICJuYW1lIjogIldvcmxkIgp9CmBgYAoKVGhlIEZ1bmN0aW9ucyBGcmFtZXdvcmsgcGFy +c2VzIHRoZSByZXF1ZXN0IGRhdGEgdG8gZml0IHRoZSBzaGFwZSBvZiBhCmBHcmVldGluZ1JlcXVl +c3RgIG9iamVjdCBmb3IgeW91LiBCZWNhdXNlIGEgbmFtZSBtaWdodCBub3QgaGF2ZSBiZWVuIHNl +bnQgd2l0aAp0aGUgcmVxdWVzdCwgdGhlIGZ1bmN0aW9uIGltcGxlbWVudGF0aW9uIHByb3ZpZGVz +IGEgZGVmYXVsdCBuYW1lOiBgV29ybGRgLgoKYGBgZGFydApAQ2xvdWRGdW5jdGlvbigpCkdyZWV0 +aW5nUmVzcG9uc2UgZnVuY3Rpb24oR3JlZXRpbmdSZXF1ZXN0IHJlcXVlc3QpIHsKICBmaW5hbCBu +YW1lID0gcmVxdWVzdC5uYW1lID8/ICdXb3JsZCc7Cn0KYGBgCgpGaW5hbGx5LCB0aGUgZnVuY3Rp +b24gY3JlYXRlcyBhbiBvYmplY3QgcmV0dXJucyBpdC4gVGhlIEZ1bmN0aW9ucyBGcmFtZXdvcmsg +d2lsbAp0YWtlIHRoaXMgYW5kIGF0dGVtcHQgImRvIHRoZSByaWdodCIgdGhpbmcuIEluIHRoaXMg +Y2FzZSwgdGhlIGZ1bmN0aW9uIGlzIHR5cGVkCnRvIHJldHVybiBhIGBGdXR1cmVPcjxHcmVldGlu +Z1Jlc3BvbnNlPmAsIHdoaWNoIGhhcyBhIGB0b0pzb24oKWAgbWV0aG9kLCBzbyB0aGUKZnJhbWV3 +b3JrIHdpbGwgaW52b2tlIHRoaXMsIHRoZW4gc2V0IHRoZSByZXNwb25zZSBib2R5IHRvIHRoZSBz +dHJpbmdpZmllZCByZXN1bHQKYW5kIHNldCB0aGUgcmVzcG9uc2UgaGVhZGVyIChgY29udGVudC10 +eXBlYCkgdG8gYGFwcGxpY2F0aW9uL2pzb25gKS4KCmBgYGRhcnQKQENsb3VkRnVuY3Rpb24oKQpH +cmVldGluZ1Jlc3BvbnNlIGZ1bmN0aW9uKE1hcDxTdHJpbmcsIGR5bmFtaWM+IHJlcXVlc3QpIHsK +ICBmaW5hbCBuYW1lID0gcmVxdWVzdFsnbmFtZSddIGFzIFN0cmluZyA/PyAnV29ybGQnOwogIGZp +bmFsIGpzb24gPSBHcmVldGluZ1Jlc3BvbnNlKHNhbHV0YXRpb246ICdIZWxsbycsIG5hbWU6IG5h +bWUpOwogIHJldHVybiBqc29uOwp9CmBgYAoKVGhlIGZ1bGwgY29kZSBpcyBzaG93biBiZWxvdzoK +CmxpYi9mdW5jdGlvbnMuZGFydAoKYGBgZGFydAppbXBvcnQgJ2RhcnQ6YXN5bmMnOwoKaW1wb3J0 +ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvZnVuY3Rpb25zX2ZyYW1ld29yay5kYXJ0JzsK +aW1wb3J0ICdwYWNrYWdlOmpzb25fYW5ub3RhdGlvbi9qc29uX2Fubm90YXRpb24uZGFydCc7Cgpw +YXJ0ICdmdW5jdGlvbnMuZy5kYXJ0JzsKCkBKc29uU2VyaWFsaXphYmxlKCkKY2xhc3MgR3JlZXRp +bmdSZXF1ZXN0IHsKICBmaW5hbCBTdHJpbmc/IG5hbWU7CgogIEdyZWV0aW5nUmVxdWVzdCh7dGhp +cy5uYW1lfSk7CgovLyBUaGlzIGNsYXNzIGFsc28gaW5jbHVkZXMgdHdvIG1hcnNoYWxsaW5nIG1l +dGhvZHMgdGhhdCBhcmUKLy8gc3RhbmRhcmQgYm9pbGVycGxhdGUgdGhhdCBkZXBlbmQgb24gZ2Vu +ZXJhdGVkIGNvZGUgaW4gJ2Z1bmN0aW9ucy5nLmRhcnQnCgovLyBUbyBoZWxwIHdpdGggdGVzdGlu +ZywgdGhpcyBjbGFzcyBhbHNvIG92ZXJyaWRlcyB0aGUgZXF1YWxpdHkgKGA9PWApCi8vIG9wZXJh +dG9yLCBhbmQgdGhlcmVmb3JlIGFsc28gYGhhc2hDb2RlYC4KfQoKQEpzb25TZXJpYWxpemFibGUo +KQpjbGFzcyBHcmVldGluZ1Jlc3BvbnNlIHsKICBmaW5hbCBTdHJpbmcgc2FsdXRhdGlvbjsKICBm +aW5hbCBTdHJpbmcgbmFtZTsKCiAgR3JlZXRpbmdSZXNwb25zZSh7cmVxdWlyZWQgdGhpcy5zYWx1 +dGF0aW9uLCByZXF1aXJlZCB0aGlzLm5hbWV9KTsKCi8vIFRoaXMgIGNsYXNzIGFsc28gaW5jbHVk +ZXMgdHdvIG1hcnNoYWxsaW5nIG1ldGhvZHMgdGhhdCBhcmUKLy8gc3RhbmRhcmQgYm9pbGVycGxh +dGUgdGhhdCBkZXBlbmQgb24gZ2VuZXJhdGVkIGNvZGUgaW4gJ2Z1bmN0aW9ucy5nLmRhcnQnCgov +LyBUbyBoZWxwIHdpdGggdGVzdGluZywgdGhpcyBjbGFzcyBhbHNvIG92ZXJyaWRlcyB0aGUgZXF1 +YWxpdHkgKGA9PWApCi8vIG9wZXJhdG9yLCBhbmQgdGhlcmVmb3JlIGFsc28gYGhhc2hDb2RlYC4K +fQoKQENsb3VkRnVuY3Rpb24oKQpHcmVldGluZ1Jlc3BvbnNlIGZ1bmN0aW9uKEdyZWV0aW5nUmVx +dWVzdCByZXF1ZXN0KSB7CiAgZmluYWwgbmFtZSA9IHJlcXVlc3QubmFtZSA/PyAnV29ybGQnOwog +IGZpbmFsIGpzb24gPSBHcmVldGluZ1Jlc3BvbnNlKHNhbHV0YXRpb246ICdIZWxsbycsIG5hbWU6 +IG5hbWUpOwogIHJldHVybiBqc29uOwp9CmBgYAoKIyMgR2VuZXJhdGUgcHJvamVjdCBmaWxlcwoK +VGhlIERhcnQgYGJ1aWxkX3J1bm5lcmAgdG9vbCBnZW5lcmF0ZXMgdGhlIGZvbGxvd2luZyBmaWxl +cwoKLSBgbGliL2Z1bmN0aW9ucy5nLmRhcnRgIC0gdGhlIHBhcnQgZmlsZSBmb3IgYEdyZWV0aW5n +UmVzcG9uc2VgIHNlcmlhbGl6YXRpb24KLSBgYmluL3NlcnZlci5kYXJ0YCAtIHRoZSBtYWluIGVu +dHJ5IHBvaW50IGZvciB0aGUgZnVuY3Rpb24gc2VydmVyIGFwcCwgd2hpY2gKICBpbnZva2VzIHRo +ZSBmdW5jdGlvbgoKUnVuIHRoZSBgYnVpbGRfcnVubmVyYCB0b29sLCBhcyBzaG93biBoZXJlOgoK +YGBgc2hlbGwKJCBkYXJ0IHJ1biBidWlsZF9ydW5uZXIgYnVpbGQKW0lORk9dIEdlbmVyYXRpbmcg +YnVpbGQgc2NyaXB0IGNvbXBsZXRlZCwgdG9vayAzMzdtcwpbSU5GT10gUmVhZGluZyBjYWNoZWQg +YXNzZXQgZ3JhcGggY29tcGxldGVkLCB0b29rIDQ4bXMKW0lORk9dIENoZWNraW5nIGZvciB1cGRh +dGVzIHNpbmNlIGxhc3QgYnVpbGQgY29tcGxldGVkLCB0b29rIDQyNm1zCltJTkZPXSBSdW5uaW5n +IGJ1aWxkIGNvbXBsZXRlZCwgdG9vayAxM21zCltJTkZPXSBDYWNoaW5nIGZpbmFsaXplZCBkZXBl +bmRlbmN5IGdyYXBoIGNvbXBsZXRlZCwgdG9vayAyOW1zCltJTkZPXSBTdWNjZWVkZWQgYWZ0ZXIg +NTFtcyB3aXRoIDAgb3V0cHV0cyAoMCBhY3Rpb25zKQpgYGAKCiMjIFRlc3QgdGhlIGZ1bmN0aW9u +CgpgYGBzaGVsbAokIGRhcnQgdGVzdAowMDowMiArMTogQWxsIHRlc3RzIHBhc3NlZCEKYGBgCgoj +IyBSdW4gdGhlIGZ1bmN0aW9uCgpgYGBzaGVsbAokIGRhcnQgcnVuIGJpbi9zZXJ2ZXIuZGFydApM +aXN0ZW5pbmcgb24gOjgwODAKYGBgCgpGcm9tIGFub3RoZXIgdGVybWluYWwsIHNlbmQgYSBKU09O +IHJlcXVlc3Q6CgpgYGBzaGVsbAokIGN1cmwgLVggUE9TVCAtSCAiY29udGVudC10eXBlOiBhcHBs +aWNhdGlvbi9qc29uIiAtZCAneyAibmFtZSI6ICJXb3JsZCIgfScgLWkgbG9jYWxob3N0OjgwODAK +SFRUUC8xLjEgMjAwIE9LCmRhdGU6IFNhdCwgMTkgRGVjIDIwMjAgMDI6MTc6NDIgR01UCmNvbnRl +bnQtbGVuZ3RoOiAzNwp4LWZyYW1lLW9wdGlvbnM6IFNBTUVPUklHSU4KY29udGVudC10eXBlOiBh +cHBsaWNhdGlvbi9qc29uCngteHNzLXByb3RlY3Rpb246IDE7IG1vZGU9YmxvY2sKeC1jb250ZW50 +LXR5cGUtb3B0aW9uczogbm9zbmlmZgpzZXJ2ZXI6IGRhcnQ6aW8gd2l0aCBTaGVsZgoKeyJzYWx1 +dGF0aW9uIjoiSGVsbG8iLCJuYW1lIjoiV29ybGQifQpgYGAKClRvb2xzIGxpa2UgW2N1cmxdIChh +bmQgW3Bvc3RtYW5dKSBhcmUgZ29vZCBmb3Igc2VuZGluZyBIVFRQIHJlcXVlc3RzLiBUaGUKb3B0 +aW9ucyB1c2VkIGluIHRoaXMgZXhhbXBsZSBhcmU6CgotIGAtWCBQT1NUYCAtIHNlbmQgYW4gSFRU +UCBQT1NUIHJlcXVlc3QKLSBgLUggImNvbnRlbnQtdHlwZTogYXBwbGljYXRpb24vanNvbiJgIC0g +c2V0IGFuIEhUVFAgaGVhZGVyIHRvIGluZGljYXRlIHRoYXQKICB0aGUgYm9keSBpcyBhIEpTT04g +ZG9jdW1lbnQKLSBgLWQgJ3sgIm5hbWUiOiAiV29ybGQiIH0nYCAtIHNldCB0aGUgcmVxdWVzdCBi +b2R5IHRvIGEgSlNPTiBkb2N1bWVudAotIGAtaWAgLSBzaG93IHRoZSByZXNwb25zZSBoZWFkZXJz +ICh0byBjb25maXJtIHRoZSByZXNwb25zZSBib2R5IGNvbnRlbnQgdHlwZSBpcwogIGFsc28gYSBK +U09OIGRvY3VtZW50KQoKVGhlIGxhc3QgbGluZSwgc2VwYXJhdGVkIGJ5IGEgYmxhbmsgbGluZSwg +cHJpbnRzIHRoZSByZXNwb25zZSBib2R5LgoKRm9yIG1vcmUgZGV0YWlscyBvbiBnZXR0aW5nIHN0 +YXJ0ZWQgb3IgdG8gc2VlIGhvdyB0byBydW4gdGhlIGZ1bmN0aW9uIGxvY2FsbHkgb24KRG9ja2Vy +IG9yIGRlcGxveSB0byBDbG91ZCBSdW4sIHNlZSB0aGVzZSBxdWljayBzdGFydCBndWlkZXM6Cgot +IFtRdWlja3N0YXJ0OiBEYXJ0XQotIFtRdWlja3N0YXJ0OiBEb2NrZXJdCi0gW1F1aWNrc3RhcnQ6 +IENsb3VkIFJ1bl0KCjwhLS0gcmVmZXJlbmNlIGxpbmtzIC0tPgpbY3VybF06IGh0dHBzOi8vY3Vy +bC5zZS9kb2NzL21hbnVhbC5odG1sCltRdWlja3N0YXJ0OiBEYXJ0XTogaHR0cHM6Ly9naXRodWIu +Y29tL0dvb2dsZUNsb3VkUGxhdGZvcm0vZnVuY3Rpb25zLWZyYW1ld29yay1kYXJ0L2Jsb2IvbWFp +bi9kb2NzL3F1aWNrc3RhcnRzLzAxLXF1aWNrc3RhcnQtZGFydC5tZApbUXVpY2tzdGFydDogRG9j +a2VyXTogaHR0cHM6Ly9naXRodWIuY29tL0dvb2dsZUNsb3VkUGxhdGZvcm0vZnVuY3Rpb25zLWZy +YW1ld29yay1kYXJ0L2Jsb2IvbWFpbi9kb2NzL3F1aWNrc3RhcnRzLzAyLXF1aWNrc3RhcnQtZG9j +a2VyLm1kCltRdWlja3N0YXJ0OiBDbG91ZCBSdW5dOiBodHRwczovL2dpdGh1Yi5jb20vR29vZ2xl +Q2xvdWRQbGF0Zm9ybS9mdW5jdGlvbnMtZnJhbWV3b3JrLWRhcnQvYmxvYi9tYWluL2RvY3MvcXVp +Y2tzdGFydHMvMDMtcXVpY2tzdGFydC1jbG91ZHJ1bi5tZApbcG9zdG1hbl06IGh0dHBzOi8vd3d3 LnBvc3RtYW4uY29tL3Byb2R1Y3QvYXBpLWNsaWVudC8K''', 'analysis_options.yaml', 'text', ''' -IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q -ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v -cHViLmRldi9wYWNrYWdlcy9saW50cy4KaW5jbHVkZTogcGFja2FnZTpsaW50cy9yZWNvbW1lbmRl -ZC55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFuZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2Rh -cnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xpbnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFk -ZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgojICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90 -eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRlOgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmls +IyBEZWZpbmVzIGEgZGVmYXVsdCBzZXQgb2YgbGludCBydWxlcyBlbmZvcmNlZCBmb3IKIyBwcm9q +ZWN0cyBhdCBHb29nbGUuIEZvciBkZXRhaWxzIGFuZCByYXRpb25hbGUsCiMgc2VlIGh0dHBzOi8v +cHViLmRldi9wYWNrYWdlcy9saW50cy4KaW5jbHVkZTogcGFja2FnZTpsaW50cy9yZWNvbW1lbmRl +ZC55YW1sCgojIEZvciBsaW50IHJ1bGVzIGFuZCBkb2N1bWVudGF0aW9uLCBzZWUgaHR0cDovL2Rh +cnQtbGFuZy5naXRodWIuaW8vbGludGVyL2xpbnRzLgojIFVuY29tbWVudCB0byBzcGVjaWZ5IGFk +ZGl0aW9uYWwgcnVsZXMuCiMgbGludGVyOgojICAgcnVsZXM6CiMgICAgIC0gY2FtZWxfY2FzZV90 +eXBlcwoKYW5hbHl6ZXI6CiMgICBleGNsdWRlOgojICAgICAtIHBhdGgvdG8vZXhjbHVkZWQvZmls ZXMvKioK''', 'bin/server.dart', 'text', ''' -Ly8gR0VORVJBVEVEIENPREUgLSBETyBOT1QgTU9ESUZZIEJZIEhBTkQKLy8gQ29weXJpZ2h0IDIw -MjEgR29vZ2xlIExMQwovLwovLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZl -cnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBl -eGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgovLyBZb3UgbWF5IG9idGFpbiBh -IGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLy8KLy8gICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9s -aWNlbnNlcy9MSUNFTlNFLTIuMAovLwovLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBs -YXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi8vIGRpc3RyaWJ1dGVkIHVuZGVy -IHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi8vIFdJVEhP -VVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBv -ciBpbXBsaWVkLgovLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBn -b3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNl -LgoKaW1wb3J0ICdwYWNrYWdlOl9fcHJvamVjdE5hbWVfXy9mdW5jdGlvbnMuZGFydCcgYXMgZnVu -Y3Rpb25fbGlicmFyeTsKaW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvc2VydmUu -ZGFydCc7CgpGdXR1cmU8dm9pZD4gbWFpbihMaXN0PFN0cmluZz4gYXJncykgYXN5bmMgewogIGF3 -YWl0IHNlcnZlKGFyZ3MsIF9uYW1lVG9GdW5jdGlvblRhcmdldCk7Cn0KCkZ1bmN0aW9uVGFyZ2V0 -PyBfbmFtZVRvRnVuY3Rpb25UYXJnZXQoU3RyaW5nIG5hbWUpID0+IHN3aXRjaCAobmFtZSkgewog -ICAgICAnZnVuY3Rpb24nID0+IEpzb25GdW5jdGlvblRhcmdldCgKICAgICAgICAgIGZ1bmN0aW9u -X2xpYnJhcnkuZnVuY3Rpb24sCiAgICAgICAgICAoanNvbikgewogICAgICAgICAgICBpZiAoanNv -biBpcyBNYXA8U3RyaW5nLCBkeW5hbWljPikgewogICAgICAgICAgICAgIHRyeSB7CiAgICAgICAg -ICAgICAgICByZXR1cm4gZnVuY3Rpb25fbGlicmFyeS5HcmVldGluZ1JlcXVlc3QuZnJvbUpzb24o -anNvbik7CiAgICAgICAgICAgICAgfSBjYXRjaCAoZSwgc3RhY2spIHsKICAgICAgICAgICAgICAg -IHRocm93IEJhZFJlcXVlc3RFeGNlcHRpb24oCiAgICAgICAgICAgICAgICAgIDQwMCwKICAgICAg -ICAgICAgICAgICAgJ1RoZXJlIHdhcyBhbiBlcnJvciBwYXJzaW5nIHRoZSBwcm92aWRlZCBKU09O -IGRhdGEuJywKICAgICAgICAgICAgICAgICAgaW5uZXJFcnJvcjogZSwKICAgICAgICAgICAgICAg -ICAgaW5uZXJTdGFjazogc3RhY2ssCiAgICAgICAgICAgICAgICApOwogICAgICAgICAgICAgIH0K -ICAgICAgICAgICAgfQogICAgICAgICAgICB0aHJvdyBCYWRSZXF1ZXN0RXhjZXB0aW9uKAogICAg -ICAgICAgICAgIDQwMCwKICAgICAgICAgICAgICAnVGhlIHByb3ZpZGVkIEpTT04gaXMgbm90IHRo -ZSBleHBlY3RlZCB0eXBlICcKICAgICAgICAgICAgICAnYE1hcDxTdHJpbmcsIGR5bmFtaWM+YC4n -LAogICAgICAgICAgICApOwogICAgICAgICAgfSwKICAgICAgICApLAogICAgICBfID0+IG51bGwK +Ly8gR0VORVJBVEVEIENPREUgLSBETyBOT1QgTU9ESUZZIEJZIEhBTkQKLy8gQ29weXJpZ2h0IDIw +MjEgR29vZ2xlIExMQwovLwovLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZl +cnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBl +eGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgovLyBZb3UgbWF5IG9idGFpbiBh +IGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLy8KLy8gICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9s +aWNlbnNlcy9MSUNFTlNFLTIuMAovLwovLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBs +YXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi8vIGRpc3RyaWJ1dGVkIHVuZGVy +IHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi8vIFdJVEhP +VVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBv +ciBpbXBsaWVkLgovLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBn +b3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNl +LgoKaW1wb3J0ICdwYWNrYWdlOl9fcHJvamVjdE5hbWVfXy9mdW5jdGlvbnMuZGFydCcgYXMgZnVu +Y3Rpb25fbGlicmFyeTsKaW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvc2VydmUu +ZGFydCc7CgpGdXR1cmU8dm9pZD4gbWFpbihMaXN0PFN0cmluZz4gYXJncykgYXN5bmMgewogIGF3 +YWl0IHNlcnZlKGFyZ3MsIF9uYW1lVG9GdW5jdGlvblRhcmdldCk7Cn0KCkZ1bmN0aW9uVGFyZ2V0 +PyBfbmFtZVRvRnVuY3Rpb25UYXJnZXQoU3RyaW5nIG5hbWUpID0+IHN3aXRjaCAobmFtZSkgewog +ICAgICAnZnVuY3Rpb24nID0+IEpzb25GdW5jdGlvblRhcmdldCgKICAgICAgICAgIGZ1bmN0aW9u +X2xpYnJhcnkuZnVuY3Rpb24sCiAgICAgICAgICAoanNvbikgewogICAgICAgICAgICBpZiAoanNv +biBpcyBNYXA8U3RyaW5nLCBkeW5hbWljPikgewogICAgICAgICAgICAgIHRyeSB7CiAgICAgICAg +ICAgICAgICByZXR1cm4gZnVuY3Rpb25fbGlicmFyeS5HcmVldGluZ1JlcXVlc3QuZnJvbUpzb24o +anNvbik7CiAgICAgICAgICAgICAgfSBjYXRjaCAoZSwgc3RhY2spIHsKICAgICAgICAgICAgICAg +IHRocm93IEJhZFJlcXVlc3RFeGNlcHRpb24oCiAgICAgICAgICAgICAgICAgIDQwMCwKICAgICAg +ICAgICAgICAgICAgJ1RoZXJlIHdhcyBhbiBlcnJvciBwYXJzaW5nIHRoZSBwcm92aWRlZCBKU09O +IGRhdGEuJywKICAgICAgICAgICAgICAgICAgaW5uZXJFcnJvcjogZSwKICAgICAgICAgICAgICAg +ICAgaW5uZXJTdGFjazogc3RhY2ssCiAgICAgICAgICAgICAgICApOwogICAgICAgICAgICAgIH0K +ICAgICAgICAgICAgfQogICAgICAgICAgICB0aHJvdyBCYWRSZXF1ZXN0RXhjZXB0aW9uKAogICAg +ICAgICAgICAgIDQwMCwKICAgICAgICAgICAgICAnVGhlIHByb3ZpZGVkIEpTT04gaXMgbm90IHRo +ZSBleHBlY3RlZCB0eXBlICcKICAgICAgICAgICAgICAnYE1hcDxTdHJpbmcsIGR5bmFtaWM+YC4n +LAogICAgICAgICAgICApOwogICAgICAgICAgfSwKICAgICAgICApLAogICAgICBfID0+IG51bGwK ICAgIH07Cg==''', 'lib/functions.dart', 'text', ''' -Ly8gQ29weXJpZ2h0IDIwMjEgR29vZ2xlIExMQwovLwovLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBh -Y2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLy8geW91IG1heSBub3Qg -dXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgovLyBZ -b3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLy8KLy8gICAgIGh0dHA6Ly93 -d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAovLwovLyBVbmxlc3MgcmVxdWlyZWQg -YnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi8vIGRp -c3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIg -QkFTSVMsCi8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBl -aXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgovLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVj -aWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi8vIGxpbWl0YXRpb25zIHVu -ZGVyIHRoZSBMaWNlbnNlLgoKaW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvZnVu -Y3Rpb25zX2ZyYW1ld29yay5kYXJ0JzsKaW1wb3J0ICdwYWNrYWdlOmpzb25fYW5ub3RhdGlvbi9q -c29uX2Fubm90YXRpb24uZGFydCc7CgpwYXJ0ICdmdW5jdGlvbnMuZy5kYXJ0JzsKCkBKc29uU2Vy -aWFsaXphYmxlKCkKY2xhc3MgR3JlZXRpbmdSZXF1ZXN0IHsKICBmaW5hbCBTdHJpbmc/IG5hbWU7 -CgogIEdyZWV0aW5nUmVxdWVzdCh7dGhpcy5uYW1lfSk7CgogIGZhY3RvcnkgR3JlZXRpbmdSZXF1 -ZXN0LmZyb21Kc29uKE1hcDxTdHJpbmcsIGR5bmFtaWM+IGpzb24pID0+CiAgICAgIF8kR3JlZXRp -bmdSZXF1ZXN0RnJvbUpzb24oanNvbik7CgogIE1hcDxTdHJpbmcsIGR5bmFtaWM+IHRvSnNvbigp -ID0+IF8kR3JlZXRpbmdSZXF1ZXN0VG9Kc29uKHRoaXMpOwoKICBAb3ZlcnJpZGUKICBib29sIG9w -ZXJhdG9yID09KE9iamVjdCBvdGhlcikgPT4KICAgICAgb3RoZXIgaXMgR3JlZXRpbmdSZXF1ZXN0 -ICYmIG90aGVyLm5hbWUgPT0gbmFtZTsKCiAgQG92ZXJyaWRlCiAgaW50IGdldCBoYXNoQ29kZSA9 -PiBuYW1lLmhhc2hDb2RlOwp9CgpASnNvblNlcmlhbGl6YWJsZSgpCmNsYXNzIEdyZWV0aW5nUmVz -cG9uc2UgewogIGZpbmFsIFN0cmluZyBzYWx1dGF0aW9uOwogIGZpbmFsIFN0cmluZyBuYW1lOwoK -ICBHcmVldGluZ1Jlc3BvbnNlKHtyZXF1aXJlZCB0aGlzLnNhbHV0YXRpb24sIHJlcXVpcmVkIHRo -aXMubmFtZX0pOwoKICBmYWN0b3J5IEdyZWV0aW5nUmVzcG9uc2UuZnJvbUpzb24oTWFwPFN0cmlu -ZywgZHluYW1pYz4ganNvbikgPT4KICAgICAgXyRHcmVldGluZ1Jlc3BvbnNlRnJvbUpzb24oanNv -bik7CgogIE1hcDxTdHJpbmcsIGR5bmFtaWM+IHRvSnNvbigpID0+IF8kR3JlZXRpbmdSZXNwb25z -ZVRvSnNvbih0aGlzKTsKCiAgQG92ZXJyaWRlCiAgYm9vbCBvcGVyYXRvciA9PShPYmplY3Qgb3Ro -ZXIpID0+CiAgICAgIG90aGVyIGlzIEdyZWV0aW5nUmVzcG9uc2UgJiYKICAgICAgb3RoZXIuc2Fs -dXRhdGlvbiA9PSBzYWx1dGF0aW9uICYmCiAgICAgIG90aGVyLm5hbWUgPT0gbmFtZTsKCiAgQG92 -ZXJyaWRlCiAgaW50IGdldCBoYXNoQ29kZSA9PiBzYWx1dGF0aW9uLmhhc2hDb2RlIF4gbmFtZS5o -YXNoQ29kZTsKfQoKQENsb3VkRnVuY3Rpb24oKQpHcmVldGluZ1Jlc3BvbnNlIGZ1bmN0aW9uKEdy -ZWV0aW5nUmVxdWVzdCByZXF1ZXN0KSB7CiAgZmluYWwgbmFtZSA9IHJlcXVlc3QubmFtZSA/PyAn -V29ybGQnOwogIGZpbmFsIGpzb24gPSBHcmVldGluZ1Jlc3BvbnNlKHNhbHV0YXRpb246ICdIZWxs +Ly8gQ29weXJpZ2h0IDIwMjEgR29vZ2xlIExMQwovLwovLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBh +Y2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLy8geW91IG1heSBub3Qg +dXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgovLyBZ +b3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLy8KLy8gICAgIGh0dHA6Ly93 +d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAovLwovLyBVbmxlc3MgcmVxdWlyZWQg +YnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi8vIGRp +c3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIg +QkFTSVMsCi8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBl +aXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgovLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVj +aWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi8vIGxpbWl0YXRpb25zIHVu +ZGVyIHRoZSBMaWNlbnNlLgoKaW1wb3J0ICdwYWNrYWdlOmZ1bmN0aW9uc19mcmFtZXdvcmsvZnVu +Y3Rpb25zX2ZyYW1ld29yay5kYXJ0JzsKaW1wb3J0ICdwYWNrYWdlOmpzb25fYW5ub3RhdGlvbi9q +c29uX2Fubm90YXRpb24uZGFydCc7CgpwYXJ0ICdmdW5jdGlvbnMuZy5kYXJ0JzsKCkBKc29uU2Vy +aWFsaXphYmxlKCkKY2xhc3MgR3JlZXRpbmdSZXF1ZXN0IHsKICBmaW5hbCBTdHJpbmc/IG5hbWU7 +CgogIEdyZWV0aW5nUmVxdWVzdCh7dGhpcy5uYW1lfSk7CgogIGZhY3RvcnkgR3JlZXRpbmdSZXF1 +ZXN0LmZyb21Kc29uKE1hcDxTdHJpbmcsIGR5bmFtaWM+IGpzb24pID0+CiAgICAgIF8kR3JlZXRp +bmdSZXF1ZXN0RnJvbUpzb24oanNvbik7CgogIE1hcDxTdHJpbmcsIGR5bmFtaWM+IHRvSnNvbigp +ID0+IF8kR3JlZXRpbmdSZXF1ZXN0VG9Kc29uKHRoaXMpOwoKICBAb3ZlcnJpZGUKICBib29sIG9w +ZXJhdG9yID09KE9iamVjdCBvdGhlcikgPT4KICAgICAgb3RoZXIgaXMgR3JlZXRpbmdSZXF1ZXN0 +ICYmIG90aGVyLm5hbWUgPT0gbmFtZTsKCiAgQG92ZXJyaWRlCiAgaW50IGdldCBoYXNoQ29kZSA9 +PiBuYW1lLmhhc2hDb2RlOwp9CgpASnNvblNlcmlhbGl6YWJsZSgpCmNsYXNzIEdyZWV0aW5nUmVz +cG9uc2UgewogIGZpbmFsIFN0cmluZyBzYWx1dGF0aW9uOwogIGZpbmFsIFN0cmluZyBuYW1lOwoK +ICBHcmVldGluZ1Jlc3BvbnNlKHtyZXF1aXJlZCB0aGlzLnNhbHV0YXRpb24sIHJlcXVpcmVkIHRo +aXMubmFtZX0pOwoKICBmYWN0b3J5IEdyZWV0aW5nUmVzcG9uc2UuZnJvbUpzb24oTWFwPFN0cmlu +ZywgZHluYW1pYz4ganNvbikgPT4KICAgICAgXyRHcmVldGluZ1Jlc3BvbnNlRnJvbUpzb24oanNv +bik7CgogIE1hcDxTdHJpbmcsIGR5bmFtaWM+IHRvSnNvbigpID0+IF8kR3JlZXRpbmdSZXNwb25z +ZVRvSnNvbih0aGlzKTsKCiAgQG92ZXJyaWRlCiAgYm9vbCBvcGVyYXRvciA9PShPYmplY3Qgb3Ro +ZXIpID0+CiAgICAgIG90aGVyIGlzIEdyZWV0aW5nUmVzcG9uc2UgJiYKICAgICAgb3RoZXIuc2Fs +dXRhdGlvbiA9PSBzYWx1dGF0aW9uICYmCiAgICAgIG90aGVyLm5hbWUgPT0gbmFtZTsKCiAgQG92 +ZXJyaWRlCiAgaW50IGdldCBoYXNoQ29kZSA9PiBzYWx1dGF0aW9uLmhhc2hDb2RlIF4gbmFtZS5o +YXNoQ29kZTsKfQoKQENsb3VkRnVuY3Rpb24oKQpHcmVldGluZ1Jlc3BvbnNlIGZ1bmN0aW9uKEdy +ZWV0aW5nUmVxdWVzdCByZXF1ZXN0KSB7CiAgZmluYWwgbmFtZSA9IHJlcXVlc3QubmFtZSA/PyAn +V29ybGQnOwogIGZpbmFsIGpzb24gPSBHcmVldGluZ1Jlc3BvbnNlKHNhbHV0YXRpb246ICdIZWxs bycsIG5hbWU6IG5hbWUpOwogIHJldHVybiBqc29uOwp9Cg==''', 'lib/functions.g.dart', 'text', ''' -Ly8gR0VORVJBVEVEIENPREUgLSBETyBOT1QgTU9ESUZZIEJZIEhBTkQKCnBhcnQgb2YgJ2Z1bmN0 -aW9ucy5kYXJ0JzsKCi8vICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq -KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi8vIEpzb25TZXJpYWxpemFibGVHZW5l -cmF0b3IKLy8gKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq -KioqKioqKioqKioqKioqKioqKioqKioqKioKCkdyZWV0aW5nUmVxdWVzdCBfJEdyZWV0aW5nUmVx -dWVzdEZyb21Kc29uKE1hcDxTdHJpbmcsIGR5bmFtaWM+IGpzb24pID0+CiAgICBHcmVldGluZ1Jl -cXVlc3QoCiAgICAgIG5hbWU6IGpzb25bJ25hbWUnXSBhcyBTdHJpbmc/LAogICAgKTsKCk1hcDxT -dHJpbmcsIGR5bmFtaWM+IF8kR3JlZXRpbmdSZXF1ZXN0VG9Kc29uKEdyZWV0aW5nUmVxdWVzdCBp -bnN0YW5jZSkgPT4KICAgIDxTdHJpbmcsIGR5bmFtaWM+ewogICAgICAnbmFtZSc6IGluc3RhbmNl -Lm5hbWUsCiAgICB9OwoKR3JlZXRpbmdSZXNwb25zZSBfJEdyZWV0aW5nUmVzcG9uc2VGcm9tSnNv -bihNYXA8U3RyaW5nLCBkeW5hbWljPiBqc29uKSA9PgogICAgR3JlZXRpbmdSZXNwb25zZSgKICAg -ICAgc2FsdXRhdGlvbjoganNvblsnc2FsdXRhdGlvbiddIGFzIFN0cmluZywKICAgICAgbmFtZTog -anNvblsnbmFtZSddIGFzIFN0cmluZywKICAgICk7CgpNYXA8U3RyaW5nLCBkeW5hbWljPiBfJEdy -ZWV0aW5nUmVzcG9uc2VUb0pzb24oR3JlZXRpbmdSZXNwb25zZSBpbnN0YW5jZSkgPT4KICAgIDxT -dHJpbmcsIGR5bmFtaWM+ewogICAgICAnc2FsdXRhdGlvbic6IGluc3RhbmNlLnNhbHV0YXRpb24s +Ly8gR0VORVJBVEVEIENPREUgLSBETyBOT1QgTU9ESUZZIEJZIEhBTkQKCnBhcnQgb2YgJ2Z1bmN0 +aW9ucy5kYXJ0JzsKCi8vICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq +KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi8vIEpzb25TZXJpYWxpemFibGVHZW5l +cmF0b3IKLy8gKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq +KioqKioqKioqKioqKioqKioqKioqKioqKioKCkdyZWV0aW5nUmVxdWVzdCBfJEdyZWV0aW5nUmVx +dWVzdEZyb21Kc29uKE1hcDxTdHJpbmcsIGR5bmFtaWM+IGpzb24pID0+CiAgICBHcmVldGluZ1Jl +cXVlc3QoCiAgICAgIG5hbWU6IGpzb25bJ25hbWUnXSBhcyBTdHJpbmc/LAogICAgKTsKCk1hcDxT +dHJpbmcsIGR5bmFtaWM+IF8kR3JlZXRpbmdSZXF1ZXN0VG9Kc29uKEdyZWV0aW5nUmVxdWVzdCBp +bnN0YW5jZSkgPT4KICAgIDxTdHJpbmcsIGR5bmFtaWM+ewogICAgICAnbmFtZSc6IGluc3RhbmNl +Lm5hbWUsCiAgICB9OwoKR3JlZXRpbmdSZXNwb25zZSBfJEdyZWV0aW5nUmVzcG9uc2VGcm9tSnNv +bihNYXA8U3RyaW5nLCBkeW5hbWljPiBqc29uKSA9PgogICAgR3JlZXRpbmdSZXNwb25zZSgKICAg +ICAgc2FsdXRhdGlvbjoganNvblsnc2FsdXRhdGlvbiddIGFzIFN0cmluZywKICAgICAgbmFtZTog +anNvblsnbmFtZSddIGFzIFN0cmluZywKICAgICk7CgpNYXA8U3RyaW5nLCBkeW5hbWljPiBfJEdy +ZWV0aW5nUmVzcG9uc2VUb0pzb24oR3JlZXRpbmdSZXNwb25zZSBpbnN0YW5jZSkgPT4KICAgIDxT +dHJpbmcsIGR5bmFtaWM+ewogICAgICAnc2FsdXRhdGlvbic6IGluc3RhbmNlLnNhbHV0YXRpb24s CiAgICAgICduYW1lJzogaW5zdGFuY2UubmFtZSwKICAgIH07Cg==''', 'pubspec.yaml', 'text', ''' -bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBGdW5jdGlvbnMgRnJh -bWV3b3JrIHByb2plY3QgZm9yIGhhbmRsaW5nIEpTT04uCiMgdmVyc2lvbjogMC4xLjAKIyBob21l -cGFnZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KcHVibGlzaF90bzogbm9uZQoKZW52aXJvbm1l -bnQ6CiAgc2RrOiBeMy4wLjAKCmRlcGVuZGVuY2llczoKICBmdW5jdGlvbnNfZnJhbWV3b3JrOiBe -MC40LjAKICBqc29uX2Fubm90YXRpb246IF40LjguMQogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBl -bmRlbmNpZXM6CiAgYnVpbGRfcnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1 -aWxkZXI6IF4wLjQuMAogIGh0dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAganNvbl9zZXJpYWxpemFi -bGU6IF42LjAuMAogIGRhcnRfZmx1dHRlcl90ZWFtX2xpbnRzOiBeMi4wLjAKICB0ZXN0OiBeMS4x +bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBGdW5jdGlvbnMgRnJh +bWV3b3JrIHByb2plY3QgZm9yIGhhbmRsaW5nIEpTT04uCiMgdmVyc2lvbjogMC4xLjAKIyBob21l +cGFnZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KcHVibGlzaF90bzogbm9uZQoKZW52aXJvbm1l +bnQ6CiAgc2RrOiBeMy4wLjAKCmRlcGVuZGVuY2llczoKICBmdW5jdGlvbnNfZnJhbWV3b3JrOiBe +MC40LjAKICBqc29uX2Fubm90YXRpb246IF40LjguMQogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBl +bmRlbmNpZXM6CiAgYnVpbGRfcnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1 +aWxkZXI6IF4wLjQuMAogIGh0dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAganNvbl9zZXJpYWxpemFi +bGU6IF42LjAuMAogIGRhcnRfZmx1dHRlcl90ZWFtX2xpbnRzOiBeMi4wLjAKICB0ZXN0OiBeMS4x NS43CiAgdGVzdF9wcm9jZXNzOiBeMi4wLjAK''', 'test/function_test.dart', 'text', ''' -aW1wb3J0ICdkYXJ0OmNvbnZlcnQnOwppbXBvcnQgJ2RhcnQ6aW8nOwoKaW1wb3J0ICdwYWNrYWdl -Omh0dHAvaHR0cC5kYXJ0JzsKaW1wb3J0ICdwYWNrYWdlOnRlc3QvdGVzdC5kYXJ0JzsKaW1wb3J0 -ICdwYWNrYWdlOnRlc3RfcHJvY2Vzcy90ZXN0X3Byb2Nlc3MuZGFydCc7CgppbXBvcnQgJ3BhY2th -Z2U6X19wcm9qZWN0TmFtZV9fL2Z1bmN0aW9ucy5kYXJ0JzsKCmNvbnN0IGRlZmF1bHRUaW1lb3V0 -ID0gVGltZW91dChEdXJhdGlvbihzZWNvbmRzOiAzKSk7Cgp2b2lkIG1haW4oKSB7CiAgdGVzdCgn -ZGVmYXVsdHMnLCAoKSBhc3luYyB7CiAgICBmaW5hbCBwcm9jID0gYXdhaXQgVGVzdFByb2Nlc3Mu -c3RhcnQoJ2RhcnQnLCBbJ2Jpbi9zZXJ2ZXIuZGFydCddKTsKCiAgICBhd2FpdCBleHBlY3RMYXRl -cigKICAgICAgcHJvYy5zdGRvdXQsCiAgICAgIGVtaXRzVGhyb3VnaCgnTGlzdGVuaW5nIG9uIDo4 -MDgwJyksCiAgICApOwoKICAgIGNvbnN0IGJvZHkgPSAnJycKICAgIHsKICAgICAgIm5hbWUiOiAi -V29ybGQiCiAgICB9JycnOwoKICAgIGNvbnN0IGhlYWRlcnMgPSB7J2NvbnRlbnQtdHlwZSc6ICdh -cHBsaWNhdGlvbi9qc29uJ307CgogICAgZmluYWwgcmVzcG9uc2UgPSBhd2FpdCBwb3N0KAogICAg -ICBVcmkucGFyc2UoJ2h0dHA6Ly9sb2NhbGhvc3Q6ODA4MCcpLAogICAgICBoZWFkZXJzOiBoZWFk -ZXJzLAogICAgICBib2R5OiBib2R5LAogICAgKTsKICAgIGV4cGVjdChyZXNwb25zZS5zdGF0dXND -b2RlLCAyMDApOwoKICAgIGZpbmFsIGRhdGEgPSBqc29uLmRlY29kZShyZXNwb25zZS5ib2R5KSBh -cyBNYXA8U3RyaW5nLCBkeW5hbWljPjsKICAgIGZpbmFsIGFjdHVhbFJlc3BvbnNlID0gR3JlZXRp -bmdSZXNwb25zZS5mcm9tSnNvbihkYXRhKTsKCiAgICBmaW5hbCBleHBlY3RlZFJlc3BvbnNlID0K -ICAgICAgICBHcmVldGluZ1Jlc3BvbnNlKHNhbHV0YXRpb246ICdIZWxsbycsIG5hbWU6ICdXb3Js -ZCcpOwoKICAgIGV4cGVjdChhY3R1YWxSZXNwb25zZSwgZXhwZWN0ZWRSZXNwb25zZSk7CgogICAg -cHJvYy5zaWduYWwoUHJvY2Vzc1NpZ25hbC5zaWd0ZXJtKTsKICAgIGF3YWl0IHByb2Muc2hvdWxk -RXhpdCgwKTsKCiAgICBhd2FpdCBleHBlY3RMYXRlcigKICAgICAgcHJvYy5zdGRvdXQsCiAgICAg -IGVtaXRzVGhyb3VnaCgnUmVjZWl2ZWQgc2lnbmFsIFNJR1RFUk0gLSBjbG9zaW5nJyksCiAgICAp +aW1wb3J0ICdkYXJ0OmNvbnZlcnQnOwppbXBvcnQgJ2RhcnQ6aW8nOwoKaW1wb3J0ICdwYWNrYWdl +Omh0dHAvaHR0cC5kYXJ0JzsKaW1wb3J0ICdwYWNrYWdlOnRlc3QvdGVzdC5kYXJ0JzsKaW1wb3J0 +ICdwYWNrYWdlOnRlc3RfcHJvY2Vzcy90ZXN0X3Byb2Nlc3MuZGFydCc7CgppbXBvcnQgJ3BhY2th +Z2U6X19wcm9qZWN0TmFtZV9fL2Z1bmN0aW9ucy5kYXJ0JzsKCmNvbnN0IGRlZmF1bHRUaW1lb3V0 +ID0gVGltZW91dChEdXJhdGlvbihzZWNvbmRzOiAzKSk7Cgp2b2lkIG1haW4oKSB7CiAgdGVzdCgn +ZGVmYXVsdHMnLCAoKSBhc3luYyB7CiAgICBmaW5hbCBwcm9jID0gYXdhaXQgVGVzdFByb2Nlc3Mu +c3RhcnQoJ2RhcnQnLCBbJ2Jpbi9zZXJ2ZXIuZGFydCddKTsKCiAgICBhd2FpdCBleHBlY3RMYXRl +cigKICAgICAgcHJvYy5zdGRvdXQsCiAgICAgIGVtaXRzVGhyb3VnaCgnTGlzdGVuaW5nIG9uIDo4 +MDgwJyksCiAgICApOwoKICAgIGNvbnN0IGJvZHkgPSAnJycKICAgIHsKICAgICAgIm5hbWUiOiAi +V29ybGQiCiAgICB9JycnOwoKICAgIGNvbnN0IGhlYWRlcnMgPSB7J2NvbnRlbnQtdHlwZSc6ICdh +cHBsaWNhdGlvbi9qc29uJ307CgogICAgZmluYWwgcmVzcG9uc2UgPSBhd2FpdCBwb3N0KAogICAg +ICBVcmkucGFyc2UoJ2h0dHA6Ly9sb2NhbGhvc3Q6ODA4MCcpLAogICAgICBoZWFkZXJzOiBoZWFk +ZXJzLAogICAgICBib2R5OiBib2R5LAogICAgKTsKICAgIGV4cGVjdChyZXNwb25zZS5zdGF0dXND +b2RlLCAyMDApOwoKICAgIGZpbmFsIGRhdGEgPSBqc29uLmRlY29kZShyZXNwb25zZS5ib2R5KSBh +cyBNYXA8U3RyaW5nLCBkeW5hbWljPjsKICAgIGZpbmFsIGFjdHVhbFJlc3BvbnNlID0gR3JlZXRp +bmdSZXNwb25zZS5mcm9tSnNvbihkYXRhKTsKCiAgICBmaW5hbCBleHBlY3RlZFJlc3BvbnNlID0K +ICAgICAgICBHcmVldGluZ1Jlc3BvbnNlKHNhbHV0YXRpb246ICdIZWxsbycsIG5hbWU6ICdXb3Js +ZCcpOwoKICAgIGV4cGVjdChhY3R1YWxSZXNwb25zZSwgZXhwZWN0ZWRSZXNwb25zZSk7CgogICAg +cHJvYy5zaWduYWwoUHJvY2Vzc1NpZ25hbC5zaWd0ZXJtKTsKICAgIGF3YWl0IHByb2Muc2hvdWxk +RXhpdCgwKTsKCiAgICBhd2FpdCBleHBlY3RMYXRlcigKICAgICAgcHJvYy5zdGRvdXQsCiAgICAg +IGVtaXRzVGhyb3VnaCgnUmVjZWl2ZWQgc2lnbmFsIFNJR1RFUk0gLSBjbG9zaW5nJyksCiAgICAp OwogIH0sIHRpbWVvdXQ6IGRlZmF1bHRUaW1lb3V0KTsKfQo=''' ]; diff --git a/dartfn/lib/src/stagehand/stagehand.dart b/dartfn/lib/src/stagehand/stagehand.dart index d81d7786..f4b1283a 100644 --- a/dartfn/lib/src/stagehand/stagehand.dart +++ b/dartfn/lib/src/stagehand/stagehand.dart @@ -69,7 +69,7 @@ abstract class Generator implements Comparable { String projectName, GeneratorTarget target, { Map? additionalVars, - }) { + }) async { final vars = { 'projectName': normalizeProjectName(projectName), 'description': description, @@ -78,10 +78,10 @@ abstract class Generator implements Comparable { if (additionalVars != null) ...additionalVars, }; - return Future.forEach(files, (TemplateFile file) { + await Future.forEach(files, (TemplateFile file) async { final resultFile = file.runSubstitution(vars); final filePath = resultFile.path; - return target.createFile(filePath, resultFile.content); + await target.createFile(filePath, resultFile.content); }); } diff --git a/dartfn/tool/builder/src/code_generator.dart b/dartfn/tool/builder/src/code_generator.dart index 9e49cdfb..43e3e72a 100644 --- a/dartfn/tool/builder/src/code_generator.dart +++ b/dartfn/tool/builder/src/code_generator.dart @@ -111,5 +111,5 @@ String _base64encode(List bytes) { index += line.length; } - return lines.join('\r\n'); + return lines.join('\n'); } From 847d61a876e34bb89ddcdbb3e763eb870613074b Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 8 Nov 2023 18:18:35 -0800 Subject: [PATCH 10/43] chore: release latest mono_repo (#447) --- .github/workflows/lint.yml | 40 ++++++++++++++++++------------------ .github/workflows/unit.yml | 42 +++++++++++++++++++------------------- tool/ci.sh | 18 +++++++--------- 3 files changed, 48 insertions(+), 52 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7edfe70d..5332e5cd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.6.0 +# Created with package:mono_repo v6.6.1 name: Dart Lint CI on: push: @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -28,14 +28,14 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: mono_repo self validate - run: dart pub global activate mono_repo 6.6.0 + run: dart pub global activate mono_repo 6.6.1 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.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" @@ -53,12 +53,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -181,7 +181,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" @@ -191,12 +191,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -384,7 +384,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_test;commands:analyze_1" @@ -394,12 +394,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: integration_test_pub_upgrade name: integration_test; dart pub upgrade run: dart pub upgrade @@ -414,7 +414,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:master;packages:examples/fullstack/frontend;commands:format-analyze_2" @@ -424,12 +424,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa + uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 with: channel: master - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade @@ -448,7 +448,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:analyze_3" @@ -458,12 +458,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa + uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 with: channel: stable - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 53859572..43b24f4c 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.6.0 +# Created with package:mono_repo v6.6.1 name: Dart Unit CI on: push: @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -30,12 +30,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud;commands:command" @@ -87,12 +87,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -117,12 +117,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-functions_framework-integration_test;commands:test_1" @@ -246,12 +246,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -284,7 +284,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud;commands:test_0" @@ -294,12 +294,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -314,7 +314,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:google_cloud;commands:test_0" @@ -324,12 +324,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -344,12 +344,12 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade diff --git a/tool/ci.sh b/tool/ci.sh index 2dfc85d0..66935543 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,9 +1,10 @@ #!/bin/bash -# Created with package:mono_repo v6.6.0 +# Created with package:mono_repo v6.6.1 # Support built in commands on windows out of the box. + # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") -# then "flutter" is called instead of "pub". +# then "flutter pub" is called instead of "dart pub". # This assumes that the Flutter SDK has been installed in a previous step. function pub() { if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then @@ -12,18 +13,13 @@ function pub() { command dart pub "$@" fi } -# When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") -# then "flutter" is called instead of "pub". -# This assumes that the Flutter SDK has been installed in a previous step. + function format() { - if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then - command flutter format "$@" - else - command dart format "$@" - fi + command dart format "$@" } + # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") -# then "flutter" is called instead of "pub". +# then "flutter analyze" is called instead of "dart analyze". # This assumes that the Flutter SDK has been installed in a previous step. function analyze() { if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then From b4c8227a07a8e1e865af86faeeefcc1c6281aff7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:28:41 -0800 Subject: [PATCH 11/43] build(deps): bump actions/checkout from 3.5.2 to 4.1.1 (#441) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.2 to 4.1.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/8e5e7e5ab8b370d6c329ec480221332ada57f0ab...b4ffde65f46336ab88eb53be808477a3936bae11) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 6ea3fa18..668b8b08 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -35,7 +35,7 @@ jobs: sdk: stable - run: dart --version - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - run: dart pub upgrade working-directory: integration_test From 198c5c54b89ea5b9ce8f6b7435868ad3915c6435 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:29:00 -0800 Subject: [PATCH 12/43] build(deps): bump dart-lang/setup-dart from 1.5.0 to 1.6.0 (#443) Bumps [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/dart-lang/setup-dart/releases) - [Changelog](https://github.com/dart-lang/setup-dart/blob/main/CHANGELOG.md) - [Commits](https://github.com/dart-lang/setup-dart/compare/d6a63dab3335f427404425de0fbfed4686d93c4f...b64355ae6ca0b5d484f0106a033dd1388965d06d) --- updated-dependencies: - dependency-name: dart-lang/setup-dart dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 668b8b08..924ddb2b 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -30,7 +30,7 @@ jobs: with: go-version: '^1.16' - - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f + - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: stable - run: dart --version From e58ce7aa8ef3b070312f4f31629a8419c59f99a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 22:43:04 -0800 Subject: [PATCH 13/43] build(deps): bump actions/cache from 3.3.1 to 3.3.2 (#437) Bumps [actions/cache](https://github.com/actions/cache) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8...704facf57e6136b1bc63b828d79edcd491f0ee84) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 924ddb2b..b577d4a9 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;dart:2.10.0;" From 328fdc7d19bb6a24b3965bb1c0b0808011ee50aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 10:15:08 -0800 Subject: [PATCH 14/43] build(deps): bump actions/stale from 8.0.0 to 9.0.0 (#448) Bumps [actions/stale](https://github.com/actions/stale) from 8.0.0 to 9.0.0. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/1160a2240286f5da8ec72b1c0816ce2481aabf84...28ca1036281a5e5922ead5184a1bbf96e5fc984e) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/no-response.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml index 54662207..fd5b03ba 100644 --- a/.github/workflows/no-response.yml +++ b/.github/workflows/no-response.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.repository_owner == 'GoogleCloudPlatform' }} steps: - - uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 + - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e with: # Don't automatically mark inactive issues+PRs as stale. days-before-stale: -1 From ac135edd4f39cf518b59367572ecff0952eb6452 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 10:15:33 -0800 Subject: [PATCH 15/43] build(deps): bump actions/setup-go from 4.1.0 to 5.0.0 (#449) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/93397bea11091df50f3d7e59dc26a7711a8bcfbe...0c52d547c9bc32b1aa3301fd7a9cb496313a4491) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index b577d4a9..dd2470d1 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -26,7 +26,7 @@ jobs: os:ubuntu-latest - name: Setup Go - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe + uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 with: go-version: '^1.16' From 59c478ca00b5d1299667627d8e44d4e3fd28ce44 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Tue, 6 Feb 2024 14:54:57 -0800 Subject: [PATCH 16/43] Chore: update protos for firestore example (#452) --- .../events/cloud/firestore/v1/data.pb.dart | 66 ++-- .../events/cloud/firestore/v1/events.pb.dart | 317 +++++++++++++++++- .../cloud/firestore/v1/events.pbjson.dart | 100 ++++++ .../lib/src/google/protobuf/struct.pb.dart | 28 +- .../lib/src/google/protobuf/timestamp.pb.dart | 8 +- .../lib/src/google/type/latlng.pb.dart | 8 +- 6 files changed, 460 insertions(+), 67 deletions(-) diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart index 7103ed79..8547c165 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart @@ -25,17 +25,17 @@ class DocumentEventData extends $pb.GeneratedMessage { Document? oldValue, DocumentMask? updateMask, }) { - final result = create(); + final $result = create(); if (value != null) { - result.value = value; + $result.value = value; } if (oldValue != null) { - result.oldValue = oldValue; + $result.oldValue = oldValue; } if (updateMask != null) { - result.updateMask = updateMask; + $result.updateMask = updateMask; } - return result; + return $result; } DocumentEventData._() : super(); factory DocumentEventData.fromBuffer($core.List<$core.int> i, @@ -135,11 +135,11 @@ class DocumentMask extends $pb.GeneratedMessage { factory DocumentMask({ $core.Iterable<$core.String>? fieldPaths, }) { - final result = create(); + final $result = create(); if (fieldPaths != null) { - result.fieldPaths.addAll(fieldPaths); + $result.fieldPaths.addAll(fieldPaths); } - return result; + return $result; } DocumentMask._() : super(); factory DocumentMask.fromBuffer($core.List<$core.int> i, @@ -195,20 +195,20 @@ class Document extends $pb.GeneratedMessage { $0.Timestamp? createTime, $0.Timestamp? updateTime, }) { - final result = create(); + final $result = create(); if (name != null) { - result.name = name; + $result.name = name; } if (fields != null) { - result.fields.addAll(fields); + $result.fields.addAll(fields); } if (createTime != null) { - result.createTime = createTime; + $result.createTime = createTime; } if (updateTime != null) { - result.updateTime = updateTime; + $result.updateTime = updateTime; } - return result; + return $result; } Document._() : super(); factory Document.fromBuffer($core.List<$core.int> i, @@ -368,41 +368,41 @@ class Value extends $pb.GeneratedMessage { $core.String? stringValue, $core.List<$core.int>? bytesValue, }) { - final result = create(); + final $result = create(); if (booleanValue != null) { - result.booleanValue = booleanValue; + $result.booleanValue = booleanValue; } if (integerValue != null) { - result.integerValue = integerValue; + $result.integerValue = integerValue; } if (doubleValue != null) { - result.doubleValue = doubleValue; + $result.doubleValue = doubleValue; } if (referenceValue != null) { - result.referenceValue = referenceValue; + $result.referenceValue = referenceValue; } if (mapValue != null) { - result.mapValue = mapValue; + $result.mapValue = mapValue; } if (geoPointValue != null) { - result.geoPointValue = geoPointValue; + $result.geoPointValue = geoPointValue; } if (arrayValue != null) { - result.arrayValue = arrayValue; + $result.arrayValue = arrayValue; } if (timestampValue != null) { - result.timestampValue = timestampValue; + $result.timestampValue = timestampValue; } if (nullValue != null) { - result.nullValue = nullValue; + $result.nullValue = nullValue; } if (stringValue != null) { - result.stringValue = stringValue; + $result.stringValue = stringValue; } if (bytesValue != null) { - result.bytesValue = bytesValue; + $result.bytesValue = bytesValue; } - return result; + return $result; } Value._() : super(); factory Value.fromBuffer($core.List<$core.int> i, @@ -650,11 +650,11 @@ class ArrayValue extends $pb.GeneratedMessage { factory ArrayValue({ $core.Iterable? values, }) { - final result = create(); + final $result = create(); if (values != null) { - result.values.addAll(values); + $result.values.addAll(values); } - return result; + return $result; } ArrayValue._() : super(); factory ArrayValue.fromBuffer($core.List<$core.int> i, @@ -704,11 +704,11 @@ class MapValue extends $pb.GeneratedMessage { factory MapValue({ $core.Map<$core.String, Value>? fields, }) { - final result = create(); + final $result = create(); if (fields != null) { - result.fields.addAll(fields); + $result.fields.addAll(fields); } - return result; + return $result; } MapValue._() : super(); factory MapValue.fromBuffer($core.List<$core.int> i, diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart index 45495112..348495b4 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart @@ -20,11 +20,11 @@ class DocumentCreatedEvent extends $pb.GeneratedMessage { factory DocumentCreatedEvent({ $3.DocumentEventData? data, }) { - final result = create(); + final $result = create(); if (data != null) { - result.data = data; + $result.data = data; } - return result; + return $result; } DocumentCreatedEvent._() : super(); factory DocumentCreatedEvent.fromBuffer($core.List<$core.int> i, @@ -88,11 +88,11 @@ class DocumentUpdatedEvent extends $pb.GeneratedMessage { factory DocumentUpdatedEvent({ $3.DocumentEventData? data, }) { - final result = create(); + final $result = create(); if (data != null) { - result.data = data; + $result.data = data; } - return result; + return $result; } DocumentUpdatedEvent._() : super(); factory DocumentUpdatedEvent.fromBuffer($core.List<$core.int> i, @@ -156,11 +156,11 @@ class DocumentDeletedEvent extends $pb.GeneratedMessage { factory DocumentDeletedEvent({ $3.DocumentEventData? data, }) { - final result = create(); + final $result = create(); if (data != null) { - result.data = data; + $result.data = data; } - return result; + return $result; } DocumentDeletedEvent._() : super(); factory DocumentDeletedEvent.fromBuffer($core.List<$core.int> i, @@ -225,11 +225,11 @@ class DocumentWrittenEvent extends $pb.GeneratedMessage { factory DocumentWrittenEvent({ $3.DocumentEventData? data, }) { - final result = create(); + final $result = create(); if (data != null) { - result.data = data; + $result.data = data; } - return result; + return $result; } DocumentWrittenEvent._() : super(); factory DocumentWrittenEvent.fromBuffer($core.List<$core.int> i, @@ -288,6 +288,299 @@ class DocumentWrittenEvent extends $pb.GeneratedMessage { $3.DocumentEventData ensureData() => $_ensure(0); } +/// The CloudEvent with Auth Context raised when a Firestore document is created. +class DocumentCreatedEventWithAuthContext extends $pb.GeneratedMessage { + factory DocumentCreatedEventWithAuthContext({ + $3.DocumentEventData? data, + }) { + final $result = create(); + if (data != null) { + $result.data = data; + } + return $result; + } + DocumentCreatedEventWithAuthContext._() : super(); + factory DocumentCreatedEventWithAuthContext.fromBuffer( + $core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory DocumentCreatedEventWithAuthContext.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'DocumentCreatedEventWithAuthContext', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'google.events.cloud.firestore.v1'), + createEmptyInstance: create) + ..aOM<$3.DocumentEventData>(1, _omitFieldNames ? '' : 'data', + subBuilder: $3.DocumentEventData.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + DocumentCreatedEventWithAuthContext clone() => + DocumentCreatedEventWithAuthContext()..mergeFromMessage(this); + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + DocumentCreatedEventWithAuthContext copyWith( + void Function(DocumentCreatedEventWithAuthContext) updates) => + super.copyWith((message) => + updates(message as DocumentCreatedEventWithAuthContext)) + as DocumentCreatedEventWithAuthContext; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static DocumentCreatedEventWithAuthContext create() => + DocumentCreatedEventWithAuthContext._(); + DocumentCreatedEventWithAuthContext createEmptyInstance() => create(); + static $pb.PbList createRepeated() => + $pb.PbList(); + @$core.pragma('dart2js:noInline') + static DocumentCreatedEventWithAuthContext getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor< + DocumentCreatedEventWithAuthContext>(create); + static DocumentCreatedEventWithAuthContext? _defaultInstance; + + /// The data associated with the event. + @$pb.TagNumber(1) + $3.DocumentEventData get data => $_getN(0); + @$pb.TagNumber(1) + set data($3.DocumentEventData v) { + setField(1, v); + } + + @$pb.TagNumber(1) + $core.bool hasData() => $_has(0); + @$pb.TagNumber(1) + void clearData() => clearField(1); + @$pb.TagNumber(1) + $3.DocumentEventData ensureData() => $_ensure(0); +} + +/// The CloudEvent with Auth Context raised when a Firestore document is updated. +class DocumentUpdatedEventWithAuthContext extends $pb.GeneratedMessage { + factory DocumentUpdatedEventWithAuthContext({ + $3.DocumentEventData? data, + }) { + final $result = create(); + if (data != null) { + $result.data = data; + } + return $result; + } + DocumentUpdatedEventWithAuthContext._() : super(); + factory DocumentUpdatedEventWithAuthContext.fromBuffer( + $core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory DocumentUpdatedEventWithAuthContext.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'DocumentUpdatedEventWithAuthContext', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'google.events.cloud.firestore.v1'), + createEmptyInstance: create) + ..aOM<$3.DocumentEventData>(1, _omitFieldNames ? '' : 'data', + subBuilder: $3.DocumentEventData.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + DocumentUpdatedEventWithAuthContext clone() => + DocumentUpdatedEventWithAuthContext()..mergeFromMessage(this); + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + DocumentUpdatedEventWithAuthContext copyWith( + void Function(DocumentUpdatedEventWithAuthContext) updates) => + super.copyWith((message) => + updates(message as DocumentUpdatedEventWithAuthContext)) + as DocumentUpdatedEventWithAuthContext; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static DocumentUpdatedEventWithAuthContext create() => + DocumentUpdatedEventWithAuthContext._(); + DocumentUpdatedEventWithAuthContext createEmptyInstance() => create(); + static $pb.PbList createRepeated() => + $pb.PbList(); + @$core.pragma('dart2js:noInline') + static DocumentUpdatedEventWithAuthContext getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor< + DocumentUpdatedEventWithAuthContext>(create); + static DocumentUpdatedEventWithAuthContext? _defaultInstance; + + /// The data associated with the event. + @$pb.TagNumber(1) + $3.DocumentEventData get data => $_getN(0); + @$pb.TagNumber(1) + set data($3.DocumentEventData v) { + setField(1, v); + } + + @$pb.TagNumber(1) + $core.bool hasData() => $_has(0); + @$pb.TagNumber(1) + void clearData() => clearField(1); + @$pb.TagNumber(1) + $3.DocumentEventData ensureData() => $_ensure(0); +} + +/// The CloudEvent with Auth Context raised when a Firestore document is deleted. +class DocumentDeletedEventWithAuthContext extends $pb.GeneratedMessage { + factory DocumentDeletedEventWithAuthContext({ + $3.DocumentEventData? data, + }) { + final $result = create(); + if (data != null) { + $result.data = data; + } + return $result; + } + DocumentDeletedEventWithAuthContext._() : super(); + factory DocumentDeletedEventWithAuthContext.fromBuffer( + $core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory DocumentDeletedEventWithAuthContext.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'DocumentDeletedEventWithAuthContext', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'google.events.cloud.firestore.v1'), + createEmptyInstance: create) + ..aOM<$3.DocumentEventData>(1, _omitFieldNames ? '' : 'data', + subBuilder: $3.DocumentEventData.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + DocumentDeletedEventWithAuthContext clone() => + DocumentDeletedEventWithAuthContext()..mergeFromMessage(this); + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + DocumentDeletedEventWithAuthContext copyWith( + void Function(DocumentDeletedEventWithAuthContext) updates) => + super.copyWith((message) => + updates(message as DocumentDeletedEventWithAuthContext)) + as DocumentDeletedEventWithAuthContext; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static DocumentDeletedEventWithAuthContext create() => + DocumentDeletedEventWithAuthContext._(); + DocumentDeletedEventWithAuthContext createEmptyInstance() => create(); + static $pb.PbList createRepeated() => + $pb.PbList(); + @$core.pragma('dart2js:noInline') + static DocumentDeletedEventWithAuthContext getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor< + DocumentDeletedEventWithAuthContext>(create); + static DocumentDeletedEventWithAuthContext? _defaultInstance; + + /// The data associated with the event. + @$pb.TagNumber(1) + $3.DocumentEventData get data => $_getN(0); + @$pb.TagNumber(1) + set data($3.DocumentEventData v) { + setField(1, v); + } + + @$pb.TagNumber(1) + $core.bool hasData() => $_has(0); + @$pb.TagNumber(1) + void clearData() => clearField(1); + @$pb.TagNumber(1) + $3.DocumentEventData ensureData() => $_ensure(0); +} + +/// The CloudEvent with Auth Context raised when a Firestore document is created, +/// updated or deleted. +class DocumentWrittenEventWithAuthContext extends $pb.GeneratedMessage { + factory DocumentWrittenEventWithAuthContext({ + $3.DocumentEventData? data, + }) { + final $result = create(); + if (data != null) { + $result.data = data; + } + return $result; + } + DocumentWrittenEventWithAuthContext._() : super(); + factory DocumentWrittenEventWithAuthContext.fromBuffer( + $core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory DocumentWrittenEventWithAuthContext.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'DocumentWrittenEventWithAuthContext', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'google.events.cloud.firestore.v1'), + createEmptyInstance: create) + ..aOM<$3.DocumentEventData>(1, _omitFieldNames ? '' : 'data', + subBuilder: $3.DocumentEventData.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + DocumentWrittenEventWithAuthContext clone() => + DocumentWrittenEventWithAuthContext()..mergeFromMessage(this); + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + DocumentWrittenEventWithAuthContext copyWith( + void Function(DocumentWrittenEventWithAuthContext) updates) => + super.copyWith((message) => + updates(message as DocumentWrittenEventWithAuthContext)) + as DocumentWrittenEventWithAuthContext; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static DocumentWrittenEventWithAuthContext create() => + DocumentWrittenEventWithAuthContext._(); + DocumentWrittenEventWithAuthContext createEmptyInstance() => create(); + static $pb.PbList createRepeated() => + $pb.PbList(); + @$core.pragma('dart2js:noInline') + static DocumentWrittenEventWithAuthContext getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor< + DocumentWrittenEventWithAuthContext>(create); + static DocumentWrittenEventWithAuthContext? _defaultInstance; + + /// The data associated with the event. + @$pb.TagNumber(1) + $3.DocumentEventData get data => $_getN(0); + @$pb.TagNumber(1) + set data($3.DocumentEventData v) { + setField(1, v); + } + + @$pb.TagNumber(1) + $core.bool hasData() => $_has(0); + @$pb.TagNumber(1) + void clearData() => clearField(1); + @$pb.TagNumber(1) + $3.DocumentEventData ensureData() => $_ensure(0); +} + const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart index 745023db..d1084680 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart @@ -104,3 +104,103 @@ final $typed_data.Uint8List documentWrittenEventDescriptor = $convert.base64Deco '91ZC5maXJlc3RvcmUudjEuRG9jdW1lbnRFdmVudERhdGFSBGRhdGE6V7L42CwqZ29vZ2xlLmNs' 'b3VkLmZpcmVzdG9yZS5kb2N1bWVudC52MS53cml0dGVuyvjYLAhkYXRhYmFzZcr42CwJbmFtZX' 'NwYWNlyvjYLAhkb2N1bWVudA=='); + +@$core.Deprecated('Use documentCreatedEventWithAuthContextDescriptor instead') +const DocumentCreatedEventWithAuthContext$json = { + '1': 'DocumentCreatedEventWithAuthContext', + '2': [ + { + '1': 'data', + '3': 1, + '4': 1, + '5': 11, + '6': '.google.events.cloud.firestore.v1.DocumentEventData', + '10': 'data' + }, + ], + '7': {}, +}; + +/// Descriptor for `DocumentCreatedEventWithAuthContext`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List documentCreatedEventWithAuthContextDescriptor = + $convert.base64Decode( + 'CiNEb2N1bWVudENyZWF0ZWRFdmVudFdpdGhBdXRoQ29udGV4dBJHCgRkYXRhGAEgASgLMjMuZ2' + '9vZ2xlLmV2ZW50cy5jbG91ZC5maXJlc3RvcmUudjEuRG9jdW1lbnRFdmVudERhdGFSBGRhdGE6' + 'f7L42Cw6Z29vZ2xlLmNsb3VkLmZpcmVzdG9yZS5kb2N1bWVudC52MS5jcmVhdGVkLndpdGhBdX' + 'RoQ29udGV4dMr42CwIZGF0YWJhc2XK+NgsCW5hbWVzcGFjZcr42CwIZG9jdW1lbnTK+NgsCGF1' + 'dGh0eXBlyvjYLAZhdXRoaWQ='); + +@$core.Deprecated('Use documentUpdatedEventWithAuthContextDescriptor instead') +const DocumentUpdatedEventWithAuthContext$json = { + '1': 'DocumentUpdatedEventWithAuthContext', + '2': [ + { + '1': 'data', + '3': 1, + '4': 1, + '5': 11, + '6': '.google.events.cloud.firestore.v1.DocumentEventData', + '10': 'data' + }, + ], + '7': {}, +}; + +/// Descriptor for `DocumentUpdatedEventWithAuthContext`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List documentUpdatedEventWithAuthContextDescriptor = + $convert.base64Decode( + 'CiNEb2N1bWVudFVwZGF0ZWRFdmVudFdpdGhBdXRoQ29udGV4dBJHCgRkYXRhGAEgASgLMjMuZ2' + '9vZ2xlLmV2ZW50cy5jbG91ZC5maXJlc3RvcmUudjEuRG9jdW1lbnRFdmVudERhdGFSBGRhdGE6' + 'f7L42Cw6Z29vZ2xlLmNsb3VkLmZpcmVzdG9yZS5kb2N1bWVudC52MS51cGRhdGVkLndpdGhBdX' + 'RoQ29udGV4dMr42CwIZGF0YWJhc2XK+NgsCW5hbWVzcGFjZcr42CwIZG9jdW1lbnTK+NgsCGF1' + 'dGh0eXBlyvjYLAZhdXRoaWQ='); + +@$core.Deprecated('Use documentDeletedEventWithAuthContextDescriptor instead') +const DocumentDeletedEventWithAuthContext$json = { + '1': 'DocumentDeletedEventWithAuthContext', + '2': [ + { + '1': 'data', + '3': 1, + '4': 1, + '5': 11, + '6': '.google.events.cloud.firestore.v1.DocumentEventData', + '10': 'data' + }, + ], + '7': {}, +}; + +/// Descriptor for `DocumentDeletedEventWithAuthContext`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List documentDeletedEventWithAuthContextDescriptor = + $convert.base64Decode( + 'CiNEb2N1bWVudERlbGV0ZWRFdmVudFdpdGhBdXRoQ29udGV4dBJHCgRkYXRhGAEgASgLMjMuZ2' + '9vZ2xlLmV2ZW50cy5jbG91ZC5maXJlc3RvcmUudjEuRG9jdW1lbnRFdmVudERhdGFSBGRhdGE6' + 'f7L42Cw6Z29vZ2xlLmNsb3VkLmZpcmVzdG9yZS5kb2N1bWVudC52MS5kZWxldGVkLndpdGhBdX' + 'RoQ29udGV4dMr42CwIZGF0YWJhc2XK+NgsCW5hbWVzcGFjZcr42CwIZG9jdW1lbnTK+NgsCGF1' + 'dGh0eXBlyvjYLAZhdXRoaWQ='); + +@$core.Deprecated('Use documentWrittenEventWithAuthContextDescriptor instead') +const DocumentWrittenEventWithAuthContext$json = { + '1': 'DocumentWrittenEventWithAuthContext', + '2': [ + { + '1': 'data', + '3': 1, + '4': 1, + '5': 11, + '6': '.google.events.cloud.firestore.v1.DocumentEventData', + '10': 'data' + }, + ], + '7': {}, +}; + +/// Descriptor for `DocumentWrittenEventWithAuthContext`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List documentWrittenEventWithAuthContextDescriptor = + $convert.base64Decode( + 'CiNEb2N1bWVudFdyaXR0ZW5FdmVudFdpdGhBdXRoQ29udGV4dBJHCgRkYXRhGAEgASgLMjMuZ2' + '9vZ2xlLmV2ZW50cy5jbG91ZC5maXJlc3RvcmUudjEuRG9jdW1lbnRFdmVudERhdGFSBGRhdGE6' + 'f7L42Cw6Z29vZ2xlLmNsb3VkLmZpcmVzdG9yZS5kb2N1bWVudC52MS53cml0dGVuLndpdGhBdX' + 'RoQ29udGV4dMr42CwIZGF0YWJhc2XK+NgsCW5hbWVzcGFjZcr42CwIZG9jdW1lbnTK+NgsCGF1' + 'dGh0eXBlyvjYLAZhdXRoaWQ='); diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart index fa1e3e72..42d55e42 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart @@ -30,11 +30,11 @@ class Struct extends $pb.GeneratedMessage with $mixin.StructMixin { factory Struct({ $core.Map<$core.String, Value>? fields, }) { - final result = create(); + final $result = create(); if (fields != null) { - result.fields.addAll(fields); + $result.fields.addAll(fields); } - return result; + return $result; } Struct._() : super(); factory Struct.fromBuffer($core.List<$core.int> i, @@ -111,26 +111,26 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { Struct? structValue, ListValue? listValue, }) { - final result = create(); + final $result = create(); if (nullValue != null) { - result.nullValue = nullValue; + $result.nullValue = nullValue; } if (numberValue != null) { - result.numberValue = numberValue; + $result.numberValue = numberValue; } if (stringValue != null) { - result.stringValue = stringValue; + $result.stringValue = stringValue; } if (boolValue != null) { - result.boolValue = boolValue; + $result.boolValue = boolValue; } if (structValue != null) { - result.structValue = structValue; + $result.structValue = structValue; } if (listValue != null) { - result.listValue = listValue; + $result.listValue = listValue; } - return result; + return $result; } Value._() : super(); factory Value.fromBuffer($core.List<$core.int> i, @@ -285,11 +285,11 @@ class ListValue extends $pb.GeneratedMessage with $mixin.ListValueMixin { factory ListValue({ $core.Iterable? values, }) { - final result = create(); + final $result = create(); if (values != null) { - result.values.addAll(values); + $result.values.addAll(values); } - return result; + return $result; } ListValue._() : super(); factory ListValue.fromBuffer($core.List<$core.int> i, diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart index 3282fc27..48e11b93 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart @@ -109,14 +109,14 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin { $fixnum.Int64? seconds, $core.int? nanos, }) { - final result = create(); + final $result = create(); if (seconds != null) { - result.seconds = seconds; + $result.seconds = seconds; } if (nanos != null) { - result.nanos = nanos; + $result.nanos = nanos; } - return result; + return $result; } Timestamp._() : super(); factory Timestamp.fromBuffer($core.List<$core.int> i, diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart index dc665bcf..392a4fa5 100644 --- a/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart @@ -23,14 +23,14 @@ class LatLng extends $pb.GeneratedMessage { $core.double? latitude, $core.double? longitude, }) { - final result = create(); + final $result = create(); if (latitude != null) { - result.latitude = latitude; + $result.latitude = latitude; } if (longitude != null) { - result.longitude = longitude; + $result.longitude = longitude; } - return result; + return $result; } LatLng._() : super(); factory LatLng.fromBuffer($core.List<$core.int> i, From b1ae6ae8b2782b50b869f87c96a9d48cf00fbcc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 10:34:45 -0800 Subject: [PATCH 17/43] build(deps): bump dart-lang/setup-dart from 1.6.0 to 1.6.2 (#450) Bumps [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart) from 1.6.0 to 1.6.2. - [Release notes](https://github.com/dart-lang/setup-dart/releases) - [Changelog](https://github.com/dart-lang/setup-dart/blob/main/CHANGELOG.md) - [Commits](https://github.com/dart-lang/setup-dart/compare/b64355ae6ca0b5d484f0106a033dd1388965d06d...fedb1266e91cf51be2fdb382869461a434b920a3) --- updated-dependencies: - dependency-name: dart-lang/setup-dart dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 2 +- .github/workflows/lint.yml | 8 ++++---- .github/workflows/unit.yml | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index dd2470d1..c59f55a5 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -30,7 +30,7 @@ jobs: with: go-version: '^1.16' - - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: stable - run: dart --version diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5332e5cd..5f4c6c35 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -28,7 +28,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: stable - id: checkout @@ -53,7 +53,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: "3.0.0" - id: checkout @@ -191,7 +191,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: dev - id: checkout @@ -394,7 +394,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: dev - id: checkout diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 43b24f4c..d2b711d8 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -30,7 +30,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: "3.0.0" - id: checkout @@ -87,7 +87,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: "3.0.0" - id: checkout @@ -117,7 +117,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: dev - id: checkout @@ -246,7 +246,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: dev - id: checkout @@ -294,7 +294,7 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: "3.0.0" - id: checkout @@ -324,7 +324,7 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: dev - id: checkout @@ -344,7 +344,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 with: sdk: dev - id: checkout From 9e880af457e8f0cf1477d27938a830d3628d74d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 10:34:59 -0800 Subject: [PATCH 18/43] build(deps): bump actions/cache from 3.3.2 to 4.0.0 (#451) Bumps [actions/cache](https://github.com/actions/cache) from 3.3.2 to 4.0.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/704facf57e6136b1bc63b828d79edcd491f0ee84...13aacd865c20de90d75de3b17ebe84f7a17d57d2) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 2 +- .github/workflows/lint.yml | 12 ++++++------ .github/workflows/unit.yml | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index c59f55a5..d9a5e08e 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;dart:2.10.0;" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5f4c6c35..7a9cc0d6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.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" @@ -181,7 +181,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" @@ -384,7 +384,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_test;commands:analyze_1" @@ -414,7 +414,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:master;packages:examples/fullstack/frontend;commands:format-analyze_2" @@ -448,7 +448,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:analyze_3" diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index d2b711d8..c4d73bae 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud;commands:command" @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-functions_framework-integration_test;commands:test_1" @@ -284,7 +284,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud;commands:test_0" @@ -314,7 +314,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:google_cloud;commands:test_0" From b55ad689c69b2aaba7ad7fa1c717ea59e3bb9e53 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 28 Feb 2024 10:57:32 -0800 Subject: [PATCH 19/43] chore: Bump dev dep in gcloud (#453) --- google_cloud/CHANGELOG.md | 4 ++++ google_cloud/pubspec.yaml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/google_cloud/CHANGELOG.md b/google_cloud/CHANGELOG.md index bea8bbc0..d3aeeb94 100644 --- a/google_cloud/CHANGELOG.md +++ b/google_cloud/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.1-wip + +- Require `package:http` `^1.0.0`. + ## 0.2.0 - First release replacing `package:gcp`. diff --git a/google_cloud/pubspec.yaml b/google_cloud/pubspec.yaml index aee357b4..863cd9b4 100644 --- a/google_cloud/pubspec.yaml +++ b/google_cloud/pubspec.yaml @@ -1,7 +1,7 @@ name: google_cloud description: >- Utilities for running Dart code correctly on the Google Cloud Platform. -version: 0.2.0 +version: 0.2.1-wip repository: https://github.com/GoogleCloudPlatform/functions-framework-dart/tree/main/google_cloud environment: @@ -9,14 +9,14 @@ environment: dependencies: collection: ^1.17.0 - http: '>=0.13.5 <2.0.0' + http: ^1.0.0 io: ^1.0.3 shelf: ^1.4.0 stack_trace: ^1.11.0 dev_dependencies: dart_flutter_team_lints: ^2.0.0 - googleapis: ^11.0.0 + googleapis: ^13.0.0 googleapis_auth: ^1.3.1 test: ^1.22.0 test_process: ^2.0.3 From 1efda5a32fde55bc6541549b79693cf0dfa7ea4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 12:08:40 -0800 Subject: [PATCH 20/43] build(deps): bump actions/cache from 4.0.0 to 4.0.1 (#454) Bumps [actions/cache](https://github.com/actions/cache) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/13aacd865c20de90d75de3b17ebe84f7a17d57d2...ab5e6d0c87105b4c9c2047343972218f562e4319) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 2 +- .github/workflows/lint.yml | 12 ++++++------ .github/workflows/unit.yml | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index d9a5e08e..ae3836d1 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;dart:2.10.0;" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7a9cc0d6..30fc2a62 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.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" @@ -181,7 +181,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" @@ -384,7 +384,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_test;commands:analyze_1" @@ -414,7 +414,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:master;packages:examples/fullstack/frontend;commands:format-analyze_2" @@ -448,7 +448,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:analyze_3" diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index c4d73bae..3faf9286 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud;commands:command" @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-functions_framework-integration_test;commands:test_1" @@ -284,7 +284,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud;commands:test_0" @@ -314,7 +314,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:google_cloud;commands:test_0" From eca75c5225f76713746ba7b328ea04ec946d3b69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:10:48 -0700 Subject: [PATCH 21/43] build(deps): bump actions/checkout from 4.1.1 to 4.1.2 (#456) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/b4ffde65f46336ab88eb53be808477a3936bae11...9bb56186c3b09b4f86b1c65136769dd318469633) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 2 +- .github/workflows/lint.yml | 12 ++++++------ .github/workflows/unit.yml | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index ae3836d1..6e4fb686 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -35,7 +35,7 @@ jobs: sdk: stable - run: dart --version - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - run: dart pub upgrade working-directory: integration_test diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 30fc2a62..71315438 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -33,7 +33,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - name: mono_repo self validate run: dart pub global activate mono_repo 6.6.1 - name: mono_repo self validate @@ -58,7 +58,7 @@ jobs: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -196,7 +196,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -399,7 +399,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: integration_test_pub_upgrade name: integration_test; dart pub upgrade run: dart pub upgrade @@ -429,7 +429,7 @@ jobs: channel: master - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade @@ -463,7 +463,7 @@ jobs: channel: stable - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 3faf9286..e3299934 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -35,7 +35,7 @@ jobs: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -92,7 +92,7 @@ jobs: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -122,7 +122,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -251,7 +251,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -299,7 +299,7 @@ jobs: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -329,7 +329,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -349,7 +349,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade From 9e40e93aa866954a14f9c5dbcd9caf3532d3f345 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:12:12 -0700 Subject: [PATCH 22/43] build(deps): bump actions/cache from 4.0.1 to 4.0.2 (#457) Bumps [actions/cache](https://github.com/actions/cache) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/ab5e6d0c87105b4c9c2047343972218f562e4319...0c45773b623bea8c8e75f6c82b208c3cf94ea4f9) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 2 +- .github/workflows/lint.yml | 12 ++++++------ .github/workflows/unit.yml | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 6e4fb686..0ea93768 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;dart:2.10.0;" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 71315438..4c482d83 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.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" @@ -181,7 +181,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" @@ -384,7 +384,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_test;commands:analyze_1" @@ -414,7 +414,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:master;packages:examples/fullstack/frontend;commands:format-analyze_2" @@ -448,7 +448,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:analyze_3" diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index e3299934..1dd454a9 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud;commands:command" @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-functions_framework-integration_test;commands:test_1" @@ -284,7 +284,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud;commands:test_0" @@ -314,7 +314,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:google_cloud;commands:test_0" From df501db7d03ebfbf5ead77c1005e787fbc140c4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:12:22 -0700 Subject: [PATCH 23/43] build(deps): bump subosito/flutter-action from 2.12.0 to 2.15.0 (#458) Bumps [subosito/flutter-action](https://github.com/subosito/flutter-action) from 2.12.0 to 2.15.0. - [Release notes](https://github.com/subosito/flutter-action/releases) - [Commits](https://github.com/subosito/flutter-action/compare/2783a3f08e1baf891508463f8c6653c258246225...3d804929922b667a63a229bc59037807f969e885) --- updated-dependencies: - dependency-name: subosito/flutter-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4c482d83..20eb3cea 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -424,7 +424,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 + uses: subosito/flutter-action@3d804929922b667a63a229bc59037807f969e885 with: channel: master - id: checkout @@ -458,7 +458,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 + uses: subosito/flutter-action@3d804929922b667a63a229bc59037807f969e885 with: channel: stable - id: checkout From 757b8cc4b7ca7edc8ab52ddf4f0c048ed934e214 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 17 Apr 2024 13:18:21 -0700 Subject: [PATCH 24/43] chore: dartfn - bump http dep, drop (unused) usage dep (#459) --- dartfn/pubspec.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dartfn/pubspec.yaml b/dartfn/pubspec.yaml index 28a796b0..4b872669 100644 --- a/dartfn/pubspec.yaml +++ b/dartfn/pubspec.yaml @@ -14,10 +14,9 @@ executables: dependencies: args: ^2.1.1 collection: ^1.15.0 - http: '>=0.13.3 <2.0.0' + http: ^1.0.0 io: ^1.0.0 path: ^1.7.0 - usage: ^4.0.2 dev_dependencies: build: ^2.0.0 From fc75b32d63faa731dc81570161e0120240862604 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Mon, 20 May 2024 15:38:57 -0700 Subject: [PATCH 25/43] blast_repo fixes (#465) dependabot --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 725f03af..e655c5e5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,7 @@ updates: interval: monthly labels: - autosubmit + groups: + dependencies: + patterns: + - "*" From 4260864a468ff6ea0c22f8d450790b46621573dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 15:42:28 -0700 Subject: [PATCH 26/43] actions update (#466) updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: dart-lang/setup-dart dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: subosito/flutter-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 6 +++--- .github/workflows/lint.yml | 24 ++++++++++++------------ .github/workflows/unit.yml | 28 ++++++++++++++-------------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 0ea93768..a250da94 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -26,16 +26,16 @@ jobs: os:ubuntu-latest - name: Setup Go - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 with: go-version: '^1.16' - - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: stable - run: dart --version - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - run: dart pub upgrade working-directory: integration_test diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 20eb3cea..fe6be6f7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -28,12 +28,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - name: mono_repo self validate run: dart pub global activate mono_repo 6.6.1 - name: mono_repo self validate @@ -53,12 +53,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -191,12 +191,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -394,12 +394,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: integration_test_pub_upgrade name: integration_test; dart pub upgrade run: dart pub upgrade @@ -424,12 +424,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@3d804929922b667a63a229bc59037807f969e885 + uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 with: channel: master - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade @@ -458,12 +458,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@3d804929922b667a63a229bc59037807f969e885 + uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 with: channel: stable - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 1dd454a9..96cbd15e 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -30,12 +30,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -87,12 +87,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -117,12 +117,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -246,12 +246,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -294,12 +294,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: "3.0.0" - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -324,12 +324,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -344,12 +344,12 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade From ce51282a6166d77e1d0edd57c5b37aa0daa6d416 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Thu, 30 May 2024 10:21:06 -0700 Subject: [PATCH 27/43] chore: update dependencies (#468) - update lints and make fixes - update min SDK across the board --- .github/workflows/lint.yml | 46 ++++++------ .github/workflows/unit.yml | 70 +++++++++---------- dartfn/CHANGELOG.md | 1 + dartfn/lib/src/generators/cloudevent.g.dart | 8 +-- dartfn/lib/src/generators/helloworld.g.dart | 8 +-- dartfn/lib/src/generators/json.g.dart | 10 +-- dartfn/lib/src/stagehand/stagehand.dart | 2 +- dartfn/pubspec.yaml | 12 ++-- dartfn/templates/cloudevent/pubspec.yaml | 8 +-- dartfn/templates/helloworld/pubspec.yaml | 8 +-- dartfn/templates/json/pubspec.yaml | 12 ++-- examples/fullstack/backend/pubspec.yaml | 12 ++-- examples/fullstack/frontend-cli/pubspec.yaml | 10 +-- examples/fullstack/frontend/pubspec.yaml | 8 +-- examples/hello/pubspec.yaml | 8 +-- examples/json/pubspec.yaml | 12 ++-- examples/protobuf_firestore/pubspec.yaml | 14 ++-- examples/raw_cloudevent/pubspec.yaml | 8 +-- functions_framework/CHANGELOG.md | 4 ++ .../lib/functions_framework.dart | 2 +- functions_framework/lib/serve.dart | 2 +- functions_framework/pubspec.yaml | 24 +++---- functions_framework_builder/CHANGELOG.md | 4 ++ functions_framework_builder/lib/builder.dart | 2 +- .../lib/src/analyzer_utils.dart | 18 +++++ .../lib/src/generic_function_type.dart | 10 +-- .../lib/src/supported_function_type.dart | 3 +- .../lib/src/valid_json_utils.dart | 4 +- functions_framework_builder/pubspec.yaml | 26 +++---- google_cloud/CHANGELOG.md | 1 + google_cloud/pubspec.yaml | 6 +- integration_test/pubspec.yaml | 22 +++--- 32 files changed, 207 insertions(+), 178 deletions(-) create mode 100644 functions_framework_builder/lib/src/analyzer_utils.dart diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fe6be6f7..2b7de74e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -28,37 +28,37 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: mono_repo self validate run: dart pub global activate mono_repo 6.6.1 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_format; Dart 3.0.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`" + 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`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.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" + 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" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.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 - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + 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 + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: - sdk: "3.0.0" + sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -181,7 +181,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" @@ -191,12 +191,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -384,7 +384,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_test;commands:analyze_1" @@ -394,12 +394,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: integration_test_pub_upgrade name: integration_test; dart pub upgrade run: dart pub upgrade @@ -414,7 +414,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:master;packages:examples/fullstack/frontend;commands:format-analyze_2" @@ -424,12 +424,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 + uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 with: channel: master - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade @@ -448,7 +448,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:analyze_3" @@ -458,12 +458,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 + uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 with: channel: stable - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 96cbd15e..91ad5f99 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -16,26 +16,26 @@ permissions: read-all jobs: job_001: - name: "unit_test; linux; Dart 3.0.0; PKGS: dartfn, functions_framework_builder, google_cloud, integration_test; `dart test`" + name: "unit_test; linux; Dart 3.4.0; PKGS: dartfn, functions_framework_builder, google_cloud, integration_test; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: - sdk: "3.0.0" + sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -73,26 +73,26 @@ jobs: if: "always() && steps.integration_test_pub_upgrade.conclusion == 'success'" working-directory: integration_test job_002: - name: "unit_test; linux; Dart 3.0.0; PKG: google_cloud; `./tool/docker_test_script.sh`" + name: "unit_test; linux; Dart 3.4.0; PKG: google_cloud; `./tool/docker_test_script.sh`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud;commands:command" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud;commands:command" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud - os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: - sdk: "3.0.0" + sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -117,12 +117,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-functions_framework-integration_test;commands:test_1" @@ -246,12 +246,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -280,26 +280,26 @@ jobs: if: "always() && steps.integration_test_pub_upgrade.conclusion == 'success'" working-directory: integration_test job_005: - name: "unit_test; macos; Dart 3.0.0; PKG: google_cloud; `dart test`" + name: "unit_test; macos; Dart 3.4.0; PKG: google_cloud; `dart test`" runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" - key: "os:macos-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud;commands:test_0" + key: "os:macos-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud;commands:test_0" restore-keys: | - os:macos-latest;pub-cache-hosted;sdk:3.0.0;packages:google_cloud - os:macos-latest;pub-cache-hosted;sdk:3.0.0 + os:macos-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud + os:macos-latest;pub-cache-hosted;sdk:3.4.0 os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: - sdk: "3.0.0" + sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -314,7 +314,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:google_cloud;commands:test_0" @@ -324,12 +324,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -344,12 +344,12 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade diff --git a/dartfn/CHANGELOG.md b/dartfn/CHANGELOG.md index 11ed8c05..8db03799 100644 --- a/dartfn/CHANGELOG.md +++ b/dartfn/CHANGELOG.md @@ -1,6 +1,7 @@ ## 0.4.7-wip - Use latest `dart_flutter_team_lints` version. +- Require Dart 3.4 ## 0.4.6 diff --git a/dartfn/lib/src/generators/cloudevent.g.dart b/dartfn/lib/src/generators/cloudevent.g.dart index 4e8b1d0d..247391fa 100644 --- a/dartfn/lib/src/generators/cloudevent.g.dart +++ b/dartfn/lib/src/generators/cloudevent.g.dart @@ -162,11 +162,11 @@ aXR5JzogTG9nU2V2ZXJpdHkuaW5mbywKICAgICAgfSwKICAgICksCiAgKTsKfQo=''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBGdW5jdGlvbnMgRnJh bWV3b3JrIHByb2plY3QgZm9yIGhhbmRsaW5nIGEgY2xvdWRldmVudC4KIyB2ZXJzaW9uOiAwLjEu MAojIGhvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQpwdWJsaXNoX3RvOiBub25lCgpl -bnZpcm9ubWVudDoKICBzZGs6IF4zLjAuMAoKZGVwZW5kZW5jaWVzOgogIGZ1bmN0aW9uc19mcmFt +bnZpcm9ubWVudDoKICBzZGs6IF4zLjQuMAoKZGVwZW5kZW5jaWVzOgogIGZ1bmN0aW9uc19mcmFt ZXdvcms6IF4wLjQuMAogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBlbmRlbmNpZXM6CiAgYnVpbGRf -cnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1aWxkZXI6IF4wLjQuMAogIGh0 -dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAgZGFydF9mbHV0dGVyX3RlYW1fbGludHM6IF4yLjAuMAog -IHRlc3Q6IF4xLjE1LjAKICB0ZXN0X3Byb2Nlc3M6IF4yLjAuMAo=''', +cnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1aWxkZXI6IF4wLjQuMQogIGh0 +dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAgZGFydF9mbHV0dGVyX3RlYW1fbGludHM6IF4zLjAuMAog +IHRlc3Q6IF4xLjE2LjYKICB0ZXN0X3Byb2Nlc3M6IF4yLjAuMAo=''', 'sample/data.json', 'text', ''' diff --git a/dartfn/lib/src/generators/helloworld.g.dart b/dartfn/lib/src/generators/helloworld.g.dart index fa0dfccf..b125972e 100644 --- a/dartfn/lib/src/generators/helloworld.g.dart +++ b/dartfn/lib/src/generators/helloworld.g.dart @@ -150,11 +150,11 @@ bywgV29ybGQhJyk7Cg==''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSAiSGVsbG8sIFdvcmxk ISIgRnVuY3Rpb25zIEZyYW1ld29yayBwcm9qZWN0LgojIHZlcnNpb246IDAuMS4wCiMgaG9tZXBh Z2U6IGh0dHBzOi8vd3d3LmV4YW1wbGUuY29tCnB1Ymxpc2hfdG86IG5vbmUKCmVudmlyb25tZW50 -OgogIHNkazogXjMuMC4wCgpkZXBlbmRlbmNpZXM6CiAgZnVuY3Rpb25zX2ZyYW1ld29yazogXjAu +OgogIHNkazogXjMuNC4wCgpkZXBlbmRlbmNpZXM6CiAgZnVuY3Rpb25zX2ZyYW1ld29yazogXjAu NC4wCiAgc2hlbGY6IF4xLjAuMAoKZGV2X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4y -LjAuMAogIGZ1bmN0aW9uc19mcmFtZXdvcmtfYnVpbGRlcjogXjAuNC4wCiAgaHR0cDogJz49MC4x -My4wIDwyLjAuMCcKICBkYXJ0X2ZsdXR0ZXJfdGVhbV9saW50czogXjIuMC4wCiAgdGVzdDogXjEu -MTUuNwogIHRlc3RfcHJvY2VzczogXjIuMC4wCg==''', +LjAuMAogIGZ1bmN0aW9uc19mcmFtZXdvcmtfYnVpbGRlcjogXjAuNC4xCiAgaHR0cDogJz49MC4x +My4wIDwyLjAuMCcKICBkYXJ0X2ZsdXR0ZXJfdGVhbV9saW50czogXjMuMC4wCiAgdGVzdDogXjEu +MTYuNgogIHRlc3RfcHJvY2VzczogXjIuMC4wCg==''', 'test/function_test.dart', 'text', ''' diff --git a/dartfn/lib/src/generators/json.g.dart b/dartfn/lib/src/generators/json.g.dart index e97624e7..5e836fb1 100644 --- a/dartfn/lib/src/generators/json.g.dart +++ b/dartfn/lib/src/generators/json.g.dart @@ -242,12 +242,12 @@ CiAgICAgICduYW1lJzogaW5zdGFuY2UubmFtZSwKICAgIH07Cg==''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBGdW5jdGlvbnMgRnJh bWV3b3JrIHByb2plY3QgZm9yIGhhbmRsaW5nIEpTT04uCiMgdmVyc2lvbjogMC4xLjAKIyBob21l cGFnZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KcHVibGlzaF90bzogbm9uZQoKZW52aXJvbm1l -bnQ6CiAgc2RrOiBeMy4wLjAKCmRlcGVuZGVuY2llczoKICBmdW5jdGlvbnNfZnJhbWV3b3JrOiBe +bnQ6CiAgc2RrOiBeMy40LjAKCmRlcGVuZGVuY2llczoKICBmdW5jdGlvbnNfZnJhbWV3b3JrOiBe MC40LjAKICBqc29uX2Fubm90YXRpb246IF40LjguMQogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBl -bmRlbmNpZXM6CiAgYnVpbGRfcnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1 -aWxkZXI6IF4wLjQuMAogIGh0dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAganNvbl9zZXJpYWxpemFi -bGU6IF42LjAuMAogIGRhcnRfZmx1dHRlcl90ZWFtX2xpbnRzOiBeMi4wLjAKICB0ZXN0OiBeMS4x -NS43CiAgdGVzdF9wcm9jZXNzOiBeMi4wLjAK''', +bmRlbmNpZXM6CiAgYnVpbGRfcnVubmVyOiBeMi4yLjEKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1 +aWxkZXI6IF4wLjQuNwogIGh0dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAganNvbl9zZXJpYWxpemFi +bGU6IF42LjYuMAogIGRhcnRfZmx1dHRlcl90ZWFtX2xpbnRzOiBeMy4wLjAKICB0ZXN0OiBeMS4y +MS42CiAgdGVzdF9wcm9jZXNzOiBeMi4wLjAK''', 'test/function_test.dart', 'text', ''' diff --git a/dartfn/lib/src/stagehand/stagehand.dart b/dartfn/lib/src/stagehand/stagehand.dart index f4b1283a..bec60444 100644 --- a/dartfn/lib/src/stagehand/stagehand.dart +++ b/dartfn/lib/src/stagehand/stagehand.dart @@ -25,7 +25,7 @@ /// ``` /// /// to create a new instance of the `webapp` template in a `foobar` directory. -library stagehand; +library; import 'dart:async'; import 'dart:convert'; diff --git a/dartfn/pubspec.yaml b/dartfn/pubspec.yaml index 4b872669..8532cd20 100644 --- a/dartfn/pubspec.yaml +++ b/dartfn/pubspec.yaml @@ -6,7 +6,7 @@ version: 0.4.7-wip homepage: https://github.com/GoogleCloudPlatform/functions-framework-dart environment: - sdk: ^3.0.0 + sdk: ^3.4.0 executables: dartfn: @@ -16,17 +16,17 @@ dependencies: collection: ^1.15.0 http: ^1.0.0 io: ^1.0.0 - path: ^1.7.0 + path: ^1.8.0 dev_dependencies: - build: ^2.0.0 + build: ^2.1.0 build_config: ^1.0.0 - build_runner: ^2.0.4 + build_runner: ^2.1.0 build_verify: ^3.0.0 build_version: ^2.1.1 - dart_flutter_team_lints: ^2.0.0 + dart_flutter_team_lints: ^3.0.0 glob: ^2.0.0 grinder: ^0.9.0 source_gen: ^1.0.0 - test: ^1.15.7 + test: ^1.16.6 yaml: ^3.1.0 diff --git a/dartfn/templates/cloudevent/pubspec.yaml b/dartfn/templates/cloudevent/pubspec.yaml index 7ec574e6..32a1ec2b 100644 --- a/dartfn/templates/cloudevent/pubspec.yaml +++ b/dartfn/templates/cloudevent/pubspec.yaml @@ -5,7 +5,7 @@ description: A sample Functions Framework project for handling a cloudevent. publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: functions_framework: ^0.4.0 @@ -13,8 +13,8 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - functions_framework_builder: ^0.4.0 + functions_framework_builder: ^0.4.1 http: '>=0.13.0 <2.0.0' - dart_flutter_team_lints: ^2.0.0 - test: ^1.15.0 + dart_flutter_team_lints: ^3.0.0 + test: ^1.16.6 test_process: ^2.0.0 diff --git a/dartfn/templates/helloworld/pubspec.yaml b/dartfn/templates/helloworld/pubspec.yaml index b1160f5e..dbaeeb16 100644 --- a/dartfn/templates/helloworld/pubspec.yaml +++ b/dartfn/templates/helloworld/pubspec.yaml @@ -5,7 +5,7 @@ description: A sample "Hello, World!" Functions Framework project. publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: functions_framework: ^0.4.0 @@ -13,8 +13,8 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - functions_framework_builder: ^0.4.0 + functions_framework_builder: ^0.4.1 http: '>=0.13.0 <2.0.0' - dart_flutter_team_lints: ^2.0.0 - test: ^1.15.7 + dart_flutter_team_lints: ^3.0.0 + test: ^1.16.6 test_process: ^2.0.0 diff --git a/dartfn/templates/json/pubspec.yaml b/dartfn/templates/json/pubspec.yaml index 5b50f0bd..7e1c3c22 100644 --- a/dartfn/templates/json/pubspec.yaml +++ b/dartfn/templates/json/pubspec.yaml @@ -5,7 +5,7 @@ description: A sample Functions Framework project for handling JSON. publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: functions_framework: ^0.4.0 @@ -13,10 +13,10 @@ dependencies: shelf: ^1.0.0 dev_dependencies: - build_runner: ^2.0.0 - functions_framework_builder: ^0.4.0 + build_runner: ^2.2.1 + functions_framework_builder: ^0.4.7 http: '>=0.13.0 <2.0.0' - json_serializable: ^6.0.0 - dart_flutter_team_lints: ^2.0.0 - test: ^1.15.7 + json_serializable: ^6.6.0 + dart_flutter_team_lints: ^3.0.0 + test: ^1.21.6 test_process: ^2.0.0 diff --git a/examples/fullstack/backend/pubspec.yaml b/examples/fullstack/backend/pubspec.yaml index 45d89bd6..b9061082 100644 --- a/examples/fullstack/backend/pubspec.yaml +++ b/examples/fullstack/backend/pubspec.yaml @@ -2,7 +2,7 @@ name: backend publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: functions_framework: ^0.4.0 @@ -10,10 +10,10 @@ dependencies: shelf: ^1.0.0 dev_dependencies: - build_runner: ^2.0.0 - dart_flutter_team_lints: ^2.0.0 - functions_framework_builder: ^0.4.0 + build_runner: ^2.2.1 + dart_flutter_team_lints: ^3.0.0 + functions_framework_builder: ^0.4.7 http: '>=0.13.0 <2.0.0' - json_serializable: ^6.0.0 - test: ^1.15.7 + json_serializable: ^6.6.0 + test: ^1.21.6 test_process: ^2.0.0 diff --git a/examples/fullstack/frontend-cli/pubspec.yaml b/examples/fullstack/frontend-cli/pubspec.yaml index 5080bc5f..0546d869 100644 --- a/examples/fullstack/frontend-cli/pubspec.yaml +++ b/examples/fullstack/frontend-cli/pubspec.yaml @@ -2,7 +2,7 @@ name: frontend_cli publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.4.0 executables: greet: @@ -13,7 +13,7 @@ dependencies: json_annotation: ^4.8.1 dev_dependencies: - build_runner: ^2.0.0 - dart_flutter_team_lints: ^2.0.0 - json_serializable: ^6.0.0 - test: ^1.14.4 + build_runner: ^2.2.1 + dart_flutter_team_lints: ^3.0.0 + json_serializable: ^6.6.0 + test: ^1.21.6 diff --git a/examples/fullstack/frontend/pubspec.yaml b/examples/fullstack/frontend/pubspec.yaml index 0eeefa7a..dd989d79 100644 --- a/examples/fullstack/frontend/pubspec.yaml +++ b/examples/fullstack/frontend/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 publish_to: 'none' environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: cupertino_icons: ^1.0.2 @@ -15,11 +15,11 @@ dependencies: provider: ^6.0.0 dev_dependencies: - build_runner: ^2.0.0 - dart_flutter_team_lints: ^2.0.0 + build_runner: ^2.2.1 + dart_flutter_team_lints: ^3.0.0 flutter_test: sdk: flutter - json_serializable: ^6.0.0 + json_serializable: ^6.6.0 flutter: assets: diff --git a/examples/hello/pubspec.yaml b/examples/hello/pubspec.yaml index b58095b5..fa906cc8 100644 --- a/examples/hello/pubspec.yaml +++ b/examples/hello/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/GoogleCloudPlatform/functions-framework-dart publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: functions_framework: ^0.4.0 @@ -13,8 +13,8 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - dart_flutter_team_lints: ^2.0.0 - functions_framework_builder: ^0.4.0 + dart_flutter_team_lints: ^3.0.0 + functions_framework_builder: ^0.4.1 http: '>=0.13.0 <2.0.0' - test: ^1.15.7 + test: ^1.16.6 test_process: ^2.0.0 diff --git a/examples/json/pubspec.yaml b/examples/json/pubspec.yaml index 43865d5b..cf887efe 100644 --- a/examples/json/pubspec.yaml +++ b/examples/json/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/GoogleCloudPlatform/functions-framework-dart publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: functions_framework: ^0.4.0 @@ -13,10 +13,10 @@ dependencies: shelf: ^1.0.0 dev_dependencies: - build_runner: ^2.0.0 - dart_flutter_team_lints: ^2.0.0 - functions_framework_builder: ^0.4.0 + build_runner: ^2.2.1 + dart_flutter_team_lints: ^3.0.0 + functions_framework_builder: ^0.4.7 http: '>=0.13.0 <2.0.0' - json_serializable: ^6.0.0 - test: ^1.15.7 + json_serializable: ^6.6.0 + test: ^1.21.6 test_process: ^2.0.0 diff --git a/examples/protobuf_firestore/pubspec.yaml b/examples/protobuf_firestore/pubspec.yaml index 776267e6..d7768047 100644 --- a/examples/protobuf_firestore/pubspec.yaml +++ b/examples/protobuf_firestore/pubspec.yaml @@ -2,17 +2,17 @@ name: example_protobuf_firestore publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: functions_framework: ^0.4.3 protobuf: ^3.0.0 - shelf: ^1.0.0 + shelf: ^1.4.0 dev_dependencies: - build_runner: ^2.0.0 - dart_flutter_team_lints: ^2.0.0 - functions_framework_builder: ^0.4.0 - http: '>=0.13.0 <2.0.0' - test: ^1.15.0 + build_runner: ^2.2.1 + dart_flutter_team_lints: ^3.0.0 + functions_framework_builder: ^0.4.10 + http: ">=0.13.5 <2.0.0" + test: ^1.21.6 test_process: ^2.0.0 diff --git a/examples/raw_cloudevent/pubspec.yaml b/examples/raw_cloudevent/pubspec.yaml index 3bee2ff4..0227ac0b 100644 --- a/examples/raw_cloudevent/pubspec.yaml +++ b/examples/raw_cloudevent/pubspec.yaml @@ -2,7 +2,7 @@ name: example_raw_cloudevent_function publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: functions_framework: ^0.4.0 @@ -10,8 +10,8 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - dart_flutter_team_lints: ^2.0.0 - functions_framework_builder: ^0.4.0 + dart_flutter_team_lints: ^3.0.0 + functions_framework_builder: ^0.4.1 http: '>=0.13.0 <2.0.0' - test: ^1.15.0 + test: ^1.16.6 test_process: ^2.0.0 diff --git a/functions_framework/CHANGELOG.md b/functions_framework/CHANGELOG.md index 9c396484..5b7a4596 100644 --- a/functions_framework/CHANGELOG.md +++ b/functions_framework/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.4-wip + +- Require Dart 3.4 + ## 0.4.3+1 - Migrate from `package:gcp` to `package:google_cloud`. diff --git a/functions_framework/lib/functions_framework.dart b/functions_framework/lib/functions_framework.dart index 9124c74a..7e796368 100644 --- a/functions_framework/lib/functions_framework.dart +++ b/functions_framework/lib/functions_framework.dart @@ -22,7 +22,7 @@ /// @CloudFunction() /// Response function(Request request) => Response.ok('Hello, World!'); /// ``` -library functions_framework; +library; export 'package:google_cloud/google_cloud.dart' show BadRequestException, LogSeverity, RequestLogger; diff --git a/functions_framework/lib/serve.dart b/functions_framework/lib/serve.dart index a35308a1..6d05e869 100644 --- a/functions_framework/lib/serve.dart +++ b/functions_framework/lib/serve.dart @@ -20,7 +20,7 @@ /// use /// [package:functions_framework_builder](https://pub.dev/packages/functions_framework_builder) /// to generate server code instead. -library serve; +library; import 'dart:async'; import 'dart:io'; diff --git a/functions_framework/pubspec.yaml b/functions_framework/pubspec.yaml index d822b03d..77ca9a86 100644 --- a/functions_framework/pubspec.yaml +++ b/functions_framework/pubspec.yaml @@ -1,27 +1,27 @@ name: functions_framework -version: 0.4.3+1 +version: 0.4.4-wip description: >- FaaS (Function as a service) framework for writing portable Dart functions repository: https://github.com/GoogleCloudPlatform/functions-framework-dart environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: args: ^2.0.0 - collection: ^1.15.0 + collection: ^1.17.0 google_cloud: ^0.2.0 - http: '>=0.13.0 <2.0.0' + http: ">=0.13.5 <2.0.0" http_parser: ^4.0.0 - io: ^1.0.0 + io: ^1.0.3 json_annotation: ^4.8.1 - meta: ^1.2.3 - shelf: ^1.2.0 - stack_trace: ^1.9.6 + meta: ^1.7.0 + shelf: ^1.4.0 + stack_trace: ^1.11.0 dev_dependencies: - build_runner: ^2.0.0 + build_runner: ^2.2.1 build_verify: ^3.0.0 - dart_flutter_team_lints: ^2.0.0 - json_serializable: ^6.0.0 - test: ^1.15.7 + dart_flutter_team_lints: ^3.0.0 + json_serializable: ^6.6.0 + test: ^1.21.6 diff --git a/functions_framework_builder/CHANGELOG.md b/functions_framework_builder/CHANGELOG.md index 02c5ab6e..4fb6ea81 100644 --- a/functions_framework_builder/CHANGELOG.md +++ b/functions_framework_builder/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.11-wip + +- Require Dart 3.4 + ## 0.4.10 - Allow the latest `package:functions_framework`. diff --git a/functions_framework_builder/lib/builder.dart b/functions_framework_builder/lib/builder.dart index e7aaaf1d..880da2df 100644 --- a/functions_framework_builder/lib/builder.dart +++ b/functions_framework_builder/lib/builder.dart @@ -20,7 +20,7 @@ /// This library is **not** intended to be imported by typical end-users unless /// you are creating a custom compilation pipeline. See documentation for /// details, and `build.yaml` for how this builder is configured by default. -library functions_framework_builder.builder; +library; import 'package:analyzer/dart/element/element.dart'; import 'package:build/build.dart'; diff --git a/functions_framework_builder/lib/src/analyzer_utils.dart b/functions_framework_builder/lib/src/analyzer_utils.dart new file mode 100644 index 00000000..3974a8e1 --- /dev/null +++ b/functions_framework_builder/lib/src/analyzer_utils.dart @@ -0,0 +1,18 @@ +import 'package:analyzer/dart/element/element.dart'; +import 'package:analyzer/dart/element/type.dart'; + +extension DartTypeExtension on DartType { + String toStringNonNullable() { + final val = getDisplayString(); + if (val.endsWith('?')) return val.substring(0, val.length - 1); + return val; + } +} + +extension ElementExtension on Element { + String toStringNonNullable() { + final val = getDisplayString(); + if (val.endsWith('?')) return val.substring(0, val.length - 1); + return val; + } +} diff --git a/functions_framework_builder/lib/src/generic_function_type.dart b/functions_framework_builder/lib/src/generic_function_type.dart index 68109b79..90ab26be 100644 --- a/functions_framework_builder/lib/src/generic_function_type.dart +++ b/functions_framework_builder/lib/src/generic_function_type.dart @@ -18,6 +18,7 @@ import 'package:build/build.dart'; import 'package:source_gen/source_gen.dart'; import 'package:source_helper/source_helper.dart'; +import 'analyzer_utils.dart'; import 'constants.dart'; import 'supported_function_type.dart'; import 'valid_json_utils.dart'; @@ -41,8 +42,8 @@ class GenericFunctionType implements SupportedFunctionType { String get typedefName => _typedefName; @override - String get typeDescription => _functionTypeAliasElement.aliasedElement! - .getDisplayString(withNullability: false); + String get typeDescription => + _functionTypeAliasElement.aliasedElement!.toStringNonNullable(); final TypeAliasElement _functionTypeAliasElement; final bool _withContext; @@ -146,12 +147,11 @@ class _GenericFactoryData implements FactoryData { String target, String function, ) { - final jsonTypeDisplay = - info.jsonType.getDisplayString(withNullability: false); + final jsonTypeDisplay = info.jsonType.toStringNonNullable(); final typeDisplayName = info.paramType == null ? jsonTypeDisplay : '$functionsLibraryPrefix.' - '${info.paramType!.getDisplayString(withNullability: false)}'; + '${info.paramType!.toStringNonNullable()}'; final returnBlock = info.paramType == null ? 'return $_jsonParamName;' diff --git a/functions_framework_builder/lib/src/supported_function_type.dart b/functions_framework_builder/lib/src/supported_function_type.dart index 195f5f9f..d3a071f1 100644 --- a/functions_framework_builder/lib/src/supported_function_type.dart +++ b/functions_framework_builder/lib/src/supported_function_type.dart @@ -18,6 +18,7 @@ import 'package:analyzer/dart/element/type.dart'; import 'package:build/build.dart'; import 'package:source_helper/source_helper.dart'; +import 'analyzer_utils.dart'; import 'constants.dart'; class SupportedFunctionType { @@ -34,7 +35,7 @@ class SupportedFunctionType { this._type, { String? constructor, }) : _constructor = constructor, - typeDescription = _type.getDisplayString(withNullability: false); + typeDescription = _type.toStringNonNullable(); static Future create( Resolver resolver, diff --git a/functions_framework_builder/lib/src/valid_json_utils.dart b/functions_framework_builder/lib/src/valid_json_utils.dart index 13dcd9d4..b92ff7e7 100644 --- a/functions_framework_builder/lib/src/valid_json_utils.dart +++ b/functions_framework_builder/lib/src/valid_json_utils.dart @@ -100,8 +100,8 @@ JsonReturnKind _validJsonReturnTypeCore(DartType type) { // Look for a `toJson` function that returns a JSON-able type if (type is InterfaceType) { - final toJsonMethod = - type.element.lookUpMethod('toJson', type.element.library); + final toJsonMethod = type.element.augmented + .lookUpMethod(name: 'toJson', library: type.element.library); if (toJsonMethod != null && toJsonMethod.parameters.every((element) => element.isOptional)) { type = toJsonMethod.returnType; diff --git a/functions_framework_builder/pubspec.yaml b/functions_framework_builder/pubspec.yaml index 37c46dd6..8a8fa627 100644 --- a/functions_framework_builder/pubspec.yaml +++ b/functions_framework_builder/pubspec.yaml @@ -1,30 +1,30 @@ name: functions_framework_builder -version: 0.4.10 +version: 0.4.11-wip description: Builder for package:functions_framework repository: https://github.com/GoogleCloudPlatform/functions-framework-dart environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: analyzer: '>=5.12.0 <7.0.0' - build: ^2.0.0 - build_config: '>=0.4.3 <2.0.0' - collection: ^1.15.0 - dart_style: ^2.0.0 + build: ^2.3.1 + build_config: ^1.0.0 + collection: ^1.17.0 + dart_style: ^2.2.4 # There is a tight version constraint because the builder has a strict # dependency on all features exposed. functions_framework: '>=0.4.0 <0.4.4' glob: ^2.0.0 - meta: ^1.2.4 - path: ^1.7.0 + meta: ^1.7.0 + path: ^1.8.0 shelf: ^1.0.0 - source_gen: ^1.0.0 - source_helper: ^1.0.0 + source_gen: ^1.2.3 + source_helper: ^1.3.3 dev_dependencies: - build_test: ^2.0.0 - dart_flutter_team_lints: ^2.0.0 + build_test: ^2.1.2 + dart_flutter_team_lints: ^3.0.0 package_config: ^2.0.0 stream_transform: ^2.0.0 - test: ^1.15.7 + test: ^1.21.6 diff --git a/google_cloud/CHANGELOG.md b/google_cloud/CHANGELOG.md index d3aeeb94..82be3417 100644 --- a/google_cloud/CHANGELOG.md +++ b/google_cloud/CHANGELOG.md @@ -1,6 +1,7 @@ ## 0.2.1-wip - Require `package:http` `^1.0.0`. +- Require Dart 3.4 ## 0.2.0 diff --git a/google_cloud/pubspec.yaml b/google_cloud/pubspec.yaml index 863cd9b4..a883d4ed 100644 --- a/google_cloud/pubspec.yaml +++ b/google_cloud/pubspec.yaml @@ -5,7 +5,7 @@ version: 0.2.1-wip repository: https://github.com/GoogleCloudPlatform/functions-framework-dart/tree/main/google_cloud environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: collection: ^1.17.0 @@ -15,8 +15,8 @@ dependencies: stack_trace: ^1.11.0 dev_dependencies: - dart_flutter_team_lints: ^2.0.0 + dart_flutter_team_lints: ^3.0.0 googleapis: ^13.0.0 - googleapis_auth: ^1.3.1 + googleapis_auth: ^1.4.1 test: ^1.22.0 test_process: ^2.0.3 diff --git a/integration_test/pubspec.yaml b/integration_test/pubspec.yaml index 8b3f7e8b..8dfb8e31 100644 --- a/integration_test/pubspec.yaml +++ b/integration_test/pubspec.yaml @@ -2,24 +2,24 @@ name: hello_world_function_test publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.4.0 dependencies: - functions_framework: any + functions_framework: ^0.4.3+1 json_annotation: ^4.8.1 - shelf: ^1.0.0 + shelf: ^1.4.0 dev_dependencies: - build_runner: ^2.0.0 + build_runner: ^2.2.1 build_verify: ^3.0.0 - dart_flutter_team_lints: ^2.0.0 - functions_framework_builder: any - google_cloud: ^0.2.0 - http: '>=0.13.1 <2.0.0' + dart_flutter_team_lints: ^3.0.0 + functions_framework_builder: ^0.4.10 + google_cloud: ^0.2.1-wip + http: ^1.0.0 http_parser: ^4.0.0 - io: ^1.0.0 - json_serializable: ^6.0.0 - test: ^1.15.0 + io: ^1.0.3 + json_serializable: ^6.6.0 + test: ^1.21.6 test_process: ^2.0.0 dependency_overrides: From 7af9bd6c2d72f680b06052856c5ac1c451e37039 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Thu, 30 May 2024 12:46:17 -0700 Subject: [PATCH 28/43] chore: more dependency cleanups, use records (#469) --- dartfn/lib/src/generators/cloudevent.g.dart | 4 ++-- dartfn/lib/src/generators/helloworld.g.dart | 6 +++--- dartfn/lib/src/generators/json.g.dart | 8 ++++---- dartfn/templates/cloudevent/pubspec.yaml | 2 +- dartfn/templates/helloworld/pubspec.yaml | 2 +- dartfn/templates/json/pubspec.yaml | 4 ++-- examples/fullstack/backend/pubspec.yaml | 4 ++-- examples/fullstack/frontend-cli/pubspec.yaml | 2 +- examples/fullstack/frontend/pubspec.yaml | 4 ++-- examples/hello/pubspec.yaml | 2 +- examples/json/pubspec.yaml | 4 ++-- examples/raw_cloudevent/pubspec.yaml | 2 +- functions_framework/pubspec.yaml | 2 +- .../lib/src/valid_json_utils.dart | 11 +++-------- integration_test/pubspec.yaml | 2 +- 15 files changed, 27 insertions(+), 32 deletions(-) diff --git a/dartfn/lib/src/generators/cloudevent.g.dart b/dartfn/lib/src/generators/cloudevent.g.dart index 247391fa..cdfcbe14 100644 --- a/dartfn/lib/src/generators/cloudevent.g.dart +++ b/dartfn/lib/src/generators/cloudevent.g.dart @@ -165,8 +165,8 @@ MAojIGhvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQpwdWJsaXNoX3RvOiBub25lCgpl bnZpcm9ubWVudDoKICBzZGs6IF4zLjQuMAoKZGVwZW5kZW5jaWVzOgogIGZ1bmN0aW9uc19mcmFt ZXdvcms6IF4wLjQuMAogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBlbmRlbmNpZXM6CiAgYnVpbGRf cnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1aWxkZXI6IF4wLjQuMQogIGh0 -dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAgZGFydF9mbHV0dGVyX3RlYW1fbGludHM6IF4zLjAuMAog -IHRlc3Q6IF4xLjE2LjYKICB0ZXN0X3Byb2Nlc3M6IF4yLjAuMAo=''', +dHA6IF4xLjAuMAogIGRhcnRfZmx1dHRlcl90ZWFtX2xpbnRzOiBeMy4wLjAKICB0ZXN0OiBeMS4x +Ni42CiAgdGVzdF9wcm9jZXNzOiBeMi4wLjAK''', 'sample/data.json', 'text', ''' diff --git a/dartfn/lib/src/generators/helloworld.g.dart b/dartfn/lib/src/generators/helloworld.g.dart index b125972e..1aa38d81 100644 --- a/dartfn/lib/src/generators/helloworld.g.dart +++ b/dartfn/lib/src/generators/helloworld.g.dart @@ -152,9 +152,9 @@ ISIgRnVuY3Rpb25zIEZyYW1ld29yayBwcm9qZWN0LgojIHZlcnNpb246IDAuMS4wCiMgaG9tZXBh Z2U6IGh0dHBzOi8vd3d3LmV4YW1wbGUuY29tCnB1Ymxpc2hfdG86IG5vbmUKCmVudmlyb25tZW50 OgogIHNkazogXjMuNC4wCgpkZXBlbmRlbmNpZXM6CiAgZnVuY3Rpb25zX2ZyYW1ld29yazogXjAu NC4wCiAgc2hlbGY6IF4xLjAuMAoKZGV2X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4y -LjAuMAogIGZ1bmN0aW9uc19mcmFtZXdvcmtfYnVpbGRlcjogXjAuNC4xCiAgaHR0cDogJz49MC4x -My4wIDwyLjAuMCcKICBkYXJ0X2ZsdXR0ZXJfdGVhbV9saW50czogXjMuMC4wCiAgdGVzdDogXjEu -MTYuNgogIHRlc3RfcHJvY2VzczogXjIuMC4wCg==''', +LjAuMAogIGZ1bmN0aW9uc19mcmFtZXdvcmtfYnVpbGRlcjogXjAuNC4xCiAgaHR0cDogXjEuMC4w +CiAgZGFydF9mbHV0dGVyX3RlYW1fbGludHM6IF4zLjAuMAogIHRlc3Q6IF4xLjE2LjYKICB0ZXN0 +X3Byb2Nlc3M6IF4yLjAuMAo=''', 'test/function_test.dart', 'text', ''' diff --git a/dartfn/lib/src/generators/json.g.dart b/dartfn/lib/src/generators/json.g.dart index 5e836fb1..47e43c14 100644 --- a/dartfn/lib/src/generators/json.g.dart +++ b/dartfn/lib/src/generators/json.g.dart @@ -243,11 +243,11 @@ bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBGdW5jdGlvbnMgRnJh bWV3b3JrIHByb2plY3QgZm9yIGhhbmRsaW5nIEpTT04uCiMgdmVyc2lvbjogMC4xLjAKIyBob21l cGFnZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KcHVibGlzaF90bzogbm9uZQoKZW52aXJvbm1l bnQ6CiAgc2RrOiBeMy40LjAKCmRlcGVuZGVuY2llczoKICBmdW5jdGlvbnNfZnJhbWV3b3JrOiBe -MC40LjAKICBqc29uX2Fubm90YXRpb246IF40LjguMQogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBl +MC40LjAKICBqc29uX2Fubm90YXRpb246IF40LjkuMAogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBl bmRlbmNpZXM6CiAgYnVpbGRfcnVubmVyOiBeMi4yLjEKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1 -aWxkZXI6IF4wLjQuNwogIGh0dHA6ICc+PTAuMTMuMCA8Mi4wLjAnCiAganNvbl9zZXJpYWxpemFi -bGU6IF42LjYuMAogIGRhcnRfZmx1dHRlcl90ZWFtX2xpbnRzOiBeMy4wLjAKICB0ZXN0OiBeMS4y -MS42CiAgdGVzdF9wcm9jZXNzOiBeMi4wLjAK''', +aWxkZXI6IF4wLjQuNwogIGh0dHA6IF4xLjAuMAogIGpzb25fc2VyaWFsaXphYmxlOiBeNi42LjAK +ICBkYXJ0X2ZsdXR0ZXJfdGVhbV9saW50czogXjMuMC4wCiAgdGVzdDogXjEuMjEuNgogIHRlc3Rf +cHJvY2VzczogXjIuMC4wCg==''', 'test/function_test.dart', 'text', ''' diff --git a/dartfn/templates/cloudevent/pubspec.yaml b/dartfn/templates/cloudevent/pubspec.yaml index 32a1ec2b..84b9ad5e 100644 --- a/dartfn/templates/cloudevent/pubspec.yaml +++ b/dartfn/templates/cloudevent/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 functions_framework_builder: ^0.4.1 - http: '>=0.13.0 <2.0.0' + http: ^1.0.0 dart_flutter_team_lints: ^3.0.0 test: ^1.16.6 test_process: ^2.0.0 diff --git a/dartfn/templates/helloworld/pubspec.yaml b/dartfn/templates/helloworld/pubspec.yaml index dbaeeb16..24a50151 100644 --- a/dartfn/templates/helloworld/pubspec.yaml +++ b/dartfn/templates/helloworld/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 functions_framework_builder: ^0.4.1 - http: '>=0.13.0 <2.0.0' + http: ^1.0.0 dart_flutter_team_lints: ^3.0.0 test: ^1.16.6 test_process: ^2.0.0 diff --git a/dartfn/templates/json/pubspec.yaml b/dartfn/templates/json/pubspec.yaml index 7e1c3c22..1bdb3ec1 100644 --- a/dartfn/templates/json/pubspec.yaml +++ b/dartfn/templates/json/pubspec.yaml @@ -9,13 +9,13 @@ environment: dependencies: functions_framework: ^0.4.0 - json_annotation: ^4.8.1 + json_annotation: ^4.9.0 shelf: ^1.0.0 dev_dependencies: build_runner: ^2.2.1 functions_framework_builder: ^0.4.7 - http: '>=0.13.0 <2.0.0' + http: ^1.0.0 json_serializable: ^6.6.0 dart_flutter_team_lints: ^3.0.0 test: ^1.21.6 diff --git a/examples/fullstack/backend/pubspec.yaml b/examples/fullstack/backend/pubspec.yaml index b9061082..1fcd69dd 100644 --- a/examples/fullstack/backend/pubspec.yaml +++ b/examples/fullstack/backend/pubspec.yaml @@ -6,14 +6,14 @@ environment: dependencies: functions_framework: ^0.4.0 - json_annotation: ^4.8.1 + json_annotation: ^4.9.0 shelf: ^1.0.0 dev_dependencies: build_runner: ^2.2.1 dart_flutter_team_lints: ^3.0.0 functions_framework_builder: ^0.4.7 - http: '>=0.13.0 <2.0.0' + http: ^1.0.0 json_serializable: ^6.6.0 test: ^1.21.6 test_process: ^2.0.0 diff --git a/examples/fullstack/frontend-cli/pubspec.yaml b/examples/fullstack/frontend-cli/pubspec.yaml index 0546d869..de96554f 100644 --- a/examples/fullstack/frontend-cli/pubspec.yaml +++ b/examples/fullstack/frontend-cli/pubspec.yaml @@ -10,7 +10,7 @@ executables: dependencies: http: '>=0.13.1 <2.0.0' io: ^1.0.0 - json_annotation: ^4.8.1 + json_annotation: ^4.9.0 dev_dependencies: build_runner: ^2.2.1 diff --git a/examples/fullstack/frontend/pubspec.yaml b/examples/fullstack/frontend/pubspec.yaml index dd989d79..9b698286 100644 --- a/examples/fullstack/frontend/pubspec.yaml +++ b/examples/fullstack/frontend/pubspec.yaml @@ -10,8 +10,8 @@ dependencies: cupertino_icons: ^1.0.2 flutter: sdk: flutter - http: '>=0.13.0 <2.0.0' - json_annotation: ^4.8.1 + http: ^1.0.0 + json_annotation: ^4.9.0 provider: ^6.0.0 dev_dependencies: diff --git a/examples/hello/pubspec.yaml b/examples/hello/pubspec.yaml index fa906cc8..84ff0270 100644 --- a/examples/hello/pubspec.yaml +++ b/examples/hello/pubspec.yaml @@ -15,6 +15,6 @@ dev_dependencies: build_runner: ^2.0.0 dart_flutter_team_lints: ^3.0.0 functions_framework_builder: ^0.4.1 - http: '>=0.13.0 <2.0.0' + http: ^1.0.0 test: ^1.16.6 test_process: ^2.0.0 diff --git a/examples/json/pubspec.yaml b/examples/json/pubspec.yaml index cf887efe..50fc2914 100644 --- a/examples/json/pubspec.yaml +++ b/examples/json/pubspec.yaml @@ -9,14 +9,14 @@ environment: dependencies: functions_framework: ^0.4.0 - json_annotation: ^4.8.1 + json_annotation: ^4.9.0 shelf: ^1.0.0 dev_dependencies: build_runner: ^2.2.1 dart_flutter_team_lints: ^3.0.0 functions_framework_builder: ^0.4.7 - http: '>=0.13.0 <2.0.0' + http: ^1.0.0 json_serializable: ^6.6.0 test: ^1.21.6 test_process: ^2.0.0 diff --git a/examples/raw_cloudevent/pubspec.yaml b/examples/raw_cloudevent/pubspec.yaml index 0227ac0b..0ff95315 100644 --- a/examples/raw_cloudevent/pubspec.yaml +++ b/examples/raw_cloudevent/pubspec.yaml @@ -12,6 +12,6 @@ dev_dependencies: build_runner: ^2.0.0 dart_flutter_team_lints: ^3.0.0 functions_framework_builder: ^0.4.1 - http: '>=0.13.0 <2.0.0' + http: ^1.0.0 test: ^1.16.6 test_process: ^2.0.0 diff --git a/functions_framework/pubspec.yaml b/functions_framework/pubspec.yaml index 77ca9a86..9604b5f0 100644 --- a/functions_framework/pubspec.yaml +++ b/functions_framework/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: http: ">=0.13.5 <2.0.0" http_parser: ^4.0.0 io: ^1.0.3 - json_annotation: ^4.8.1 + json_annotation: ^4.9.0 meta: ^1.7.0 shelf: ^1.4.0 stack_trace: ^1.11.0 diff --git a/functions_framework_builder/lib/src/valid_json_utils.dart b/functions_framework_builder/lib/src/valid_json_utils.dart index b92ff7e7..5119a84b 100644 --- a/functions_framework_builder/lib/src/valid_json_utils.dart +++ b/functions_framework_builder/lib/src/valid_json_utils.dart @@ -48,12 +48,7 @@ bool _validJsonType(DartType type, bool allowComplexMembers) { return false; } -class JsonParamInfo { - final DartType jsonType; - final InterfaceType? paramType; - - JsonParamInfo._(this.jsonType, this.paramType); -} +typedef JsonParamInfo = ({DartType jsonType, InterfaceType? paramType}); JsonParamInfo? validJsonParamType(DartType type) { // Look for a `fromJson` factory that takes a JSON-able type @@ -68,14 +63,14 @@ JsonParamInfo? validJsonParamType(DartType type) { if (requiredParams.length == 1) { final paramType = requiredParams.single.type; if (_validJsonType(paramType, false)) { - return JsonParamInfo._(paramType, type); + return (jsonType: paramType, paramType: type); } } } } if (_validJsonType(type, false)) { - return JsonParamInfo._(type, null); + return (jsonType: type, paramType: null); } return null; } diff --git a/integration_test/pubspec.yaml b/integration_test/pubspec.yaml index 8dfb8e31..53b5dc0f 100644 --- a/integration_test/pubspec.yaml +++ b/integration_test/pubspec.yaml @@ -6,7 +6,7 @@ environment: dependencies: functions_framework: ^0.4.3+1 - json_annotation: ^4.8.1 + json_annotation: ^4.9.0 shelf: ^1.4.0 dev_dependencies: From d45daf7e1f4540e4181c1a42f9bd1bfa50d24374 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Fri, 19 Jul 2024 17:40:14 -0700 Subject: [PATCH 29/43] chore: latest github actions (#474) --- .github/workflows/lint.yml | 40 ++++++++++++++++++------------------ .github/workflows/unit.yml | 42 +++++++++++++++++++------------------- tool/ci.sh | 2 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2b7de74e..25511e7b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.6.1 +# Created with package:mono_repo v6.6.2 name: Dart Lint CI on: push: @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -28,14 +28,14 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - name: mono_repo self validate - run: dart pub global activate mono_repo 6.6.1 + run: dart pub global activate mono_repo 6.6.2 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" 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" @@ -53,12 +53,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -181,7 +181,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" @@ -191,12 +191,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -384,7 +384,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_test;commands:analyze_1" @@ -394,12 +394,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: integration_test_pub_upgrade name: integration_test; dart pub upgrade run: dart pub upgrade @@ -414,7 +414,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:master;packages:examples/fullstack/frontend;commands:format-analyze_2" @@ -424,12 +424,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 + uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 with: channel: master - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade @@ -448,7 +448,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:analyze_3" @@ -458,12 +458,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 + uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 with: channel: stable - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 91ad5f99..2df35605 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.6.1 +# Created with package:mono_repo v6.6.2 name: Dart Unit CI on: push: @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -30,12 +30,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud;commands:command" @@ -87,12 +87,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -117,12 +117,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-functions_framework-integration_test;commands:test_1" @@ -246,12 +246,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -284,7 +284,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud;commands:test_0" @@ -294,12 +294,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -314,7 +314,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:google_cloud;commands:test_0" @@ -324,12 +324,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -344,12 +344,12 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade diff --git a/tool/ci.sh b/tool/ci.sh index 66935543..ea3e54ef 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created with package:mono_repo v6.6.1 +# Created with package:mono_repo v6.6.2 # Support built in commands on windows out of the box. From fa41d699bb014a3680e71d8dba769e3c28eba219 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 14:38:28 -0700 Subject: [PATCH 30/43] build(deps): bump the dependencies group across 1 directory with 3 updates (#475) Bumps the dependencies group with 3 updates in the / directory: [actions/setup-go](https://github.com/actions/setup-go), [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart) and [actions/checkout](https://github.com/actions/checkout). Updates `actions/setup-go` from 5.0.1 to 5.0.2 - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/cdcb36043654635271a94b9a6d1392de5bb323a7...0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32) Updates `dart-lang/setup-dart` from 1.6.4 to 1.6.5 - [Release notes](https://github.com/dart-lang/setup-dart/releases) - [Changelog](https://github.com/dart-lang/setup-dart/blob/main/CHANGELOG.md) - [Commits](https://github.com/dart-lang/setup-dart/compare/v1.6.4...0a8a0fc875eb934c15d08629302413c671d3f672) Updates `actions/checkout` from 4.1.6 to 4.1.7 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.6...692973e3d937129bcbf40652eb9f2f61becf3332) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: dart-lang/setup-dart dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index a250da94..f5f7cd1a 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -26,16 +26,16 @@ jobs: os:ubuntu-latest - name: Setup Go - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: go-version: '^1.16' - - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: stable - run: dart --version - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - run: dart pub upgrade working-directory: integration_test From 128ccec7ecf8d0c4ec54385a8c513a40e4797e2d Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Sat, 20 Jul 2024 14:53:03 -0700 Subject: [PATCH 31/43] chore: code cleanup (#476) --- .../lib/src/analyzer_utils.dart | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/functions_framework_builder/lib/src/analyzer_utils.dart b/functions_framework_builder/lib/src/analyzer_utils.dart index 3974a8e1..1ea67e32 100644 --- a/functions_framework_builder/lib/src/analyzer_utils.dart +++ b/functions_framework_builder/lib/src/analyzer_utils.dart @@ -2,17 +2,16 @@ import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/type.dart'; extension DartTypeExtension on DartType { - String toStringNonNullable() { - final val = getDisplayString(); - if (val.endsWith('?')) return val.substring(0, val.length - 1); - return val; - } + String toStringNonNullable() => getDisplayString().dropQuestion(); } extension ElementExtension on Element { - String toStringNonNullable() { - final val = getDisplayString(); - if (val.endsWith('?')) return val.substring(0, val.length - 1); - return val; + String toStringNonNullable() => getDisplayString().dropQuestion(); +} + +extension on String { + String dropQuestion() { + if (endsWith('?')) return substring(0, length - 1); + return this; } } From 1a8e219097964ddf9edbf013aa9481d66d459bfe Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Mon, 19 Aug 2024 16:37:14 -0700 Subject: [PATCH 32/43] chore: require Dart 3.5, move to workspaces (#479) Work-around for https://github.com/dart-lang/pub/issues/4357 --- .github/workflows/lint.yml | 10 +++---- .github/workflows/unit.yml | 30 ++++++++++---------- .gitignore | 2 ++ dartfn/CHANGELOG.md | 2 +- dartfn/lib/src/generators/cloudevent.g.dart | 2 +- dartfn/lib/src/generators/helloworld.g.dart | 2 +- dartfn/lib/src/generators/json.g.dart | 2 +- dartfn/pubspec.yaml | 3 +- dartfn/templates/cloudevent/pubspec.yaml | 2 +- dartfn/templates/helloworld/pubspec.yaml | 2 +- dartfn/templates/json/pubspec.yaml | 2 +- examples/fullstack/backend/pubspec.yaml | 3 +- examples/fullstack/frontend-cli/pubspec.yaml | 4 +-- examples/fullstack/frontend/pubspec.yaml | 4 +-- examples/hello/pubspec.yaml | 3 +- examples/json/pubspec.yaml | 6 ++-- examples/protobuf_firestore/pubspec.yaml | 5 ++-- examples/raw_cloudevent/pubspec.yaml | 3 +- functions_framework/CHANGELOG.md | 2 +- functions_framework/pubspec.yaml | 3 +- functions_framework_builder/CHANGELOG.md | 2 +- functions_framework_builder/pubspec.yaml | 5 ++-- google_cloud/CHANGELOG.md | 2 +- google_cloud/pubspec.yaml | 3 +- google_cloud/tool/docker_test_script.sh | 3 ++ google_cloud/tool/fix_pubspec.dart | 15 ++++++++++ integration_test/pubspec.yaml | 11 ++----- pubspec.yaml | 19 +++++++++++++ 28 files changed, 94 insertions(+), 58 deletions(-) create mode 100644 .gitignore create mode 100755 google_cloud/tool/fix_pubspec.dart create mode 100644 pubspec.yaml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 25511e7b..8f558965 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -39,23 +39,23 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - 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`" + 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`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - 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" + 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" restore-keys: | - 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 - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + 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 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 2df35605..d46eb578 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -16,23 +16,23 @@ permissions: read-all jobs: job_001: - name: "unit_test; linux; Dart 3.4.0; PKGS: dartfn, functions_framework_builder, google_cloud, integration_test; `dart test`" + name: "unit_test; linux; Dart 3.5.0; PKGS: dartfn, functions_framework_builder, google_cloud, integration_test; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -73,23 +73,23 @@ jobs: if: "always() && steps.integration_test_pub_upgrade.conclusion == 'success'" working-directory: integration_test job_002: - name: "unit_test; linux; Dart 3.4.0; PKG: google_cloud; `./tool/docker_test_script.sh`" + name: "unit_test; linux; Dart 3.5.0; PKG: google_cloud; `./tool/docker_test_script.sh`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud;commands:command" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud;commands:command" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -280,23 +280,23 @@ jobs: if: "always() && steps.integration_test_pub_upgrade.conclusion == 'success'" working-directory: integration_test job_005: - name: "unit_test; macos; Dart 3.4.0; PKG: google_cloud; `dart test`" + name: "unit_test; macos; Dart 3.5.0; PKG: google_cloud; `dart test`" runs-on: macos-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:macos-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud;commands:test_0" + key: "os:macos-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud;commands:test_0" restore-keys: | - os:macos-latest;pub-cache-hosted;sdk:3.4.0;packages:google_cloud - os:macos-latest;pub-cache-hosted;sdk:3.4.0 + os:macos-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud + os:macos-latest;pub-cache-hosted;sdk:3.5.0 os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..6c0f47fd --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.dart_tool +pubspec.lock diff --git a/dartfn/CHANGELOG.md b/dartfn/CHANGELOG.md index 8db03799..f6859368 100644 --- a/dartfn/CHANGELOG.md +++ b/dartfn/CHANGELOG.md @@ -1,7 +1,7 @@ ## 0.4.7-wip - Use latest `dart_flutter_team_lints` version. -- Require Dart 3.4 +- Require Dart 3.5 ## 0.4.6 diff --git a/dartfn/lib/src/generators/cloudevent.g.dart b/dartfn/lib/src/generators/cloudevent.g.dart index cdfcbe14..6de58a29 100644 --- a/dartfn/lib/src/generators/cloudevent.g.dart +++ b/dartfn/lib/src/generators/cloudevent.g.dart @@ -162,7 +162,7 @@ aXR5JzogTG9nU2V2ZXJpdHkuaW5mbywKICAgICAgfSwKICAgICksCiAgKTsKfQo=''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBGdW5jdGlvbnMgRnJh bWV3b3JrIHByb2plY3QgZm9yIGhhbmRsaW5nIGEgY2xvdWRldmVudC4KIyB2ZXJzaW9uOiAwLjEu MAojIGhvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQpwdWJsaXNoX3RvOiBub25lCgpl -bnZpcm9ubWVudDoKICBzZGs6IF4zLjQuMAoKZGVwZW5kZW5jaWVzOgogIGZ1bmN0aW9uc19mcmFt +bnZpcm9ubWVudDoKICBzZGs6IF4zLjUuMAoKZGVwZW5kZW5jaWVzOgogIGZ1bmN0aW9uc19mcmFt ZXdvcms6IF4wLjQuMAogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBlbmRlbmNpZXM6CiAgYnVpbGRf cnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1aWxkZXI6IF4wLjQuMQogIGh0 dHA6IF4xLjAuMAogIGRhcnRfZmx1dHRlcl90ZWFtX2xpbnRzOiBeMy4wLjAKICB0ZXN0OiBeMS4x diff --git a/dartfn/lib/src/generators/helloworld.g.dart b/dartfn/lib/src/generators/helloworld.g.dart index 1aa38d81..1330daa8 100644 --- a/dartfn/lib/src/generators/helloworld.g.dart +++ b/dartfn/lib/src/generators/helloworld.g.dart @@ -150,7 +150,7 @@ bywgV29ybGQhJyk7Cg==''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSAiSGVsbG8sIFdvcmxk ISIgRnVuY3Rpb25zIEZyYW1ld29yayBwcm9qZWN0LgojIHZlcnNpb246IDAuMS4wCiMgaG9tZXBh Z2U6IGh0dHBzOi8vd3d3LmV4YW1wbGUuY29tCnB1Ymxpc2hfdG86IG5vbmUKCmVudmlyb25tZW50 -OgogIHNkazogXjMuNC4wCgpkZXBlbmRlbmNpZXM6CiAgZnVuY3Rpb25zX2ZyYW1ld29yazogXjAu +OgogIHNkazogXjMuNS4wCgpkZXBlbmRlbmNpZXM6CiAgZnVuY3Rpb25zX2ZyYW1ld29yazogXjAu NC4wCiAgc2hlbGY6IF4xLjAuMAoKZGV2X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4y LjAuMAogIGZ1bmN0aW9uc19mcmFtZXdvcmtfYnVpbGRlcjogXjAuNC4xCiAgaHR0cDogXjEuMC4w CiAgZGFydF9mbHV0dGVyX3RlYW1fbGludHM6IF4zLjAuMAogIHRlc3Q6IF4xLjE2LjYKICB0ZXN0 diff --git a/dartfn/lib/src/generators/json.g.dart b/dartfn/lib/src/generators/json.g.dart index 47e43c14..9767a21f 100644 --- a/dartfn/lib/src/generators/json.g.dart +++ b/dartfn/lib/src/generators/json.g.dart @@ -242,7 +242,7 @@ CiAgICAgICduYW1lJzogaW5zdGFuY2UubmFtZSwKICAgIH07Cg==''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBGdW5jdGlvbnMgRnJh bWV3b3JrIHByb2plY3QgZm9yIGhhbmRsaW5nIEpTT04uCiMgdmVyc2lvbjogMC4xLjAKIyBob21l cGFnZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KcHVibGlzaF90bzogbm9uZQoKZW52aXJvbm1l -bnQ6CiAgc2RrOiBeMy40LjAKCmRlcGVuZGVuY2llczoKICBmdW5jdGlvbnNfZnJhbWV3b3JrOiBe +bnQ6CiAgc2RrOiBeMy41LjAKCmRlcGVuZGVuY2llczoKICBmdW5jdGlvbnNfZnJhbWV3b3JrOiBe MC40LjAKICBqc29uX2Fubm90YXRpb246IF40LjkuMAogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBl bmRlbmNpZXM6CiAgYnVpbGRfcnVubmVyOiBeMi4yLjEKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1 aWxkZXI6IF4wLjQuNwogIGh0dHA6IF4xLjAuMAogIGpzb25fc2VyaWFsaXphYmxlOiBeNi42LjAK diff --git a/dartfn/pubspec.yaml b/dartfn/pubspec.yaml index 8532cd20..515d5d82 100644 --- a/dartfn/pubspec.yaml +++ b/dartfn/pubspec.yaml @@ -5,8 +5,9 @@ description: > version: 0.4.7-wip homepage: https://github.com/GoogleCloudPlatform/functions-framework-dart +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0 executables: dartfn: diff --git a/dartfn/templates/cloudevent/pubspec.yaml b/dartfn/templates/cloudevent/pubspec.yaml index 84b9ad5e..78e558c7 100644 --- a/dartfn/templates/cloudevent/pubspec.yaml +++ b/dartfn/templates/cloudevent/pubspec.yaml @@ -5,7 +5,7 @@ description: A sample Functions Framework project for handling a cloudevent. publish_to: none environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: functions_framework: ^0.4.0 diff --git a/dartfn/templates/helloworld/pubspec.yaml b/dartfn/templates/helloworld/pubspec.yaml index 24a50151..4fcd66fe 100644 --- a/dartfn/templates/helloworld/pubspec.yaml +++ b/dartfn/templates/helloworld/pubspec.yaml @@ -5,7 +5,7 @@ description: A sample "Hello, World!" Functions Framework project. publish_to: none environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: functions_framework: ^0.4.0 diff --git a/dartfn/templates/json/pubspec.yaml b/dartfn/templates/json/pubspec.yaml index 1bdb3ec1..cf805d10 100644 --- a/dartfn/templates/json/pubspec.yaml +++ b/dartfn/templates/json/pubspec.yaml @@ -5,7 +5,7 @@ description: A sample Functions Framework project for handling JSON. publish_to: none environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: functions_framework: ^0.4.0 diff --git a/examples/fullstack/backend/pubspec.yaml b/examples/fullstack/backend/pubspec.yaml index 1fcd69dd..f6216f03 100644 --- a/examples/fullstack/backend/pubspec.yaml +++ b/examples/fullstack/backend/pubspec.yaml @@ -1,8 +1,9 @@ name: backend publish_to: none +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: functions_framework: ^0.4.0 diff --git a/examples/fullstack/frontend-cli/pubspec.yaml b/examples/fullstack/frontend-cli/pubspec.yaml index de96554f..80de4a71 100644 --- a/examples/fullstack/frontend-cli/pubspec.yaml +++ b/examples/fullstack/frontend-cli/pubspec.yaml @@ -2,13 +2,13 @@ name: frontend_cli publish_to: none environment: - sdk: ^3.4.0 + sdk: ^3.5.0 executables: greet: dependencies: - http: '>=0.13.1 <2.0.0' + http: ^1.0.0 io: ^1.0.0 json_annotation: ^4.9.0 diff --git a/examples/fullstack/frontend/pubspec.yaml b/examples/fullstack/frontend/pubspec.yaml index 9b698286..06a52877 100644 --- a/examples/fullstack/frontend/pubspec.yaml +++ b/examples/fullstack/frontend/pubspec.yaml @@ -1,10 +1,8 @@ name: fullstack_demo_frontend -description: Flutter frontend for Dart full-stack demo -version: 1.0.0 publish_to: 'none' environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: cupertino_icons: ^1.0.2 diff --git a/examples/hello/pubspec.yaml b/examples/hello/pubspec.yaml index 84ff0270..24d92d2e 100644 --- a/examples/hello/pubspec.yaml +++ b/examples/hello/pubspec.yaml @@ -4,8 +4,9 @@ description: Dart Functions Framework simple function example. repository: https://github.com/GoogleCloudPlatform/functions-framework-dart publish_to: none +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: functions_framework: ^0.4.0 diff --git a/examples/json/pubspec.yaml b/examples/json/pubspec.yaml index 50fc2914..e9151d12 100644 --- a/examples/json/pubspec.yaml +++ b/examples/json/pubspec.yaml @@ -1,11 +1,9 @@ name: example_json_function -version: 0.4.0 -description: Dart Functions Framework simple JSON function example. -repository: https://github.com/GoogleCloudPlatform/functions-framework-dart publish_to: none +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: functions_framework: ^0.4.0 diff --git a/examples/protobuf_firestore/pubspec.yaml b/examples/protobuf_firestore/pubspec.yaml index d7768047..0a7671a5 100644 --- a/examples/protobuf_firestore/pubspec.yaml +++ b/examples/protobuf_firestore/pubspec.yaml @@ -1,8 +1,9 @@ name: example_protobuf_firestore publish_to: none +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: functions_framework: ^0.4.3 @@ -13,6 +14,6 @@ dev_dependencies: build_runner: ^2.2.1 dart_flutter_team_lints: ^3.0.0 functions_framework_builder: ^0.4.10 - http: ">=0.13.5 <2.0.0" + http: ^1.0.0 test: ^1.21.6 test_process: ^2.0.0 diff --git a/examples/raw_cloudevent/pubspec.yaml b/examples/raw_cloudevent/pubspec.yaml index 0ff95315..73d33e1a 100644 --- a/examples/raw_cloudevent/pubspec.yaml +++ b/examples/raw_cloudevent/pubspec.yaml @@ -1,8 +1,9 @@ name: example_raw_cloudevent_function publish_to: none +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: functions_framework: ^0.4.0 diff --git a/functions_framework/CHANGELOG.md b/functions_framework/CHANGELOG.md index 5b7a4596..015f751c 100644 --- a/functions_framework/CHANGELOG.md +++ b/functions_framework/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.4.4-wip -- Require Dart 3.4 +- Require Dart 3.5 ## 0.4.3+1 diff --git a/functions_framework/pubspec.yaml b/functions_framework/pubspec.yaml index 9604b5f0..be67f796 100644 --- a/functions_framework/pubspec.yaml +++ b/functions_framework/pubspec.yaml @@ -4,8 +4,9 @@ description: >- FaaS (Function as a service) framework for writing portable Dart functions repository: https://github.com/GoogleCloudPlatform/functions-framework-dart +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: args: ^2.0.0 diff --git a/functions_framework_builder/CHANGELOG.md b/functions_framework_builder/CHANGELOG.md index 4fb6ea81..37d2e3bd 100644 --- a/functions_framework_builder/CHANGELOG.md +++ b/functions_framework_builder/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.4.11-wip -- Require Dart 3.4 +- Require Dart 3.5 ## 0.4.10 diff --git a/functions_framework_builder/pubspec.yaml b/functions_framework_builder/pubspec.yaml index 8a8fa627..2f5576fd 100644 --- a/functions_framework_builder/pubspec.yaml +++ b/functions_framework_builder/pubspec.yaml @@ -3,8 +3,9 @@ version: 0.4.11-wip description: Builder for package:functions_framework repository: https://github.com/GoogleCloudPlatform/functions-framework-dart +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: analyzer: '>=5.12.0 <7.0.0' @@ -14,7 +15,7 @@ dependencies: dart_style: ^2.2.4 # There is a tight version constraint because the builder has a strict # dependency on all features exposed. - functions_framework: '>=0.4.0 <0.4.4' + functions_framework: '>=0.4.0 <0.4.5' glob: ^2.0.0 meta: ^1.7.0 path: ^1.8.0 diff --git a/google_cloud/CHANGELOG.md b/google_cloud/CHANGELOG.md index 82be3417..0ecadf03 100644 --- a/google_cloud/CHANGELOG.md +++ b/google_cloud/CHANGELOG.md @@ -1,7 +1,7 @@ ## 0.2.1-wip - Require `package:http` `^1.0.0`. -- Require Dart 3.4 +- Require Dart 3.5 ## 0.2.0 diff --git a/google_cloud/pubspec.yaml b/google_cloud/pubspec.yaml index a883d4ed..06a3b381 100644 --- a/google_cloud/pubspec.yaml +++ b/google_cloud/pubspec.yaml @@ -4,8 +4,9 @@ description: >- version: 0.2.1-wip repository: https://github.com/GoogleCloudPlatform/functions-framework-dart/tree/main/google_cloud +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: collection: ^1.17.0 diff --git a/google_cloud/tool/docker_test_script.sh b/google_cloud/tool/docker_test_script.sh index eeefd5fd..dc2b0303 100755 --- a/google_cloud/tool/docker_test_script.sh +++ b/google_cloud/tool/docker_test_script.sh @@ -2,6 +2,9 @@ set -e +__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +${__dir}/fix_pubspec.dart + image="$(docker build -q .)" echo Image created: "$image" container=$(docker run -d -p 8080:8080 --rm "$image") diff --git a/google_cloud/tool/fix_pubspec.dart b/google_cloud/tool/fix_pubspec.dart new file mode 100755 index 00000000..23dfbe03 --- /dev/null +++ b/google_cloud/tool/fix_pubspec.dart @@ -0,0 +1,15 @@ +#!/usr/bin/env dart + +import 'dart:io'; + +// Removes the `workspace` property from the pubspec so it can be used via +// Docker. +// Work-around for https://github.com/dart-lang/pub/issues/4357 +void main(List args) { + final file = File('pubspec.yaml'); + final content = file.readAsStringSync().replaceAll(_content, ''); + file.writeAsStringSync(content); +} + +const _content = r'''resolution: workspace +'''; diff --git a/integration_test/pubspec.yaml b/integration_test/pubspec.yaml index 53b5dc0f..c74bb66d 100644 --- a/integration_test/pubspec.yaml +++ b/integration_test/pubspec.yaml @@ -1,8 +1,9 @@ name: hello_world_function_test publish_to: none +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0 dependencies: functions_framework: ^0.4.3+1 @@ -21,11 +22,3 @@ dev_dependencies: json_serializable: ^6.6.0 test: ^1.21.6 test_process: ^2.0.0 - -dependency_overrides: - functions_framework: - path: ../functions_framework - functions_framework_builder: - path: ../functions_framework_builder - google_cloud: - path: ../google_cloud diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 00000000..80cdd535 --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,19 @@ +name: ffd_workspace # Can be anything +environment: + sdk: ^3.5.0 + +publish_to: none + +dev_dependencies: + dart_flutter_team_lints: ^3.2.0 +workspace: + - dartfn + - examples/fullstack/backend + - examples/hello + - examples/json + - examples/protobuf_firestore + - examples/raw_cloudevent + - functions_framework + - functions_framework_builder + - google_cloud + - integration_test From 818477fb31d2af9e03a140644412374f9200067f Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Mon, 19 Aug 2024 16:44:25 -0700 Subject: [PATCH 33/43] chore: move one more example to workspaces (#481) --- examples/fullstack/frontend-cli/pubspec.yaml | 1 + pubspec.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/examples/fullstack/frontend-cli/pubspec.yaml b/examples/fullstack/frontend-cli/pubspec.yaml index 80de4a71..edef9e7d 100644 --- a/examples/fullstack/frontend-cli/pubspec.yaml +++ b/examples/fullstack/frontend-cli/pubspec.yaml @@ -1,6 +1,7 @@ name: frontend_cli publish_to: none +resolution: workspace environment: sdk: ^3.5.0 diff --git a/pubspec.yaml b/pubspec.yaml index 80cdd535..91877223 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,6 +9,7 @@ dev_dependencies: workspace: - dartfn - examples/fullstack/backend + - examples/fullstack/frontend-cli - examples/hello - examples/json - examples/protobuf_firestore From e80b2dae941ed3bfbd40a9a475f8983ac9810170 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Sun, 8 Dec 2024 09:37:50 -0800 Subject: [PATCH 34/43] chore: Drop notify on failure, update deps (#486) --- .github/workflows/lint.yml | 18 ---------- .github/workflows/unit.yml | 19 ----------- .../lib/src/cloud_event.g.dart | 34 +++++++------------ functions_framework/pubspec.yaml | 2 +- integration_test/test/cli_test.dart | 4 +-- mono_repo.yaml | 13 ------- 6 files changed, 16 insertions(+), 74 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8f558965..04c2ae4d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -473,21 +473,3 @@ jobs: run: flutter analyze if: "always() && steps.examples_fullstack_frontend_pub_upgrade.conclusion == 'success'" working-directory: examples/fullstack/frontend - job_007: - name: Notify failure - runs-on: ubuntu-latest - if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()" - steps: - - run: | - curl -H "Content-Type: application/json" -X POST -d \ - "{'text':'Build failed! ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}'}" \ - "${CHAT_WEBHOOK_URL}" - env: - CHAT_WEBHOOK_URL: "${{ secrets.CHAT_WEBHOOK_URL }}" - needs: - - job_001 - - job_002 - - job_003 - - job_004 - - job_005 - - job_006 diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index d46eb578..60587790 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -359,22 +359,3 @@ jobs: run: dart test if: "always() && steps.google_cloud_pub_upgrade.conclusion == 'success'" working-directory: google_cloud - job_008: - name: Notify failure - runs-on: ubuntu-latest - if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()" - steps: - - run: | - curl -H "Content-Type: application/json" -X POST -d \ - "{'text':'Build failed! ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}'}" \ - "${CHAT_WEBHOOK_URL}" - env: - CHAT_WEBHOOK_URL: "${{ secrets.CHAT_WEBHOOK_URL }}" - needs: - - job_001 - - job_002 - - job_003 - - job_004 - - job_005 - - job_006 - - job_007 diff --git a/functions_framework/lib/src/cloud_event.g.dart b/functions_framework/lib/src/cloud_event.g.dart index 856ad049..5a531802 100644 --- a/functions_framework/lib/src/cloud_event.g.dart +++ b/functions_framework/lib/src/cloud_event.g.dart @@ -39,24 +39,16 @@ CloudEvent _$CloudEventFromJson(Map json) => $checkedCreate( }, ); -Map _$CloudEventToJson(CloudEvent instance) { - final val = { - 'id': instance.id, - 'source': instance.source.toString(), - 'specversion': instance.specVersion, - 'type': instance.type, - }; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('datacontenttype', instance.dataContentType); - writeNotNull('data', instance.data); - writeNotNull('dataschema', instance.dataSchema?.toString()); - writeNotNull('subject', instance.subject); - writeNotNull('time', instance.time?.toIso8601String()); - return val; -} +Map _$CloudEventToJson(CloudEvent instance) => + { + 'id': instance.id, + 'source': instance.source.toString(), + 'specversion': instance.specVersion, + 'type': instance.type, + if (instance.dataContentType case final value?) 'datacontenttype': value, + if (instance.data case final value?) 'data': value, + if (instance.dataSchema?.toString() case final value?) + 'dataschema': value, + if (instance.subject case final value?) 'subject': value, + if (instance.time?.toIso8601String() case final value?) 'time': value, + }; diff --git a/functions_framework/pubspec.yaml b/functions_framework/pubspec.yaml index be67f796..9fb6a97a 100644 --- a/functions_framework/pubspec.yaml +++ b/functions_framework/pubspec.yaml @@ -24,5 +24,5 @@ dev_dependencies: build_runner: ^2.2.1 build_verify: ^3.0.0 dart_flutter_team_lints: ^3.0.0 - json_serializable: ^6.6.0 + json_serializable: ^6.9.0 test: ^1.21.6 diff --git a/integration_test/test/cli_test.dart b/integration_test/test/cli_test.dart index b1c2cd38..6a82a8f4 100644 --- a/integration_test/test/cli_test.dart +++ b/integration_test/test/cli_test.dart @@ -157,7 +157,7 @@ void main() { await expectLater( proc.stderr, emitsInOrder([ - 'Could not find an option named "bob".', + 'Could not find an option named "--bob".', ...LineSplitter.split(_usage), ]), ); @@ -193,7 +193,7 @@ void main() { await expectLater( proc.stderr, emitsInOrder([ - '"foo" is not an allowed value for option "signature-type".', + '"foo" is not an allowed value for option "--signature-type".', ...LineSplitter.split(_usage), ]), ); diff --git a/mono_repo.yaml b/mono_repo.yaml index 491eb52a..090a1aa0 100644 --- a/mono_repo.yaml +++ b/mono_repo.yaml @@ -25,16 +25,3 @@ github: name: Dart Unit CI stages: - unit_test - - on_completion: - - name: "Notify failure" - runs-on: ubuntu-latest - # Run only if other jobs have failed and this is a push or scheduled build. - if: (github.event_name == 'push' || github.event_name == 'schedule') && failure() - steps: - - run: > - curl -H "Content-Type: application/json" -X POST -d \ - "{'text':'Build failed! ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}'}" \ - "${CHAT_WEBHOOK_URL}" - env: - CHAT_WEBHOOK_URL: ${{ secrets.CHAT_WEBHOOK_URL }} From 9a1a73a39ad134b8f9db29dfa942f0a61015f0bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 16:54:51 -0800 Subject: [PATCH 35/43] build(deps): bump the dependencies group across 1 directory with 5 updates (#485) Bumps the dependencies group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/cache](https://github.com/actions/cache) | `4.0.2` | `4.1.2` | | [actions/setup-go](https://github.com/actions/setup-go) | `5.0.2` | `5.1.0` | | [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart) | `1.6.5` | `1.7.0` | | [actions/checkout](https://github.com/actions/checkout) | `4.1.7` | `4.2.2` | | [subosito/flutter-action](https://github.com/subosito/flutter-action) | `2.16.0` | `2.17.0` | Updates `actions/cache` from 4.0.2 to 4.1.2 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/0c45773b623bea8c8e75f6c82b208c3cf94ea4f9...6849a6489940f00c2f30c0fb92c6274307ccb58a) Updates `actions/setup-go` from 5.0.2 to 5.1.0 - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32...41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed) Updates `dart-lang/setup-dart` from 1.6.5 to 1.7.0 - [Release notes](https://github.com/dart-lang/setup-dart/releases) - [Changelog](https://github.com/dart-lang/setup-dart/blob/main/CHANGELOG.md) - [Commits](https://github.com/dart-lang/setup-dart/compare/0a8a0fc875eb934c15d08629302413c671d3f672...e630b99d28a3b71860378cafdc2a067c71107f94) Updates `actions/checkout` from 4.1.7 to 4.2.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...11bd71901bbe5b1630ceea73d27597364c9af683) Updates `subosito/flutter-action` from 2.16.0 to 2.17.0 - [Release notes](https://github.com/subosito/flutter-action/releases) - [Commits](https://github.com/subosito/flutter-action/compare/44ac965b96f18d999802d4b807e3256d5a3f9fa1...74af56c5ed2697ba4621264652728e8d217e53d3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: dart-lang/setup-dart dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: subosito/flutter-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 8 +++---- .github/workflows/lint.yml | 36 ++++++++++++++-------------- .github/workflows/unit.yml | 40 +++++++++++++++---------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index f5f7cd1a..04c830e5 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;dart:2.10.0;" @@ -26,16 +26,16 @@ jobs: os:ubuntu-latest - name: Setup Go - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed with: go-version: '^1.16' - - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: stable - run: dart --version - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: dart pub upgrade working-directory: integration_test diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 04c2ae4d..8e9f973c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -28,12 +28,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: mono_repo self validate run: dart pub global activate mono_repo 6.6.2 - name: mono_repo self validate @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" 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" @@ -53,12 +53,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.5.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -181,7 +181,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" @@ -191,12 +191,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -384,7 +384,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_test;commands:analyze_1" @@ -394,12 +394,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: integration_test_pub_upgrade name: integration_test; dart pub upgrade run: dart pub upgrade @@ -414,7 +414,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:master;packages:examples/fullstack/frontend;commands:format-analyze_2" @@ -424,12 +424,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 + uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 with: channel: master - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade @@ -448,7 +448,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:analyze_3" @@ -458,12 +458,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 + uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 with: channel: stable - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 60587790..04f4f286 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -30,12 +30,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.5.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud;commands:command" @@ -87,12 +87,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.5.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -117,12 +117,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-functions_framework-integration_test;commands:test_1" @@ -246,12 +246,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -284,7 +284,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud;commands:test_0" @@ -294,12 +294,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.5.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -314,7 +314,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:google_cloud;commands:test_0" @@ -324,12 +324,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -344,12 +344,12 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade From cfd52ff0a5222d561d6a6e788b02df15348b1cdb Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Fri, 27 Dec 2024 14:41:04 -0600 Subject: [PATCH 36/43] chore: bump latest deps (#487) --- .github/workflows/lint.yml | 103 +++++------------- .github/workflows/unit.yml | 70 ++++++------ analysis_options.yaml | 1 - dartfn/lib/src/generators/cloudevent.g.dart | 3 +- dartfn/lib/src/generators/helloworld.g.dart | 3 +- dartfn/lib/src/generators/json.g.dart | 3 +- dartfn/pubspec.yaml | 4 +- dartfn/templates/cloudevent/pubspec.yaml | 2 +- dartfn/templates/helloworld/pubspec.yaml | 2 +- dartfn/templates/json/pubspec.yaml | 2 +- dartfn/tool/builder/builder.dart | 2 +- examples/fullstack/backend/pubspec.yaml | 2 +- examples/fullstack/frontend-cli/pubspec.yaml | 2 +- examples/fullstack/frontend/mono_pkg.yaml | 10 +- examples/fullstack/frontend/pubspec.yaml | 2 +- examples/hello/pubspec.yaml | 2 +- examples/json/pubspec.yaml | 2 +- examples/protobuf_firestore/pubspec.yaml | 2 +- examples/raw_cloudevent/pubspec.yaml | 2 +- functions_framework/pubspec.yaml | 2 +- functions_framework_builder/CHANGELOG.md | 1 + functions_framework_builder/lib/builder.dart | 14 ++- functions_framework_builder/pubspec.yaml | 8 +- .../test/builder_test.dart | 4 +- google_cloud/pubspec.yaml | 2 +- integration_test/bin/server.dart | 4 +- integration_test/pubspec.yaml | 2 +- mono_repo.yaml | 3 +- pubspec.yaml | 2 +- tool/ci.sh | 4 - 30 files changed, 110 insertions(+), 155 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8e9f973c..61fdecd4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,49 +16,26 @@ permissions: read-all jobs: job_001: - name: mono_repo self validate + name: "analyze_format; Dart 3.6.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`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.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" restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.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 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: stable + sdk: "3.6.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - name: mono_repo self validate - run: dart pub global activate mono_repo 6.6.2 - - name: mono_repo self validate - run: dart pub global run mono_repo generate --validate - job_002: - 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`" - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a - with: - path: "~/.pub-cache/hosted" - 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" - restore-keys: | - 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 - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 - with: - sdk: "3.5.0" - - id: checkout - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -176,12 +153,12 @@ jobs: run: dart analyze if: "always() && steps.google_cloud_pub_upgrade.conclusion == 'success'" working-directory: google_cloud - job_003: + job_002: name: "analyze_format; Dart dev; 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, integration_test; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" @@ -191,12 +168,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -379,12 +356,12 @@ jobs: run: dart analyze --fatal-infos if: "always() && steps.integration_test_pub_upgrade.conclusion == 'success'" working-directory: integration_test - job_004: + job_003: name: "analyze_format; Dart dev; PKG: integration_test; `dart analyze`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_test;commands:analyze_1" @@ -394,12 +371,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: integration_test_pub_upgrade name: integration_test; dart pub upgrade run: dart pub upgrade @@ -409,27 +386,27 @@ jobs: run: dart analyze if: "always() && steps.integration_test_pub_upgrade.conclusion == 'success'" working-directory: integration_test - job_005: - name: "analyze_format; Flutter master; PKG: examples/fullstack/frontend; `dart format --output=none --set-exit-if-changed .`, `flutter analyze --fatal-infos`" + job_004: + name: "analyze_format; Flutter stable; PKG: examples/fullstack/frontend; `dart format --output=none --set-exit-if-changed .`, `flutter analyze --fatal-infos`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:master;packages:examples/fullstack/frontend;commands:format-analyze_2" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:format-analyze_2" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:master;packages:examples/fullstack/frontend - os:ubuntu-latest;pub-cache-hosted;sdk:master + os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend + os:ubuntu-latest;pub-cache-hosted;sdk:stable os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 + uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 with: - channel: master + channel: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade @@ -443,33 +420,3 @@ jobs: run: flutter analyze --fatal-infos if: "always() && steps.examples_fullstack_frontend_pub_upgrade.conclusion == 'success'" working-directory: examples/fullstack/frontend - job_006: - name: "analyze_format; Flutter stable; PKG: examples/fullstack/frontend; `flutter analyze`" - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:analyze_3" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend - os:ubuntu-latest;pub-cache-hosted;sdk:stable - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - name: Setup Flutter SDK - uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 - with: - channel: stable - - id: checkout - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - id: examples_fullstack_frontend_pub_upgrade - name: examples/fullstack/frontend; flutter pub upgrade - run: flutter pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: examples/fullstack/frontend - - name: examples/fullstack/frontend; flutter analyze - run: flutter analyze - if: "always() && steps.examples_fullstack_frontend_pub_upgrade.conclusion == 'success'" - working-directory: examples/fullstack/frontend diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 04f4f286..11ee5e54 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -16,26 +16,26 @@ permissions: read-all jobs: job_001: - name: "unit_test; linux; Dart 3.5.0; PKGS: dartfn, functions_framework_builder, google_cloud, integration_test; `dart test`" + name: "unit_test; linux; Dart 3.6.0; PKGS: dartfn, functions_framework_builder, google_cloud, integration_test; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -73,26 +73,26 @@ jobs: if: "always() && steps.integration_test_pub_upgrade.conclusion == 'success'" working-directory: integration_test job_002: - name: "unit_test; linux; Dart 3.5.0; PKG: google_cloud; `./tool/docker_test_script.sh`" + name: "unit_test; linux; Dart 3.6.0; PKG: google_cloud; `./tool/docker_test_script.sh`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud;commands:command" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:google_cloud;commands:command" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:google_cloud + os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -117,12 +117,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-functions_framework-integration_test;commands:test_1" @@ -246,12 +246,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -280,26 +280,26 @@ jobs: if: "always() && steps.integration_test_pub_upgrade.conclusion == 'success'" working-directory: integration_test job_005: - name: "unit_test; macos; Dart 3.5.0; PKG: google_cloud; `dart test`" + name: "unit_test; macos; Dart 3.6.0; PKG: google_cloud; `dart test`" runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:macos-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud;commands:test_0" + key: "os:macos-latest;pub-cache-hosted;sdk:3.6.0;packages:google_cloud;commands:test_0" restore-keys: | - os:macos-latest;pub-cache-hosted;sdk:3.5.0;packages:google_cloud - os:macos-latest;pub-cache-hosted;sdk:3.5.0 + os:macos-latest;pub-cache-hosted;sdk:3.6.0;packages:google_cloud + os:macos-latest;pub-cache-hosted;sdk:3.6.0 os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.5.0" + sdk: "3.6.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -314,7 +314,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:google_cloud;commands:test_0" @@ -324,12 +324,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -344,12 +344,12 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade diff --git a/analysis_options.yaml b/analysis_options.yaml index d1e72ff8..d01fa62b 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -23,7 +23,6 @@ linter: - literal_only_boolean_expressions - missing_whitespace_between_adjacent_strings - no_runtimeType_toString - - package_api_docs - prefer_const_declarations - prefer_expression_function_bodies - prefer_final_locals diff --git a/dartfn/lib/src/generators/cloudevent.g.dart b/dartfn/lib/src/generators/cloudevent.g.dart index 6de58a29..f42b1a53 100644 --- a/dartfn/lib/src/generators/cloudevent.g.dart +++ b/dartfn/lib/src/generators/cloudevent.g.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'cloudevent.dart'; @@ -162,7 +163,7 @@ aXR5JzogTG9nU2V2ZXJpdHkuaW5mbywKICAgICAgfSwKICAgICksCiAgKTsKfQo=''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBGdW5jdGlvbnMgRnJh bWV3b3JrIHByb2plY3QgZm9yIGhhbmRsaW5nIGEgY2xvdWRldmVudC4KIyB2ZXJzaW9uOiAwLjEu MAojIGhvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQpwdWJsaXNoX3RvOiBub25lCgpl -bnZpcm9ubWVudDoKICBzZGs6IF4zLjUuMAoKZGVwZW5kZW5jaWVzOgogIGZ1bmN0aW9uc19mcmFt +bnZpcm9ubWVudDoKICBzZGs6IF4zLjYuMAoKZGVwZW5kZW5jaWVzOgogIGZ1bmN0aW9uc19mcmFt ZXdvcms6IF4wLjQuMAogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBlbmRlbmNpZXM6CiAgYnVpbGRf cnVubmVyOiBeMi4wLjAKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1aWxkZXI6IF4wLjQuMQogIGh0 dHA6IF4xLjAuMAogIGRhcnRfZmx1dHRlcl90ZWFtX2xpbnRzOiBeMy4wLjAKICB0ZXN0OiBeMS4x diff --git a/dartfn/lib/src/generators/helloworld.g.dart b/dartfn/lib/src/generators/helloworld.g.dart index 1330daa8..4e60efbe 100644 --- a/dartfn/lib/src/generators/helloworld.g.dart +++ b/dartfn/lib/src/generators/helloworld.g.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'helloworld.dart'; @@ -150,7 +151,7 @@ bywgV29ybGQhJyk7Cg==''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSAiSGVsbG8sIFdvcmxk ISIgRnVuY3Rpb25zIEZyYW1ld29yayBwcm9qZWN0LgojIHZlcnNpb246IDAuMS4wCiMgaG9tZXBh Z2U6IGh0dHBzOi8vd3d3LmV4YW1wbGUuY29tCnB1Ymxpc2hfdG86IG5vbmUKCmVudmlyb25tZW50 -OgogIHNkazogXjMuNS4wCgpkZXBlbmRlbmNpZXM6CiAgZnVuY3Rpb25zX2ZyYW1ld29yazogXjAu +OgogIHNkazogXjMuNi4wCgpkZXBlbmRlbmNpZXM6CiAgZnVuY3Rpb25zX2ZyYW1ld29yazogXjAu NC4wCiAgc2hlbGY6IF4xLjAuMAoKZGV2X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4y LjAuMAogIGZ1bmN0aW9uc19mcmFtZXdvcmtfYnVpbGRlcjogXjAuNC4xCiAgaHR0cDogXjEuMC4w CiAgZGFydF9mbHV0dGVyX3RlYW1fbGludHM6IF4zLjAuMAogIHRlc3Q6IF4xLjE2LjYKICB0ZXN0 diff --git a/dartfn/lib/src/generators/json.g.dart b/dartfn/lib/src/generators/json.g.dart index 9767a21f..b811367c 100644 --- a/dartfn/lib/src/generators/json.g.dart +++ b/dartfn/lib/src/generators/json.g.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND part of 'json.dart'; @@ -242,7 +243,7 @@ CiAgICAgICduYW1lJzogaW5zdGFuY2UubmFtZSwKICAgIH07Cg==''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBGdW5jdGlvbnMgRnJh bWV3b3JrIHByb2plY3QgZm9yIGhhbmRsaW5nIEpTT04uCiMgdmVyc2lvbjogMC4xLjAKIyBob21l cGFnZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KcHVibGlzaF90bzogbm9uZQoKZW52aXJvbm1l -bnQ6CiAgc2RrOiBeMy41LjAKCmRlcGVuZGVuY2llczoKICBmdW5jdGlvbnNfZnJhbWV3b3JrOiBe +bnQ6CiAgc2RrOiBeMy42LjAKCmRlcGVuZGVuY2llczoKICBmdW5jdGlvbnNfZnJhbWV3b3JrOiBe MC40LjAKICBqc29uX2Fubm90YXRpb246IF40LjkuMAogIHNoZWxmOiBeMS4wLjAKCmRldl9kZXBl bmRlbmNpZXM6CiAgYnVpbGRfcnVubmVyOiBeMi4yLjEKICBmdW5jdGlvbnNfZnJhbWV3b3JrX2J1 aWxkZXI6IF4wLjQuNwogIGh0dHA6IF4xLjAuMAogIGpzb25fc2VyaWFsaXphYmxlOiBeNi42LjAK diff --git a/dartfn/pubspec.yaml b/dartfn/pubspec.yaml index 515d5d82..d5ee0938 100644 --- a/dartfn/pubspec.yaml +++ b/dartfn/pubspec.yaml @@ -7,7 +7,7 @@ homepage: https://github.com/GoogleCloudPlatform/functions-framework-dart resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0 executables: dartfn: @@ -28,6 +28,6 @@ dev_dependencies: dart_flutter_team_lints: ^3.0.0 glob: ^2.0.0 grinder: ^0.9.0 - source_gen: ^1.0.0 + source_gen: '>=1.0.0 <3.0.0' test: ^1.16.6 yaml: ^3.1.0 diff --git a/dartfn/templates/cloudevent/pubspec.yaml b/dartfn/templates/cloudevent/pubspec.yaml index 78e558c7..dd66aa0f 100644 --- a/dartfn/templates/cloudevent/pubspec.yaml +++ b/dartfn/templates/cloudevent/pubspec.yaml @@ -5,7 +5,7 @@ description: A sample Functions Framework project for handling a cloudevent. publish_to: none environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: functions_framework: ^0.4.0 diff --git a/dartfn/templates/helloworld/pubspec.yaml b/dartfn/templates/helloworld/pubspec.yaml index 4fcd66fe..97b61139 100644 --- a/dartfn/templates/helloworld/pubspec.yaml +++ b/dartfn/templates/helloworld/pubspec.yaml @@ -5,7 +5,7 @@ description: A sample "Hello, World!" Functions Framework project. publish_to: none environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: functions_framework: ^0.4.0 diff --git a/dartfn/templates/json/pubspec.yaml b/dartfn/templates/json/pubspec.yaml index cf805d10..207d3473 100644 --- a/dartfn/templates/json/pubspec.yaml +++ b/dartfn/templates/json/pubspec.yaml @@ -5,7 +5,7 @@ description: A sample Functions Framework project for handling JSON. publish_to: none environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: functions_framework: ^0.4.0 diff --git a/dartfn/tool/builder/builder.dart b/dartfn/tool/builder/builder.dart index df0096b8..642edf78 100644 --- a/dartfn/tool/builder/builder.dart +++ b/dartfn/tool/builder/builder.dart @@ -17,7 +17,7 @@ import 'package:source_gen/source_gen.dart'; import 'src/code_generator.dart'; -Builder builder([_]) => PartBuilder( +Builder builder([BuilderOptions? _]) => PartBuilder( [ DataGenerator(), ], diff --git a/examples/fullstack/backend/pubspec.yaml b/examples/fullstack/backend/pubspec.yaml index f6216f03..4a0eb53b 100644 --- a/examples/fullstack/backend/pubspec.yaml +++ b/examples/fullstack/backend/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: functions_framework: ^0.4.0 diff --git a/examples/fullstack/frontend-cli/pubspec.yaml b/examples/fullstack/frontend-cli/pubspec.yaml index edef9e7d..e6d84b13 100644 --- a/examples/fullstack/frontend-cli/pubspec.yaml +++ b/examples/fullstack/frontend-cli/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0 executables: greet: diff --git a/examples/fullstack/frontend/mono_pkg.yaml b/examples/fullstack/frontend/mono_pkg.yaml index e7ee7b66..0b54dc8c 100644 --- a/examples/fullstack/frontend/mono_pkg.yaml +++ b/examples/fullstack/frontend/mono_pkg.yaml @@ -5,7 +5,9 @@ stages: - group: - format - analyze: --fatal-infos - sdk: master - - group: - - analyze - sdk: stable + sdk: stable # main - debug this! +# Need to figure why main/master doesn't work! +# - group: +# - analyze +# sdk: stable +# diff --git a/examples/fullstack/frontend/pubspec.yaml b/examples/fullstack/frontend/pubspec.yaml index 06a52877..d4a2b5c7 100644 --- a/examples/fullstack/frontend/pubspec.yaml +++ b/examples/fullstack/frontend/pubspec.yaml @@ -2,7 +2,7 @@ name: fullstack_demo_frontend publish_to: 'none' environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: cupertino_icons: ^1.0.2 diff --git a/examples/hello/pubspec.yaml b/examples/hello/pubspec.yaml index 24d92d2e..43f7d21f 100644 --- a/examples/hello/pubspec.yaml +++ b/examples/hello/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: functions_framework: ^0.4.0 diff --git a/examples/json/pubspec.yaml b/examples/json/pubspec.yaml index e9151d12..6eb0cb10 100644 --- a/examples/json/pubspec.yaml +++ b/examples/json/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: functions_framework: ^0.4.0 diff --git a/examples/protobuf_firestore/pubspec.yaml b/examples/protobuf_firestore/pubspec.yaml index 0a7671a5..891ea987 100644 --- a/examples/protobuf_firestore/pubspec.yaml +++ b/examples/protobuf_firestore/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: functions_framework: ^0.4.3 diff --git a/examples/raw_cloudevent/pubspec.yaml b/examples/raw_cloudevent/pubspec.yaml index 73d33e1a..a1772395 100644 --- a/examples/raw_cloudevent/pubspec.yaml +++ b/examples/raw_cloudevent/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: functions_framework: ^0.4.0 diff --git a/functions_framework/pubspec.yaml b/functions_framework/pubspec.yaml index 9fb6a97a..39d47cc6 100644 --- a/functions_framework/pubspec.yaml +++ b/functions_framework/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/GoogleCloudPlatform/functions-framework-dart resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: args: ^2.0.0 diff --git a/functions_framework_builder/CHANGELOG.md b/functions_framework_builder/CHANGELOG.md index 37d2e3bd..a17eb1ba 100644 --- a/functions_framework_builder/CHANGELOG.md +++ b/functions_framework_builder/CHANGELOG.md @@ -1,5 +1,6 @@ ## 0.4.11-wip +- Support the latest versions of `analyzer`, `dart_style` and `source_gen`. - Require Dart 3.5 ## 0.4.10 diff --git a/functions_framework_builder/lib/builder.dart b/functions_framework_builder/lib/builder.dart index 880da2df..a2a3f239 100644 --- a/functions_framework_builder/lib/builder.dart +++ b/functions_framework_builder/lib/builder.dart @@ -48,9 +48,7 @@ class _FunctionsFrameworkBuilder implements Builder { Future build(BuildStep buildStep) async { final entries = {}; - final input = buildStep.inputId; - - final libraryElement = await buildStep.resolver.libraryFor(input); + final libraryElement = await buildStep.inputLibrary; final validator = await FunctionTypeValidator.create(buildStep.resolver); for (var annotatedElement in _fromLibrary(libraryElement)) { @@ -89,7 +87,7 @@ class _FunctionsFrameworkBuilder implements Builder { final importDirectives = [ "'package:functions_framework/serve.dart'", - "'${input.uri}' as $functionsLibraryPrefix", + "'${buildStep.inputId.uri}' as $functionsLibraryPrefix", ]..sort(); var output = ''' @@ -100,7 +98,7 @@ class _FunctionsFrameworkBuilder implements Builder { // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -108,6 +106,8 @@ class _FunctionsFrameworkBuilder implements Builder { // See the License for the specific language governing permissions and // limitations under the License. +// @dart=3.6 + ${importDirectives.map((e) => 'import $e;').join('\n')} Future main(List args) async { @@ -122,7 +122,9 @@ ${cases.join('\n')} '''; try { - output = DartFormatter().format(output); + output = DartFormatter( + languageVersion: libraryElement.languageVersion.effective, + ).format(output); } on FormatterException catch (e, stack) { log.warning('Could not format output.', e, stack); } diff --git a/functions_framework_builder/pubspec.yaml b/functions_framework_builder/pubspec.yaml index 2f5576fd..e1b844bd 100644 --- a/functions_framework_builder/pubspec.yaml +++ b/functions_framework_builder/pubspec.yaml @@ -5,14 +5,14 @@ repository: https://github.com/GoogleCloudPlatform/functions-framework-dart resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: - analyzer: '>=5.12.0 <7.0.0' + analyzer: '>=6.9.0 <8.0.0' build: ^2.3.1 build_config: ^1.0.0 collection: ^1.17.0 - dart_style: ^2.2.4 + dart_style: '>=2.3.7 <4.0.0' # There is a tight version constraint because the builder has a strict # dependency on all features exposed. functions_framework: '>=0.4.0 <0.4.5' @@ -20,7 +20,7 @@ dependencies: meta: ^1.7.0 path: ^1.8.0 shelf: ^1.0.0 - source_gen: ^1.2.3 + source_gen: '>=1.4.0 <3.0.0' source_helper: ^1.3.3 dev_dependencies: diff --git a/functions_framework_builder/test/builder_test.dart b/functions_framework_builder/test/builder_test.dart index cccc4c5d..09c574fe 100644 --- a/functions_framework_builder/test/builder_test.dart +++ b/functions_framework_builder/test/builder_test.dart @@ -669,7 +669,7 @@ String get _outputHeader => ''' // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -677,6 +677,8 @@ String get _outputHeader => ''' // See the License for the specific language governing permissions and // limitations under the License. +// @dart=3.6 + import 'package:functions_framework/serve.dart'; import 'package:$_pkgName/functions.dart' as function_library; diff --git a/google_cloud/pubspec.yaml b/google_cloud/pubspec.yaml index 06a3b381..1f0f9a21 100644 --- a/google_cloud/pubspec.yaml +++ b/google_cloud/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/GoogleCloudPlatform/functions-framework-dart/tree resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: collection: ^1.17.0 diff --git a/integration_test/bin/server.dart b/integration_test/bin/server.dart index 6b155d0e..65b0baff 100644 --- a/integration_test/bin/server.dart +++ b/integration_test/bin/server.dart @@ -5,7 +5,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +// @dart=3.6 + import 'package:functions_framework/serve.dart'; import 'package:hello_world_function_test/functions.dart' as function_library; diff --git a/integration_test/pubspec.yaml b/integration_test/pubspec.yaml index c74bb66d..e07b4211 100644 --- a/integration_test/pubspec.yaml +++ b/integration_test/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: functions_framework: ^0.4.3+1 diff --git a/mono_repo.yaml b/mono_repo.yaml index 090a1aa0..00abcbcb 100644 --- a/mono_repo.yaml +++ b/mono_repo.yaml @@ -1,6 +1,7 @@ # https://github.com/google/mono_repo.dart -self_validate: analyze_format +# TODO: need to fix the logic here! +#self_validate: analyze_format merge_stages: - analyze_format diff --git a/pubspec.yaml b/pubspec.yaml index 91877223..8e3d8f2f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: ffd_workspace # Can be anything environment: - sdk: ^3.5.0 + sdk: ^3.6.0 publish_to: none diff --git a/tool/ci.sh b/tool/ci.sh index ea3e54ef..f622b21f 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -75,10 +75,6 @@ for PKG in ${PKGS}; do echo 'flutter analyze --fatal-infos' flutter analyze --fatal-infos || EXIT_CODE=$? ;; - analyze_3) - echo 'flutter analyze' - flutter analyze || EXIT_CODE=$? - ;; command) echo './tool/docker_test_script.sh' ./tool/docker_test_script.sh || EXIT_CODE=$? From 015b7e3af8cbbb2e1d2397f3ed1d165dbbccb088 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 08:43:57 -0800 Subject: [PATCH 37/43] build(deps): bump the dependencies group with 5 updates (#488) Bumps the dependencies group with 5 updates: | Package | From | To | | --- | --- | --- | | [actions/cache](https://github.com/actions/cache) | `4.0.2` | `4.2.0` | | [actions/setup-go](https://github.com/actions/setup-go) | `5.1.0` | `5.2.0` | | [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart) | `1.6.5` | `1.7.0` | | [actions/checkout](https://github.com/actions/checkout) | `4.1.7` | `4.2.2` | | [subosito/flutter-action](https://github.com/subosito/flutter-action) | `2.16.0` | `2.18.0` | Updates `actions/cache` from 4.0.2 to 4.2.0 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v4.0.2...1bd1e32a3bdc45362d1e726936510720a7c30a57) Updates `actions/setup-go` from 5.1.0 to 5.2.0 - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed...3041bf56c941b39c61721a86cd11f3bb1338122a) Updates `dart-lang/setup-dart` from 1.6.5 to 1.7.0 - [Release notes](https://github.com/dart-lang/setup-dart/releases) - [Changelog](https://github.com/dart-lang/setup-dart/blob/main/CHANGELOG.md) - [Commits](https://github.com/dart-lang/setup-dart/compare/v1.6.5...e630b99d28a3b71860378cafdc2a067c71107f94) Updates `actions/checkout` from 4.1.7 to 4.2.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.7...11bd71901bbe5b1630ceea73d27597364c9af683) Updates `subosito/flutter-action` from 2.16.0 to 2.18.0 - [Release notes](https://github.com/subosito/flutter-action/releases) - [Commits](https://github.com/subosito/flutter-action/compare/44ac965b96f18d999802d4b807e3256d5a3f9fa1...f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: dart-lang/setup-dart dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: subosito/flutter-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 4 ++-- .github/workflows/lint.yml | 24 +++++++++---------- .github/workflows/unit.yml | 40 +++++++++++++++---------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 04c830e5..e7274a43 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;dart:2.10.0;" @@ -26,7 +26,7 @@ jobs: os:ubuntu-latest - name: Setup Go - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed + uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a with: go-version: '^1.16' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 61fdecd4..c9af4906 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.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" @@ -30,12 +30,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.6.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -158,7 +158,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" @@ -168,12 +168,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -361,7 +361,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_test;commands:analyze_1" @@ -371,12 +371,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: integration_test_pub_upgrade name: integration_test; dart pub upgrade run: dart pub upgrade @@ -391,7 +391,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:format-analyze_2" @@ -401,12 +401,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 + uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff with: channel: stable - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: examples_fullstack_frontend_pub_upgrade name: examples/fullstack/frontend; flutter pub upgrade run: flutter pub upgrade diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 11ee5e54..c4359204 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -30,12 +30,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.6.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:google_cloud;commands:command" @@ -87,12 +87,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.6.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -117,12 +117,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-functions_framework-integration_test;commands:test_1" @@ -246,12 +246,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: dartfn_pub_upgrade name: dartfn; dart pub upgrade run: dart pub upgrade @@ -284,7 +284,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:3.6.0;packages:google_cloud;commands:test_0" @@ -294,12 +294,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.6.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -314,7 +314,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:google_cloud;commands:test_0" @@ -324,12 +324,12 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade @@ -344,12 +344,12 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: google_cloud_pub_upgrade name: google_cloud; dart pub upgrade run: dart pub upgrade From 9a9e563b5654d935a954f147fa1af5d90c671bf9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 14:52:58 -0700 Subject: [PATCH 38/43] build(deps): bump the dependencies group across 1 directory with 4 updates (#490) Bumps the dependencies group with 4 updates in the / directory: [actions/cache](https://github.com/actions/cache), [actions/setup-go](https://github.com/actions/setup-go), [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart) and [actions/stale](https://github.com/actions/stale). Updates `actions/cache` from 4.2.0 to 4.2.2 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/1bd1e32a3bdc45362d1e726936510720a7c30a57...d4323d4df104b026a6aa633fdb11d772146be0bf) Updates `actions/setup-go` from 5.2.0 to 5.3.0 - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/3041bf56c941b39c61721a86cd11f3bb1338122a...f111f3307d8850f501ac008e886eec1fd1932a34) Updates `dart-lang/setup-dart` from 1.7.0 to 1.7.1 - [Release notes](https://github.com/dart-lang/setup-dart/releases) - [Changelog](https://github.com/dart-lang/setup-dart/blob/main/CHANGELOG.md) - [Commits](https://github.com/dart-lang/setup-dart/compare/e630b99d28a3b71860378cafdc2a067c71107f94...e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c) Updates `actions/stale` from 9.0.0 to 9.1.0 - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/28ca1036281a5e5922ead5184a1bbf96e5fc984e...5bef64f19d7facfb25b37b414482c7164d639639) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: dart-lang/setup-dart dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 6 +++--- .github/workflows/lint.yml | 14 +++++++------- .github/workflows/no-response.yml | 2 +- .github/workflows/unit.yml | 26 +++++++++++++------------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index e7274a43..629b26e1 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;dart:2.10.0;" @@ -26,11 +26,11 @@ jobs: os:ubuntu-latest - name: Setup Go - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a + uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 with: go-version: '^1.16' - - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: stable - run: dart --version diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c9af4906..f10d58fc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.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" @@ -30,7 +30,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.6.0" - id: checkout @@ -158,7 +158,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" @@ -168,7 +168,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -361,7 +361,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_test;commands:analyze_1" @@ -371,7 +371,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -391,7 +391,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:format-analyze_2" diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml index fd5b03ba..cda26cf9 100644 --- a/.github/workflows/no-response.yml +++ b/.github/workflows/no-response.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.repository_owner == 'GoogleCloudPlatform' }} steps: - - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e + - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 with: # Don't automatically mark inactive issues+PRs as stale. days-before-stale: -1 diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index c4359204..12817b3b 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -30,7 +30,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.6.0" - id: checkout @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:google_cloud;commands:command" @@ -87,7 +87,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.6.0" - id: checkout @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -117,7 +117,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-functions_framework-integration_test;commands:test_1" @@ -246,7 +246,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -284,7 +284,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:3.6.0;packages:google_cloud;commands:test_0" @@ -294,7 +294,7 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.6.0" - id: checkout @@ -314,7 +314,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:google_cloud;commands:test_0" @@ -324,7 +324,7 @@ jobs: os:macos-latest;pub-cache-hosted os:macos-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -344,7 +344,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout From 36434d49fb8694e7600213757d30c1af27baca1c Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Mon, 31 Mar 2025 17:37:41 -0500 Subject: [PATCH 39/43] Bump dependencies and regenerate protos (#491) --- .../events/cloud/firestore/v1/data.pb.dart | 72 ++++++++++--------- .../cloud/firestore/v1/data.pbenum.dart | 2 +- .../cloud/firestore/v1/data.pbjson.dart | 2 +- .../cloud/firestore/v1/data.pbserver.dart | 2 +- .../events/cloud/firestore/v1/events.pb.dart | 36 +++++----- .../cloud/firestore/v1/events.pbenum.dart | 2 +- .../cloud/firestore/v1/events.pbjson.dart | 2 +- .../cloud/firestore/v1/events.pbserver.dart | 2 +- .../lib/src/google/protobuf/struct.pb.dart | 30 ++++---- .../src/google/protobuf/struct.pbenum.dart | 5 +- .../src/google/protobuf/struct.pbjson.dart | 2 +- .../src/google/protobuf/struct.pbserver.dart | 2 +- .../lib/src/google/protobuf/timestamp.pb.dart | 8 ++- .../src/google/protobuf/timestamp.pbenum.dart | 2 +- .../src/google/protobuf/timestamp.pbjson.dart | 2 +- .../google/protobuf/timestamp.pbserver.dart | 2 +- .../lib/src/google/type/latlng.pb.dart | 8 ++- .../lib/src/google/type/latlng.pbenum.dart | 2 +- .../lib/src/google/type/latlng.pbjson.dart | 2 +- .../lib/src/google/type/latlng.pbserver.dart | 2 +- examples/protobuf_firestore/pubspec.yaml | 2 +- google_cloud/pubspec.yaml | 4 +- 22 files changed, 102 insertions(+), 91 deletions(-) diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart index 8547c165..e118c4c1 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/events/cloud/firestore/v1/data.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes @@ -18,6 +18,8 @@ import '../../../../protobuf/struct.pbenum.dart' as $2; import '../../../../protobuf/timestamp.pb.dart' as $0; import '../../../../type/latlng.pb.dart' as $1; +export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions; + /// The data within all Firestore document events. class DocumentEventData extends $pb.GeneratedMessage { factory DocumentEventData({ @@ -87,13 +89,13 @@ class DocumentEventData extends $pb.GeneratedMessage { Document get value => $_getN(0); @$pb.TagNumber(1) set value(Document v) { - setField(1, v); + $_setField(1, v); } @$pb.TagNumber(1) $core.bool hasValue() => $_has(0); @$pb.TagNumber(1) - void clearValue() => clearField(1); + void clearValue() => $_clearField(1); @$pb.TagNumber(1) Document ensureValue() => $_ensure(0); @@ -103,13 +105,13 @@ class DocumentEventData extends $pb.GeneratedMessage { Document get oldValue => $_getN(1); @$pb.TagNumber(2) set oldValue(Document v) { - setField(2, v); + $_setField(2, v); } @$pb.TagNumber(2) $core.bool hasOldValue() => $_has(1); @$pb.TagNumber(2) - void clearOldValue() => clearField(2); + void clearOldValue() => $_clearField(2); @$pb.TagNumber(2) Document ensureOldValue() => $_ensure(1); @@ -119,13 +121,13 @@ class DocumentEventData extends $pb.GeneratedMessage { DocumentMask get updateMask => $_getN(2); @$pb.TagNumber(3) set updateMask(DocumentMask v) { - setField(3, v); + $_setField(3, v); } @$pb.TagNumber(3) $core.bool hasUpdateMask() => $_has(2); @$pb.TagNumber(3) - void clearUpdateMask() => clearField(3); + void clearUpdateMask() => $_clearField(3); @$pb.TagNumber(3) DocumentMask ensureUpdateMask() => $_ensure(2); } @@ -184,14 +186,14 @@ class DocumentMask extends $pb.GeneratedMessage { /// See [Document.fields][google.cloud.firestore.v1.events.Document.fields] /// for a field path syntax reference. @$pb.TagNumber(1) - $core.List<$core.String> get fieldPaths => $_getList(0); + $pb.PbList<$core.String> get fieldPaths => $_getList(0); } /// A Firestore document. class Document extends $pb.GeneratedMessage { factory Document({ $core.String? name, - $core.Map<$core.String, Value>? fields, + $pb.PbMap<$core.String, Value>? fields, $0.Timestamp? createTime, $0.Timestamp? updateTime, }) { @@ -270,7 +272,7 @@ class Document extends $pb.GeneratedMessage { @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) - void clearName() => clearField(1); + void clearName() => $_clearField(1); /// The document's fields. /// @@ -297,7 +299,7 @@ class Document extends $pb.GeneratedMessage { /// escaped using a `\`. For example, `` `x&y` `` represents `x&y` and /// `` `bak\`tik` `` represents `` bak`tik ``. @$pb.TagNumber(2) - $core.Map<$core.String, Value> get fields => $_getMap(1); + $pb.PbMap<$core.String, Value> get fields => $_getMap(1); /// The time at which the document was created. /// @@ -308,13 +310,13 @@ class Document extends $pb.GeneratedMessage { $0.Timestamp get createTime => $_getN(2); @$pb.TagNumber(3) set createTime($0.Timestamp v) { - setField(3, v); + $_setField(3, v); } @$pb.TagNumber(3) $core.bool hasCreateTime() => $_has(2); @$pb.TagNumber(3) - void clearCreateTime() => clearField(3); + void clearCreateTime() => $_clearField(3); @$pb.TagNumber(3) $0.Timestamp ensureCreateTime() => $_ensure(2); @@ -327,13 +329,13 @@ class Document extends $pb.GeneratedMessage { $0.Timestamp get updateTime => $_getN(3); @$pb.TagNumber(4) set updateTime($0.Timestamp v) { - setField(4, v); + $_setField(4, v); } @$pb.TagNumber(4) $core.bool hasUpdateTime() => $_has(3); @$pb.TagNumber(4) - void clearUpdateTime() => clearField(4); + void clearUpdateTime() => $_clearField(4); @$pb.TagNumber(4) $0.Timestamp ensureUpdateTime() => $_ensure(3); } @@ -477,7 +479,7 @@ class Value extends $pb.GeneratedMessage { static Value? _defaultInstance; Value_ValueType whichValueType() => _Value_ValueTypeByTag[$_whichOneof(0)]!; - void clearValueType() => clearField($_whichOneof(0)); + void clearValueType() => $_clearField($_whichOneof(0)); /// A boolean value. @$pb.TagNumber(1) @@ -490,7 +492,7 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(1) $core.bool hasBooleanValue() => $_has(0); @$pb.TagNumber(1) - void clearBooleanValue() => clearField(1); + void clearBooleanValue() => $_clearField(1); /// An integer value. @$pb.TagNumber(2) @@ -503,7 +505,7 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.bool hasIntegerValue() => $_has(1); @$pb.TagNumber(2) - void clearIntegerValue() => clearField(2); + void clearIntegerValue() => $_clearField(2); /// A double value. @$pb.TagNumber(3) @@ -516,7 +518,7 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(3) $core.bool hasDoubleValue() => $_has(2); @$pb.TagNumber(3) - void clearDoubleValue() => clearField(3); + void clearDoubleValue() => $_clearField(3); /// A reference to a document. For example: /// `projects/{project_id}/databases/{database_id}/documents/{document_path}`. @@ -530,20 +532,20 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(5) $core.bool hasReferenceValue() => $_has(3); @$pb.TagNumber(5) - void clearReferenceValue() => clearField(5); + void clearReferenceValue() => $_clearField(5); /// A map value. @$pb.TagNumber(6) MapValue get mapValue => $_getN(4); @$pb.TagNumber(6) set mapValue(MapValue v) { - setField(6, v); + $_setField(6, v); } @$pb.TagNumber(6) $core.bool hasMapValue() => $_has(4); @$pb.TagNumber(6) - void clearMapValue() => clearField(6); + void clearMapValue() => $_clearField(6); @$pb.TagNumber(6) MapValue ensureMapValue() => $_ensure(4); @@ -552,13 +554,13 @@ class Value extends $pb.GeneratedMessage { $1.LatLng get geoPointValue => $_getN(5); @$pb.TagNumber(8) set geoPointValue($1.LatLng v) { - setField(8, v); + $_setField(8, v); } @$pb.TagNumber(8) $core.bool hasGeoPointValue() => $_has(5); @$pb.TagNumber(8) - void clearGeoPointValue() => clearField(8); + void clearGeoPointValue() => $_clearField(8); @$pb.TagNumber(8) $1.LatLng ensureGeoPointValue() => $_ensure(5); @@ -570,13 +572,13 @@ class Value extends $pb.GeneratedMessage { ArrayValue get arrayValue => $_getN(6); @$pb.TagNumber(9) set arrayValue(ArrayValue v) { - setField(9, v); + $_setField(9, v); } @$pb.TagNumber(9) $core.bool hasArrayValue() => $_has(6); @$pb.TagNumber(9) - void clearArrayValue() => clearField(9); + void clearArrayValue() => $_clearField(9); @$pb.TagNumber(9) ArrayValue ensureArrayValue() => $_ensure(6); @@ -588,13 +590,13 @@ class Value extends $pb.GeneratedMessage { $0.Timestamp get timestampValue => $_getN(7); @$pb.TagNumber(10) set timestampValue($0.Timestamp v) { - setField(10, v); + $_setField(10, v); } @$pb.TagNumber(10) $core.bool hasTimestampValue() => $_has(7); @$pb.TagNumber(10) - void clearTimestampValue() => clearField(10); + void clearTimestampValue() => $_clearField(10); @$pb.TagNumber(10) $0.Timestamp ensureTimestampValue() => $_ensure(7); @@ -603,13 +605,13 @@ class Value extends $pb.GeneratedMessage { $2.NullValue get nullValue => $_getN(8); @$pb.TagNumber(11) set nullValue($2.NullValue v) { - setField(11, v); + $_setField(11, v); } @$pb.TagNumber(11) $core.bool hasNullValue() => $_has(8); @$pb.TagNumber(11) - void clearNullValue() => clearField(11); + void clearNullValue() => $_clearField(11); /// A string value. /// @@ -626,7 +628,7 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(17) $core.bool hasStringValue() => $_has(9); @$pb.TagNumber(17) - void clearStringValue() => clearField(17); + void clearStringValue() => $_clearField(17); /// A bytes value. /// @@ -642,7 +644,7 @@ class Value extends $pb.GeneratedMessage { @$pb.TagNumber(18) $core.bool hasBytesValue() => $_has(10); @$pb.TagNumber(18) - void clearBytesValue() => clearField(18); + void clearBytesValue() => $_clearField(18); } /// An array value. @@ -696,13 +698,13 @@ class ArrayValue extends $pb.GeneratedMessage { /// Values in the array. @$pb.TagNumber(1) - $core.List get values => $_getList(0); + $pb.PbList get values => $_getList(0); } /// A map value. class MapValue extends $pb.GeneratedMessage { factory MapValue({ - $core.Map<$core.String, Value>? fields, + $pb.PbMap<$core.String, Value>? fields, }) { final $result = create(); if (fields != null) { @@ -760,7 +762,7 @@ class MapValue extends $pb.GeneratedMessage { /// in certain documented contexts. The map keys, represented as UTF-8, must /// not exceed 1,500 bytes and cannot be empty. @$pb.TagNumber(1) - $core.Map<$core.String, Value> get fields => $_getMap(0); + $pb.PbMap<$core.String, Value> get fields => $_getMap(0); } const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart index 9a3f9f14..e5c86a5c 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbenum.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/events/cloud/firestore/v1/data.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart index 6c6b7a9f..54ad5bb5 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbjson.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/events/cloud/firestore/v1/data.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart index 632e8dd3..4df2368b 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/data.pbserver.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/events/cloud/firestore/v1/data.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart index 348495b4..380693e1 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/events/cloud/firestore/v1/events.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes @@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb; import 'data.pb.dart' as $3; +export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions; + /// The CloudEvent raised when a Firestore document is created. class DocumentCreatedEvent extends $pb.GeneratedMessage { factory DocumentCreatedEvent({ @@ -72,13 +74,13 @@ class DocumentCreatedEvent extends $pb.GeneratedMessage { $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) set data($3.DocumentEventData v) { - setField(1, v); + $_setField(1, v); } @$pb.TagNumber(1) $core.bool hasData() => $_has(0); @$pb.TagNumber(1) - void clearData() => clearField(1); + void clearData() => $_clearField(1); @$pb.TagNumber(1) $3.DocumentEventData ensureData() => $_ensure(0); } @@ -140,13 +142,13 @@ class DocumentUpdatedEvent extends $pb.GeneratedMessage { $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) set data($3.DocumentEventData v) { - setField(1, v); + $_setField(1, v); } @$pb.TagNumber(1) $core.bool hasData() => $_has(0); @$pb.TagNumber(1) - void clearData() => clearField(1); + void clearData() => $_clearField(1); @$pb.TagNumber(1) $3.DocumentEventData ensureData() => $_ensure(0); } @@ -208,13 +210,13 @@ class DocumentDeletedEvent extends $pb.GeneratedMessage { $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) set data($3.DocumentEventData v) { - setField(1, v); + $_setField(1, v); } @$pb.TagNumber(1) $core.bool hasData() => $_has(0); @$pb.TagNumber(1) - void clearData() => clearField(1); + void clearData() => $_clearField(1); @$pb.TagNumber(1) $3.DocumentEventData ensureData() => $_ensure(0); } @@ -277,13 +279,13 @@ class DocumentWrittenEvent extends $pb.GeneratedMessage { $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) set data($3.DocumentEventData v) { - setField(1, v); + $_setField(1, v); } @$pb.TagNumber(1) $core.bool hasData() => $_has(0); @$pb.TagNumber(1) - void clearData() => clearField(1); + void clearData() => $_clearField(1); @$pb.TagNumber(1) $3.DocumentEventData ensureData() => $_ensure(0); } @@ -350,13 +352,13 @@ class DocumentCreatedEventWithAuthContext extends $pb.GeneratedMessage { $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) set data($3.DocumentEventData v) { - setField(1, v); + $_setField(1, v); } @$pb.TagNumber(1) $core.bool hasData() => $_has(0); @$pb.TagNumber(1) - void clearData() => clearField(1); + void clearData() => $_clearField(1); @$pb.TagNumber(1) $3.DocumentEventData ensureData() => $_ensure(0); } @@ -423,13 +425,13 @@ class DocumentUpdatedEventWithAuthContext extends $pb.GeneratedMessage { $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) set data($3.DocumentEventData v) { - setField(1, v); + $_setField(1, v); } @$pb.TagNumber(1) $core.bool hasData() => $_has(0); @$pb.TagNumber(1) - void clearData() => clearField(1); + void clearData() => $_clearField(1); @$pb.TagNumber(1) $3.DocumentEventData ensureData() => $_ensure(0); } @@ -496,13 +498,13 @@ class DocumentDeletedEventWithAuthContext extends $pb.GeneratedMessage { $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) set data($3.DocumentEventData v) { - setField(1, v); + $_setField(1, v); } @$pb.TagNumber(1) $core.bool hasData() => $_has(0); @$pb.TagNumber(1) - void clearData() => clearField(1); + void clearData() => $_clearField(1); @$pb.TagNumber(1) $3.DocumentEventData ensureData() => $_ensure(0); } @@ -570,13 +572,13 @@ class DocumentWrittenEventWithAuthContext extends $pb.GeneratedMessage { $3.DocumentEventData get data => $_getN(0); @$pb.TagNumber(1) set data($3.DocumentEventData v) { - setField(1, v); + $_setField(1, v); } @$pb.TagNumber(1) $core.bool hasData() => $_has(0); @$pb.TagNumber(1) - void clearData() => clearField(1); + void clearData() => $_clearField(1); @$pb.TagNumber(1) $3.DocumentEventData ensureData() => $_ensure(0); } diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart index 3d31dddb..d88a2509 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbenum.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/events/cloud/firestore/v1/events.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart index d1084680..1aabdbe1 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbjson.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/events/cloud/firestore/v1/events.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes diff --git a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart index cc2e10bd..4e57fc75 100644 --- a/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart +++ b/examples/protobuf_firestore/lib/src/google/events/cloud/firestore/v1/events.pbserver.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/events/cloud/firestore/v1/events.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart index 42d55e42..5e71df26 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/struct.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes @@ -16,6 +16,8 @@ import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin; import 'struct.pbenum.dart'; +export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions; + export 'struct.pbenum.dart'; /// `Struct` represents a structured data value, consisting of fields @@ -28,7 +30,7 @@ export 'struct.pbenum.dart'; /// The JSON representation for `Struct` is JSON object. class Struct extends $pb.GeneratedMessage with $mixin.StructMixin { factory Struct({ - $core.Map<$core.String, Value>? fields, + $pb.PbMap<$core.String, Value>? fields, }) { final $result = create(); if (fields != null) { @@ -83,7 +85,7 @@ class Struct extends $pb.GeneratedMessage with $mixin.StructMixin { /// Unordered map of dynamically typed values. @$pb.TagNumber(1) - $core.Map<$core.String, Value> get fields => $_getMap(0); + $pb.PbMap<$core.String, Value> get fields => $_getMap(0); } enum Value_Kind { @@ -193,20 +195,20 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { static Value? _defaultInstance; Value_Kind whichKind() => _Value_KindByTag[$_whichOneof(0)]!; - void clearKind() => clearField($_whichOneof(0)); + void clearKind() => $_clearField($_whichOneof(0)); /// Represents a null value. @$pb.TagNumber(1) NullValue get nullValue => $_getN(0); @$pb.TagNumber(1) set nullValue(NullValue v) { - setField(1, v); + $_setField(1, v); } @$pb.TagNumber(1) $core.bool hasNullValue() => $_has(0); @$pb.TagNumber(1) - void clearNullValue() => clearField(1); + void clearNullValue() => $_clearField(1); /// Represents a double value. @$pb.TagNumber(2) @@ -219,7 +221,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { @$pb.TagNumber(2) $core.bool hasNumberValue() => $_has(1); @$pb.TagNumber(2) - void clearNumberValue() => clearField(2); + void clearNumberValue() => $_clearField(2); /// Represents a string value. @$pb.TagNumber(3) @@ -232,7 +234,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { @$pb.TagNumber(3) $core.bool hasStringValue() => $_has(2); @$pb.TagNumber(3) - void clearStringValue() => clearField(3); + void clearStringValue() => $_clearField(3); /// Represents a boolean value. @$pb.TagNumber(4) @@ -245,20 +247,20 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { @$pb.TagNumber(4) $core.bool hasBoolValue() => $_has(3); @$pb.TagNumber(4) - void clearBoolValue() => clearField(4); + void clearBoolValue() => $_clearField(4); /// Represents a structured value. @$pb.TagNumber(5) Struct get structValue => $_getN(4); @$pb.TagNumber(5) set structValue(Struct v) { - setField(5, v); + $_setField(5, v); } @$pb.TagNumber(5) $core.bool hasStructValue() => $_has(4); @$pb.TagNumber(5) - void clearStructValue() => clearField(5); + void clearStructValue() => $_clearField(5); @$pb.TagNumber(5) Struct ensureStructValue() => $_ensure(4); @@ -267,13 +269,13 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { ListValue get listValue => $_getN(5); @$pb.TagNumber(6) set listValue(ListValue v) { - setField(6, v); + $_setField(6, v); } @$pb.TagNumber(6) $core.bool hasListValue() => $_has(5); @$pb.TagNumber(6) - void clearListValue() => clearField(6); + void clearListValue() => $_clearField(6); @$pb.TagNumber(6) ListValue ensureListValue() => $_ensure(5); } @@ -333,7 +335,7 @@ class ListValue extends $pb.GeneratedMessage with $mixin.ListValueMixin { /// Repeated field of dynamically typed values. @$pb.TagNumber(1) - $core.List get values => $_getList(0); + $pb.PbList get values => $_getList(0); } const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart index 7f9bf0cb..78528b71 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbenum.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/struct.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes @@ -18,6 +18,7 @@ import 'package:protobuf/protobuf.dart' as $pb; /// /// The JSON representation for `NullValue` is JSON `null`. class NullValue extends $pb.ProtobufEnum { + /// Null value. static const NullValue NULL_VALUE = NullValue._(0, _omitEnumNames ? '' : 'NULL_VALUE'); @@ -29,7 +30,7 @@ class NullValue extends $pb.ProtobufEnum { $pb.ProtobufEnum.initByValue(values); static NullValue? valueOf($core.int value) => _byValue[value]; - const NullValue._($core.int v, $core.String n) : super(v, n); + const NullValue._(super.v, super.n); } const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart index c0693f57..36967b55 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbjson.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/struct.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart index 3044bbcd..61cf5414 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/struct.pbserver.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/struct.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart index 48e11b93..4d8b6cba 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/timestamp.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes @@ -15,6 +15,8 @@ import 'package:fixnum/fixnum.dart' as $fixnum; import 'package:protobuf/protobuf.dart' as $pb; import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin; +export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions; + /// A Timestamp represents a point in time independent of any time zone or local /// calendar, encoded as a count of seconds and fractions of seconds at /// nanosecond resolution. The count is relative to an epoch at UTC midnight on @@ -171,7 +173,7 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin { @$pb.TagNumber(1) $core.bool hasSeconds() => $_has(0); @$pb.TagNumber(1) - void clearSeconds() => clearField(1); + void clearSeconds() => $_clearField(1); /// Non-negative fractions of a second at nanosecond resolution. Negative /// second values with fractions must still have non-negative nanos values @@ -187,7 +189,7 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin { @$pb.TagNumber(2) $core.bool hasNanos() => $_has(1); @$pb.TagNumber(2) - void clearNanos() => clearField(2); + void clearNanos() => $_clearField(2); /// Creates a new instance from [dateTime]. /// diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart index a194b805..1eaa8d17 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbenum.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/timestamp.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart index 39ab20fa..2fc1450f 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbjson.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/timestamp.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes diff --git a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart index 113d2b12..8f1e5c65 100644 --- a/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart +++ b/examples/protobuf_firestore/lib/src/google/protobuf/timestamp.pbserver.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/timestamp.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart index 392a4fa5..98ce86a8 100644 --- a/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart +++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/type/latlng.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes @@ -13,6 +13,8 @@ import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; +export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions; + /// An object that represents a latitude/longitude pair. This is expressed as a /// pair of doubles to represent degrees latitude and degrees longitude. Unless /// specified otherwise, this must conform to the @@ -80,7 +82,7 @@ class LatLng extends $pb.GeneratedMessage { @$pb.TagNumber(1) $core.bool hasLatitude() => $_has(0); @$pb.TagNumber(1) - void clearLatitude() => clearField(1); + void clearLatitude() => $_clearField(1); /// The longitude in degrees. It must be in the range [-180.0, +180.0]. @$pb.TagNumber(2) @@ -93,7 +95,7 @@ class LatLng extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.bool hasLongitude() => $_has(1); @$pb.TagNumber(2) - void clearLongitude() => clearField(2); + void clearLongitude() => $_clearField(2); } const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart index 76cae745..ad4672e4 100644 --- a/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart +++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pbenum.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/type/latlng.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart index 45d99883..4775a013 100644 --- a/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart +++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pbjson.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/type/latlng.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names, library_prefixes diff --git a/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart b/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart index 80232746..30a596f5 100644 --- a/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart +++ b/examples/protobuf_firestore/lib/src/google/type/latlng.pbserver.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/type/latlng.proto // -// @dart = 2.12 +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names diff --git a/examples/protobuf_firestore/pubspec.yaml b/examples/protobuf_firestore/pubspec.yaml index 891ea987..a19ab3fc 100644 --- a/examples/protobuf_firestore/pubspec.yaml +++ b/examples/protobuf_firestore/pubspec.yaml @@ -7,7 +7,7 @@ environment: dependencies: functions_framework: ^0.4.3 - protobuf: ^3.0.0 + protobuf: ^4.0.0 shelf: ^1.4.0 dev_dependencies: diff --git a/google_cloud/pubspec.yaml b/google_cloud/pubspec.yaml index 1f0f9a21..5849f69a 100644 --- a/google_cloud/pubspec.yaml +++ b/google_cloud/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: dev_dependencies: dart_flutter_team_lints: ^3.0.0 - googleapis: ^13.0.0 - googleapis_auth: ^1.4.1 + googleapis: ^14.0.0 + googleapis_auth: ^2.0.0 test: ^1.22.0 test_process: ^2.0.3 From 502d226f612fad5d991734b9af15e9f80f59f4bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 20:28:15 -0700 Subject: [PATCH 40/43] build(deps): bump the dependencies group with 3 updates (#492) Bumps the dependencies group with 3 updates: [actions/cache](https://github.com/actions/cache), [actions/setup-go](https://github.com/actions/setup-go) and [subosito/flutter-action](https://github.com/subosito/flutter-action). Updates `actions/cache` from 4.2.2 to 4.2.3 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/d4323d4df104b026a6aa633fdb11d772146be0bf...5a3ec84eff668545956fd18022155c47e93e2684) Updates `actions/setup-go` from 5.3.0 to 5.4.0 - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/f111f3307d8850f501ac008e886eec1fd1932a34...0aaccfd150d50ccaeb58ebd88d36e91967a5f35b) Updates `subosito/flutter-action` from 2.18.0 to 2.19.0 - [Release notes](https://github.com/subosito/flutter-action/releases) - [Commits](https://github.com/subosito/flutter-action/compare/f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff...e938fdf56512cc96ef2f93601a5a40bde3801046) --- updated-dependencies: - dependency-name: actions/cache dependency-version: 4.2.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: actions/setup-go dependency-version: 5.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: subosito/flutter-action dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 4 ++-- .github/workflows/lint.yml | 10 +++++----- .github/workflows/unit.yml | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 629b26e1..de111df2 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;dart:2.10.0;" @@ -26,7 +26,7 @@ jobs: os:ubuntu-latest - name: Setup Go - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 + uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b with: go-version: '^1.16' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f10d58fc..bd689532 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.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" @@ -158,7 +158,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;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-integration_test;commands:format-analyze_0" @@ -361,7 +361,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:integration_test;commands:analyze_1" @@ -391,7 +391,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:examples/fullstack/frontend;commands:format-analyze_2" @@ -401,7 +401,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff + uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 with: channel: stable - id: checkout diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 12817b3b..b43a3f55 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:dartfn-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:google_cloud;commands:command" @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework_builder-google_cloud-integration_test;commands:test_0" @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-functions_framework-integration_test;commands:test_1" @@ -284,7 +284,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:3.6.0;packages:google_cloud;commands:test_0" @@ -314,7 +314,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:google_cloud;commands:test_0" From a0f9d8965235564496b277fd9626fdce11ba87c7 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Tue, 22 Apr 2025 14:27:49 -0500 Subject: [PATCH 41/43] Ignore analyzer deprecations (for now) (#493) --- functions_framework_builder/analysis_options.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 functions_framework_builder/analysis_options.yaml diff --git a/functions_framework_builder/analysis_options.yaml b/functions_framework_builder/analysis_options.yaml new file mode 100644 index 00000000..a8ee49aa --- /dev/null +++ b/functions_framework_builder/analysis_options.yaml @@ -0,0 +1,7 @@ +# https://dart.dev/guides/language/analysis-options +include: ../analysis_options.yaml + +analyzer: + errors: + # analyzer deprecations + deprecated_member_use: ignore From 8083517599d7f2fb58123776a88f029f094cb5e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Jun 2025 14:21:40 -0700 Subject: [PATCH 42/43] build(deps): bump actions/setup-go in the dependencies group (#494) Bumps the dependencies group with 1 update: [actions/setup-go](https://github.com/actions/setup-go). Updates `actions/setup-go` from 5.4.0 to 5.5.0 - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/0aaccfd150d50ccaeb58ebd88d36e91967a5f35b...d35c59abb061a4a6fb18e82ac0862c26744d6ab5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: 5.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index de111df2..92209457 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -26,7 +26,7 @@ jobs: os:ubuntu-latest - name: Setup Go - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 with: go-version: '^1.16' From 5b62a0fe151e09873688b9b09b2a72ef655fbe64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Aug 2025 14:28:12 -0700 Subject: [PATCH 43/43] build(deps): bump the dependencies group across 1 directory with 2 updates (#496) Bumps the dependencies group with 2 updates in the / directory: [GoogleCloudPlatform/functions-framework-conformance](https://github.com/googlecloudplatform/functions-framework-conformance) and [subosito/flutter-action](https://github.com/subosito/flutter-action). Updates `GoogleCloudPlatform/functions-framework-conformance` from 1.8.6 to 1.8.7 - [Release notes](https://github.com/googlecloudplatform/functions-framework-conformance/releases) - [Commits](https://github.com/googlecloudplatform/functions-framework-conformance/compare/v1.8.6...v1.8.7) Updates `subosito/flutter-action` from 2.19.0 to 2.21.0 - [Release notes](https://github.com/subosito/flutter-action/releases) - [Commits](https://github.com/subosito/flutter-action/compare/e938fdf56512cc96ef2f93601a5a40bde3801046...fd55f4c5af5b953cc57a2be44cb082c8f6635e8e) --- updated-dependencies: - dependency-name: GoogleCloudPlatform/functions-framework-conformance dependency-version: 1.8.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: subosito/flutter-action dependency-version: 2.21.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/conformance.yml | 4 ++-- .github/workflows/lint.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 92209457..0933fe9d 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -40,7 +40,7 @@ jobs: working-directory: integration_test - name: Run HTTP conformance tests - uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.8.6 + uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.8.7 with: functionType: 'http' useBuildpacks: false @@ -49,7 +49,7 @@ jobs: startDelay: 3 - name: Run CloudEvent conformance tests - uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.8.6 + uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.8.7 with: functionType: 'cloudevent' useBuildpacks: false diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bd689532..66e6ee24 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -401,7 +401,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 + uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e with: channel: stable - id: checkout