This repository was archived by the owner on Feb 25, 2025. It is now read-only.
File tree 4 files changed +13
-24
lines changed
shell/platform/fuchsia/dart-pkg/zircon 4 files changed +13
-24
lines changed Original file line number Diff line number Diff line change @@ -80,6 +80,7 @@ environment:
80
80
81
81
# Declare all packages that are part of the workspace.
82
82
workspace :
83
+ - testing/litetest
83
84
- tools/engine_tool
84
85
85
86
# Declare all dependencies that are used by one or more packages.
@@ -145,8 +146,6 @@ dependency_overrides:
145
146
path : ./third_party/dart/pkg/expect
146
147
file :
147
148
path : ./third_party/dart/third_party/pkg/file/packages/file
148
- litetest :
149
- path : ./testing/litetest
150
149
logging :
151
150
path : ./third_party/dart/third_party/pkg/logging
152
151
meta :
Original file line number Diff line number Diff line change @@ -61,7 +61,6 @@ dart_library("zircon_lib") {
61
61
dart_library (" zircon_tests_lib" ) {
62
62
testonly = true
63
63
package_name = " zircon_tests"
64
- language_version = " 2.12"
65
64
source_dir = " ."
66
65
package_root = " test"
67
66
Original file line number Diff line number Diff line change 5
5
name : litetest
6
6
publish_to : none
7
7
8
- # Do not add any dependencies that require more than what is provided in
9
- # //third_party/dart/pkg or //third_party/dart/third_party/pkg.
10
- # In particular, package:test is not usable here.
11
-
12
- # If you do add packages here, make sure you can run `pub get --offline`, and
13
- # check the .packages and .package_config to make sure all the paths are
14
- # relative to this directory into //third_party/dart
15
-
8
+ # Required for workspace support.
16
9
environment :
17
- sdk : ' >=3.2.0-0 <4.0.0'
10
+ sdk : ^3.5.0-294.0.dev
11
+
12
+ # This package is managed as part of the engine workspace.
13
+ resolution : workspace
18
14
19
15
dependencies :
20
16
async_helper : any
21
17
expect : any
22
18
meta : any
23
19
smith : any
24
-
25
- dependency_overrides :
26
- async_helper :
27
- path : ../../third_party/dart/pkg/async_helper
28
- expect :
29
- path : ../../third_party/dart/pkg/expect
30
- meta :
31
- path : ../../third_party/dart/pkg/meta
32
- smith :
33
- path : ../../third_party/dart/pkg/smith
Original file line number Diff line number Diff line change @@ -49,10 +49,15 @@ def language_version_from_pubspec(pubspec):
49
49
if not parsed :
50
50
return DEFAULT_LANGUAGE_VERSION
51
51
52
- # If a format like sdk: '>=a.b' or sdk: 'a.b' is found, we'll use a.b.
52
+ # If any format like:
53
+ # sdk: '>=a.b'
54
+ # sdk: '^a.b'
55
+ # sdk: 'a.b'
56
+ # ... is found, we 'a.b' as the language version.
57
+ #
53
58
# In all other cases we default to "2.8"
54
59
env_sdk = parsed .get ('environment' , {}).get ('sdk' , 'any' )
55
- match = re .search (r'^(>=)?((0|[1-9]\d*)\.(0|[1-9]\d*))' , env_sdk )
60
+ match = re .search (r'^(>=|\^ )?((0|[1-9]\d*)\.(0|[1-9]\d*))' , env_sdk )
56
61
if match :
57
62
min_sdk_version = match .group (2 )
58
63
else :
You can’t perform that action at this time.
0 commit comments