Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump SDK version. #78

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Bump SDK version. #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a49f59a
Bump SDK version.
davidmorgan Oct 1, 2024
fe4778d
Fixes for new SDK version.
davidmorgan Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 75 additions & 75 deletions .github/workflows/dart.yml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion goldens/foo/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ publish-to: none
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
_test_macros: any
2 changes: 1 addition & 1 deletion pkgs/_analyzer_macros/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Macro support for the analyzer.
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
_macro_host: any
Expand Down
2 changes: 1 addition & 1 deletion pkgs/_analyzer_macros/test/golden_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void main() {
final resolvedLibrary = (await analysisContext.currentSession
.getResolvedLibrary(path)) as ResolvedLibraryResult;
final augmentationUnit =
resolvedLibrary.units.singleWhere((u) => u.isMacroAugmentation);
resolvedLibrary.units.singleWhere((u) => u.isMacroPart);

if (introspectionGolden != null) {
// Each `QueryClass` outputs its query result as a comment in an
Expand Down
2 changes: 1 addition & 1 deletion pkgs/_analyzer_macros/test/package_under_test/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ publish-to: none
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
_test_macros: any
2 changes: 1 addition & 1 deletion pkgs/_cfe_macros/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Macro support for the CFE.
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
_macro_host: any
Expand Down
2 changes: 1 addition & 1 deletion pkgs/_cfe_macros/test/package_under_test/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ publish-to: none
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
_test_macros: any
2 changes: 1 addition & 1 deletion pkgs/_macro_builder/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/dart-lang/macros/tree/master/pkgs/_macro_builder
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
dart_model: any
Expand Down
2 changes: 1 addition & 1 deletion pkgs/_macro_client/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/dart-lang/macros/tree/master/pkgs/_macro_client
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
dart_model: any
Expand Down
2 changes: 1 addition & 1 deletion pkgs/_macro_host/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/dart-lang/macros/tree/master/pkgs/_macro_host
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
_macro_builder: any
Expand Down
2 changes: 1 addition & 1 deletion pkgs/_macro_runner/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/dart-lang/macros/tree/master/pkgs/_macro_runner
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
_macro_builder: any
Expand Down
2 changes: 1 addition & 1 deletion pkgs/_macro_server/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/dart-lang/macros/tree/master/pkgs/_macro_server
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
dart_model: any
Expand Down
2 changes: 1 addition & 1 deletion pkgs/_macro_tool/lib/macro_tool.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class MacroTool {
}

final augmentationUnits =
resolvedLibrary.units.where((u) => u.isMacroAugmentation).toList();
resolvedLibrary.units.where((u) => u.isMacroPart).toList();
if (augmentationUnits.isEmpty) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion pkgs/_macro_tool/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: >-
CLI for running code with macros applied.
resolution: workspace
environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
_analyzer_macros: any
Expand Down
2 changes: 1 addition & 1 deletion pkgs/_test_macros/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/dart-lang/macros/tree/master/pkgs/_test_macros
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
dart_model: any
Expand Down
2 changes: 1 addition & 1 deletion pkgs/dart_model/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository: https://github.com/dart-lang/macros/tree/master/pkgs/dart_model
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
collection: ^1.19.0
Expand Down
2 changes: 1 addition & 1 deletion pkgs/macro/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/dart-lang/macros/tree/master/pkgs/macro
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
collection: ^1.19.0
Expand Down
2 changes: 1 addition & 1 deletion pkgs/macro_service/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/dart-lang/macros/tree/master/pkgs/macro_service
resolution: workspace

environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
async: ^2.11.0
Expand Down
46 changes: 23 additions & 23 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: macros_workspace
environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev
dev_dependencies:
dart_flutter_team_lints: ^3.1.0
publish_to: none
Expand Down Expand Up @@ -28,109 +28,109 @@ dependency_overrides:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/_fe_analyzer_shared
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
_js_interop_checks:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/_js_interop_checks
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
_macros:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/_macros
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
analyzer:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/analyzer
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
analyzer_utilities:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/analyzer_utilities
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
build_integration:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/build_integration
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
compiler:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/compiler
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
dart2js_info:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/dart2js_info
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
dart2wasm:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/dart2wasm
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
dev_compiler:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/dev_compiler
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
front_end:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/front_end
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
frontend_server:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/frontend_server
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
heap_snapshot:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/heap_snapshot
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
js_ast:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/js_ast
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
js_runtime:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/js_runtime
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
js_shared:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/js_shared
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
kernel:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/kernel
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
linter:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/linter
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
mmap:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/mmap
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
vm:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/vm
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
vm_service:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/vm_service
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
wasm_builder:
git:
url: https://github.com/dart-lang/sdk.git
path: pkg/wasm_builder
ref: 3.6.0-198.0.dev
ref: 3.6.0-300.0.dev
2 changes: 1 addition & 1 deletion tool/dart_model_generator/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: generate_dart_model
publish-to: none
resolution: workspace
environment:
sdk: ^3.6.0-198.0.dev
sdk: ^3.6.0-300.0.dev

dependencies:
dart_model: any
Expand Down