From a49f120ae83451a87c0402e5f38ac669ae10ea16 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Fri, 31 Jan 2025 12:06:03 -0600 Subject: [PATCH] Update specified version for 3.6.2 release (#6377) Also require 3.6.1 for site infra and samples, as it includes a necessary fix for workspaces to work properly. --- examples/analysis/pubspec.yaml | 2 +- examples/analysis_alt/pubspec.yaml | 2 +- examples/async_await/pubspec.yaml | 2 +- examples/build_runner_usage/pubspec.yaml | 2 +- examples/cli/pubspec.yaml | 2 +- examples/concurrency/pubspec.yaml | 2 +- examples/create_libraries/pubspec.yaml | 2 +- examples/extension_methods/pubspec.yaml | 2 +- examples/fetch_data/pubspec.yaml | 2 +- examples/futures/pubspec.yaml | 2 +- examples/html/pubspec.yaml | 2 +- examples/iterables/pubspec.yaml | 2 +- examples/language/pubspec.yaml | 2 +- examples/misc/pubspec.yaml | 2 +- examples/non_promotion/pubspec.yaml | 2 +- examples/pubspec.yaml | 2 +- examples/type_system/lib/common_fixes_analysis.dart | 3 +-- examples/type_system/pubspec.yaml | 2 +- examples/util/pubspec.yaml | 2 +- examples/vector_victor/pubspec.yaml | 2 +- pubspec.yaml | 2 +- src/_data/site.yml | 2 +- src/content/tutorials/server/cmdline.md | 2 +- tool/dart_site/pubspec.yaml | 2 +- tool/get-dart/archive/pubspec.yaml | 2 +- tool/get-dart/dart_sdk_archive/pubspec.yaml | 2 +- tool/get-dart/pubspec.yaml | 2 +- tool/get-dart/sdk_builds/pubspec.yaml | 2 +- 28 files changed, 28 insertions(+), 29 deletions(-) diff --git a/examples/analysis/pubspec.yaml b/examples/analysis/pubspec.yaml index 872fcd2eee..8402c6b490 100644 --- a/examples/analysis/pubspec.yaml +++ b/examples/analysis/pubspec.yaml @@ -3,7 +3,7 @@ description: dart.dev example code. resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: examples_util: {path: ../util} diff --git a/examples/analysis_alt/pubspec.yaml b/examples/analysis_alt/pubspec.yaml index 42ca4573d9..9dff9e7dbd 100644 --- a/examples/analysis_alt/pubspec.yaml +++ b/examples/analysis_alt/pubspec.yaml @@ -3,4 +3,4 @@ description: dart.dev example code. resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 diff --git a/examples/async_await/pubspec.yaml b/examples/async_await/pubspec.yaml index d37ad55fd9..ea6a98bc96 100644 --- a/examples/async_await/pubspec.yaml +++ b/examples/async_await/pubspec.yaml @@ -3,7 +3,7 @@ description: dart.dev example code. resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: examples_util: {path: ../util} diff --git a/examples/build_runner_usage/pubspec.yaml b/examples/build_runner_usage/pubspec.yaml index 7ece9c0850..faec233805 100644 --- a/examples/build_runner_usage/pubspec.yaml +++ b/examples/build_runner_usage/pubspec.yaml @@ -3,7 +3,7 @@ description: dart.dev build_runner example code. resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dev_dependencies: args: ^2.5.0 diff --git a/examples/cli/pubspec.yaml b/examples/cli/pubspec.yaml index 65b3888014..ec0ffbca1a 100644 --- a/examples/cli/pubspec.yaml +++ b/examples/cli/pubspec.yaml @@ -3,7 +3,7 @@ description: Examples for CLI tutorials on dart.dev resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: args: ^2.5.0 diff --git a/examples/concurrency/pubspec.yaml b/examples/concurrency/pubspec.yaml index 68dec19db8..056667349f 100644 --- a/examples/concurrency/pubspec.yaml +++ b/examples/concurrency/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: http: any diff --git a/examples/create_libraries/pubspec.yaml b/examples/create_libraries/pubspec.yaml index be4f5d01ca..e3178ba65c 100644 --- a/examples/create_libraries/pubspec.yaml +++ b/examples/create_libraries/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dev_dependencies: test: ^1.25.8 diff --git a/examples/extension_methods/pubspec.yaml b/examples/extension_methods/pubspec.yaml index 027319999a..fefda9e294 100644 --- a/examples/extension_methods/pubspec.yaml +++ b/examples/extension_methods/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.0.0 resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dev_dependencies: test: ^1.25.8 diff --git a/examples/fetch_data/pubspec.yaml b/examples/fetch_data/pubspec.yaml index 421de093c5..88a9404566 100644 --- a/examples/fetch_data/pubspec.yaml +++ b/examples/fetch_data/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: http: ^1.2.2 diff --git a/examples/futures/pubspec.yaml b/examples/futures/pubspec.yaml index 0188006662..090a8f6ac3 100644 --- a/examples/futures/pubspec.yaml +++ b/examples/futures/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: examples_util: {path: ../util} diff --git a/examples/html/pubspec.yaml b/examples/html/pubspec.yaml index 1f665528c8..e008425a16 100644 --- a/examples/html/pubspec.yaml +++ b/examples/html/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dev_dependencies: test: ^1.25.8 diff --git a/examples/iterables/pubspec.yaml b/examples/iterables/pubspec.yaml index f693fab929..c052135eda 100644 --- a/examples/iterables/pubspec.yaml +++ b/examples/iterables/pubspec.yaml @@ -3,7 +3,7 @@ description: dart.dev example code. resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dev_dependencies: examples_util: {path: ../util} diff --git a/examples/language/pubspec.yaml b/examples/language/pubspec.yaml index f367d92378..6247b1a996 100644 --- a/examples/language/pubspec.yaml +++ b/examples/language/pubspec.yaml @@ -3,7 +3,7 @@ description: dart.dev example code. resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: examples_util: { path: ../util } diff --git a/examples/misc/pubspec.yaml b/examples/misc/pubspec.yaml index c27ffea177..5fe1107af4 100644 --- a/examples/misc/pubspec.yaml +++ b/examples/misc/pubspec.yaml @@ -3,7 +3,7 @@ description: dart.dev example code. resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: args: ^2.5.0 diff --git a/examples/non_promotion/pubspec.yaml b/examples/non_promotion/pubspec.yaml index 6994fdb3f9..178a896f02 100644 --- a/examples/non_promotion/pubspec.yaml +++ b/examples/non_promotion/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: mockito: ^5.4.4 diff --git a/examples/pubspec.yaml b/examples/pubspec.yaml index e5eff83499..35ec28865a 100644 --- a/examples/pubspec.yaml +++ b/examples/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 workspace: - analysis diff --git a/examples/type_system/lib/common_fixes_analysis.dart b/examples/type_system/lib/common_fixes_analysis.dart index 68d168a0d3..a310ed30cd 100644 --- a/examples/type_system/lib/common_fixes_analysis.dart +++ b/examples/type_system/lib/common_fixes_analysis.dart @@ -157,7 +157,6 @@ abstract class C implements List {} // #enddocregion compatible-generics // #docregion conflicting-generics -// ignore: inconsistent_inheritance, conflicting_generic_interfaces, -// ignore: duplicate_definition +// ignore: duplicate_definition, inconsistent_inheritance, conflicting_generic_interfaces abstract class C implements List, Iterable {} // #enddocregion conflicting-generics diff --git a/examples/type_system/pubspec.yaml b/examples/type_system/pubspec.yaml index 2cec7e7cf1..a9d9b21823 100644 --- a/examples/type_system/pubspec.yaml +++ b/examples/type_system/pubspec.yaml @@ -3,7 +3,7 @@ description: dart.dev type system examples. resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: examples_util: {path: ../util} diff --git a/examples/util/pubspec.yaml b/examples/util/pubspec.yaml index bf3bc17d75..5db44f9072 100644 --- a/examples/util/pubspec.yaml +++ b/examples/util/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.2 resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: test: ^1.25.8 diff --git a/examples/vector_victor/pubspec.yaml b/examples/vector_victor/pubspec.yaml index ee70122dc0..19f93d642a 100644 --- a/examples/vector_victor/pubspec.yaml +++ b/examples/vector_victor/pubspec.yaml @@ -5,7 +5,7 @@ version: 1.0.0 resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 # dependencies: # path: ^1.8.0 diff --git a/pubspec.yaml b/pubspec.yaml index b7b38f13d2..974d32b849 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none homepage: https://dart.dev environment: - sdk: ^3.6.0 + sdk: ^3.6.1 workspace: - tool/dart_site diff --git a/src/_data/site.yml b/src/_data/site.yml index 7a9c81e947..9061150f23 100644 --- a/src/_data/site.yml +++ b/src/_data/site.yml @@ -40,4 +40,4 @@ show_banner: false # in the `firebase.json` redirect rule.) og_image_vers: "?2" -sdkVersion: 3.6.0 +sdkVersion: 3.6.2 diff --git a/src/content/tutorials/server/cmdline.md b/src/content/tutorials/server/cmdline.md index 6ce6cca8cd..8d0449abe8 100644 --- a/src/content/tutorials/server/cmdline.md +++ b/src/content/tutorials/server/cmdline.md @@ -190,7 +190,7 @@ $ dart run bin/dcat.dart -n pubspec.yaml 4 # repository: https://github.com/my_org/my_repo 5 6 environment: -7 sdk: ^3.6.0 +7 sdk: ^3.6.1 8 9 # Add regular dependencies here. 10 dependencies: diff --git a/tool/dart_site/pubspec.yaml b/tool/dart_site/pubspec.yaml index 5a8a9e110b..48d73febd1 100644 --- a/tool/dart_site/pubspec.yaml +++ b/tool/dart_site/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: args: ^2.5.0 diff --git a/tool/get-dart/archive/pubspec.yaml b/tool/get-dart/archive/pubspec.yaml index 99597a7063..279f0d56b7 100644 --- a/tool/get-dart/archive/pubspec.yaml +++ b/tool/get-dart/archive/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: dart_sdk_archive: diff --git a/tool/get-dart/dart_sdk_archive/pubspec.yaml b/tool/get-dart/dart_sdk_archive/pubspec.yaml index 4491468db5..6d5e35b87c 100644 --- a/tool/get-dart/dart_sdk_archive/pubspec.yaml +++ b/tool/get-dart/dart_sdk_archive/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: http: ^1.2.2 diff --git a/tool/get-dart/pubspec.yaml b/tool/get-dart/pubspec.yaml index 18c8b341b4..2c2c7a8e50 100644 --- a/tool/get-dart/pubspec.yaml +++ b/tool/get-dart/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 workspace: - archive diff --git a/tool/get-dart/sdk_builds/pubspec.yaml b/tool/get-dart/sdk_builds/pubspec.yaml index 1fc87eff03..b46c8cabae 100644 --- a/tool/get-dart/sdk_builds/pubspec.yaml +++ b/tool/get-dart/sdk_builds/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.6.0 + sdk: ^3.6.1 dependencies: googleapis: ^13.2.0