Skip to content

Commit 0681ec8

Browse files
authored
[infra] Set language version to 3.7.0 everywhere (#2169)
1 parent 030324c commit 0681ec8

File tree

13 files changed

+49
-287
lines changed

13 files changed

+49
-287
lines changed

pkgs/native_assets_builder/doc/protocol/v1.md

Lines changed: 0 additions & 227 deletions
This file was deleted.

pkgs/native_assets_builder/test/build_runner/pub_workspace_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ resolution: workspace
3535
name: dart_lang_native_workspace
3636
3737
environment:
38-
sdk: ^3.6.0
38+
sdk: '>=3.7.0 <4.0.0'
3939
4040
workspace:
4141
''';

pkgs/native_assets_builder/test_data/add_asset_link/hook/build.dart

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ void main(List<String> arguments) async {
1111
if (!input.config.linkingEnabled) {
1212
throw Exception('Link hook must be run!');
1313
}
14-
final logger = Logger('')
15-
..level = Level.ALL
16-
..onRecord.listen((record) {
17-
print('${record.level.name}: ${record.time}: ${record.message}');
18-
});
14+
final logger =
15+
Logger('')
16+
..level = Level.ALL
17+
..onRecord.listen((record) {
18+
print('${record.level.name}: ${record.time}: ${record.message}');
19+
});
1920
await CBuilder.library(
2021
name: 'add',
2122
assetName: 'dylib_add_build',
22-
sources: [
23-
'src/native_add.c',
24-
],
23+
sources: ['src/native_add.c'],
2524
linkModePreference: LinkModePreference.dynamic,
2625
).run(
2726
input: input,

pkgs/native_assets_builder/test_data/add_asset_link/hook/link.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ void main(List<String> arguments) async {
99
final builtDylib = input.assets.code.first;
1010
output
1111
..assets.code.add(
12-
CodeAsset(
13-
package: 'add_asset_link',
14-
name: 'dylib_add_link',
15-
linkMode: builtDylib.linkMode,
16-
os: input.config.code.targetOS,
17-
architecture: input.config.code.targetArchitecture,
18-
file: builtDylib.file,
19-
),
20-
)
12+
CodeAsset(
13+
package: 'add_asset_link',
14+
name: 'dylib_add_link',
15+
linkMode: builtDylib.linkMode,
16+
os: input.config.code.targetOS,
17+
architecture: input.config.code.targetArchitecture,
18+
file: builtDylib.file,
19+
),
20+
)
2121
..addDependency(input.packageRoot.resolve('hook/link.dart'));
2222
});
2323
}

pkgs/native_assets_builder/test_data/add_asset_link/lib/src/add_asset_link_bindings.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import 'dart:ffi' as ffi;
66

77
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(
8-
assetId: 'package:add_asset_link/dylib_add_link')
9-
external int add(
10-
int a,
11-
int b,
12-
);
8+
assetId: 'package:add_asset_link/dylib_add_link',
9+
)
10+
external int add(int a, int b);

pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: add_asset_link
22
description: Add a dylib in the link step.
3-
version: 1.0.0
3+
version: 0.1.0
44

55
publish_to: none
66

77
environment:
8-
sdk: ^3.0.0
8+
sdk: '>=3.7.0 <4.0.0'
99

1010
dependencies:
1111
logging: ^1.1.1

pkgs/native_assets_builder/test_data/drop_dylib_link/hook/build.dart

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@ import 'package:native_toolchain_c/native_toolchain_c.dart';
88

99
void main(List<String> arguments) async {
1010
await build(arguments, (input, output) async {
11-
final logger = Logger('')
12-
..level = Level.ALL
13-
..onRecord.listen((record) {
14-
print('${record.level.name}: ${record.time}: ${record.message}');
15-
});
11+
final logger =
12+
Logger('')
13+
..level = Level.ALL
14+
..onRecord.listen((record) {
15+
print('${record.level.name}: ${record.time}: ${record.message}');
16+
});
1617
final linkInPackage =
1718
input.config.linkingEnabled ? input.packageName : null;
1819
await CBuilder.library(
1920
name: 'add',
2021
assetName: 'dylib_add',
21-
sources: [
22-
'src/native_add.c',
23-
],
22+
sources: ['src/native_add.c'],
2423
linkModePreference: LinkModePreference.dynamic,
2524
).run(
2625
input: input,
@@ -32,9 +31,7 @@ void main(List<String> arguments) async {
3231
await CBuilder.library(
3332
name: 'multiply',
3433
assetName: 'dylib_multiply',
35-
sources: [
36-
'src/native_multiply.c',
37-
],
34+
sources: ['src/native_multiply.c'],
3835
linkModePreference: LinkModePreference.dynamic,
3936
).run(
4037
input: input,

pkgs/native_assets_builder/test_data/drop_dylib_link/lib/src/drop_dylib_link_bindings.dart

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@
55
import 'dart:ffi' as ffi;
66

77
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(
8-
assetId: 'package:drop_dylib_link/dylib_add')
9-
external int add(
10-
int a,
11-
int b,
12-
);
8+
assetId: 'package:drop_dylib_link/dylib_add',
9+
)
10+
external int add(int a, int b);
1311

1412
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(
15-
assetId: 'package:drop_dylib_link/dylib_multiply')
16-
external int multiply(
17-
int a,
18-
int b,
19-
);
13+
assetId: 'package:drop_dylib_link/dylib_multiply',
14+
)
15+
external int multiply(int a, int b);

pkgs/native_assets_builder/test_data/drop_dylib_link/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: drop_dylib_link
22
description: Generate two dylibs, remove one in linking.
3-
version: 1.0.0
3+
version: 0.1.0
44

55
publish_to: none
66

77
environment:
8-
sdk: ^3.0.0
8+
sdk: '>=3.7.0 <4.0.0'
99

1010
dependencies:
1111
logging: ^1.1.1

0 commit comments

Comments
 (0)