Skip to content

Commit 6035842

Browse files
authored
[infra] Bump ffigen in package:native_ (#2172)
We were using an ancient version. But it seems like the only change is the symbol being omitted if possible.
1 parent 0681ec8 commit 6035842

File tree

33 files changed

+85
-40
lines changed

33 files changed

+85
-40
lines changed

pkgs/native_assets_builder/test_data/depend_on_fail_build/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ dependencies:
1515
path: ../../../native_assets_cli/
1616

1717
dev_dependencies:
18-
ffigen: ^8.0.2
18+
ffigen: ^18.0.0
1919
lints: ^5.1.1
2020
test: ^1.23.1

pkgs/native_assets_builder/test_data/depend_on_fail_build_app/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ dependencies:
1515
path: ../../../native_assets_cli/
1616

1717
dev_dependencies:
18-
ffigen: ^8.0.2
18+
ffigen: ^18.0.0
1919
lints: ^5.1.1
2020
test: ^1.23.1

pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ dependencies:
1313
path: ../../../native_assets_cli/
1414

1515
dev_dependencies:
16-
ffigen: ^8.0.2
16+
ffigen: ^18.0.0
1717
lints: ^5.1.1
1818
test: ^1.23.1

pkgs/native_assets_builder/test_data/fail_on_os_sdk_version/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ dependencies:
1313
path: ../../../native_assets_cli/
1414

1515
dev_dependencies:
16-
ffigen: ^8.0.2
16+
ffigen: ^18.0.0
1717
lints: ^5.1.1
1818
test: ^1.23.1

pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_link/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ dependencies:
1515
path: ../../../native_assets_cli/
1616

1717
dev_dependencies:
18-
ffigen: ^8.0.2
18+
ffigen: ^18.0.0
1919
lints: ^5.1.1
2020
test: ^1.23.1

pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_linker/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ dependencies:
1313
path: ../../../native_assets_cli/
1414

1515
dev_dependencies:
16-
ffigen: ^8.0.2
16+
ffigen: ^18.0.0
1717
lints: ^5.1.1
1818
test: ^1.23.1

pkgs/native_assets_builder/test_data/native_add/lib/src/native_add_bindings_generated.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
// ignore_for_file: type=lint
99
import 'dart:ffi' as ffi;
1010

11-
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(symbol: 'add')
11+
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>()
1212
external int add(int a, int b);

pkgs/native_assets_builder/test_data/native_add/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
path: ../../../native_toolchain_c/
1818

1919
dev_dependencies:
20-
ffigen: ^8.0.2
20+
ffigen: ^18.0.0
2121
lints: ^5.1.1
2222
some_dev_dep:
2323
path: ../some_dev_dep/

pkgs/native_assets_builder/test_data/native_add_add_source/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
path: ../../../native_toolchain_c/
1818

1919
dev_dependencies:
20-
ffigen: ^8.0.2
20+
ffigen: ^18.0.0
2121
lints: ^5.1.1
2222
some_dev_dep:
2323
path: ../some_dev_dep/

pkgs/native_assets_builder/test_data/native_add_duplicate/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
path: ../../../native_toolchain_c/
2020

2121
dev_dependencies:
22-
ffigen: ^8.0.2
22+
ffigen: ^18.0.0
2323
lints: ^5.1.1
2424
some_dev_dep:
2525
path: ../some_dev_dep/

pkgs/native_assets_builder/test_data/native_add_version_skew/lib/src/native_add_bindings_generated.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
// ignore_for_file: type=lint
99
import 'dart:ffi' as ffi;
1010

11-
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(symbol: 'add')
11+
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>()
1212
external int add(int a, int b);

pkgs/native_assets_builder/test_data/native_add_version_skew/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
native_toolchain_c: ^0.8.0
1414

1515
dev_dependencies:
16-
ffigen: ^8.0.2
16+
ffigen: ^18.0.0
1717
lints: ^5.1.1
1818
some_dev_dep:
1919
path: ../some_dev_dep/

pkgs/native_assets_builder/test_data/native_add_version_skew_2/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
native_toolchain_c: ^0.5.0
1414

1515
dev_dependencies:
16-
ffigen: ^8.0.2
16+
ffigen: ^18.0.0
1717
lints: ^5.1.1
1818
some_dev_dep:
1919
path: ../some_dev_dep/

pkgs/native_assets_builder/test_data/native_dynamic_linking/lib/add.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
// ignore_for_file: type=lint
99
import 'dart:ffi' as ffi;
1010

11-
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(symbol: 'add')
11+
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>()
1212
external int add(int a, int b);

pkgs/native_assets_builder/test_data/native_dynamic_linking/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ dependencies:
1818
path: ../../../native_toolchain_c/
1919

2020
dev_dependencies:
21-
ffigen: ^8.0.2
21+
ffigen: ^18.0.0
2222
lints: ^5.1.1
2323
test: ^1.21.0

pkgs/native_assets_builder/test_data/native_subtract/lib/src/native_subtract_bindings_generated.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
// ignore_for_file: type=lint
99
import 'dart:ffi' as ffi;
1010

11-
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(symbol: 'subtract')
11+
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>()
1212
external int subtract(int a, int b);

pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ dependencies:
1717
path: ../../../native_toolchain_c/
1818

1919
dev_dependencies:
20-
ffigen: ^8.0.2
20+
ffigen: ^18.0.0
2121
lints: ^5.1.1
2222
test: ^1.23.1

pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
path: ../../../native_toolchain_c/
1818

1919
dev_dependencies:
20-
ffigen: ^8.0.2
20+
ffigen: ^18.0.0
2121
lints: ^5.1.1
2222
some_dev_dep:
2323
path: ../some_dev_dep/
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: reusable_dynamic_library
2+
3+
description: Dynamically link native libraries to each other.
4+
version: 0.1.0
5+
repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli/example/build/native_dynamic_linking
6+
7+
publish_to: none
8+
9+
environment:
10+
sdk: '>=3.7.0 <4.0.0'
11+
12+
dependencies:
13+
logging: ^1.1.1
14+
# native_assets_cli: ^0.13.0
15+
native_assets_cli:
16+
path: ../../../native_assets_cli/
17+
# native_toolchain_c: ^0.10.0
18+
native_toolchain_c:
19+
path: ../../../native_toolchain_c/
20+
21+
dev_dependencies:
22+
ffigen: ^18.0.0
23+
lints: ^5.1.1
24+
test: ^1.21.0
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: reuse_dynamic_library
2+
description: Dynamically link native libraries to each other.
3+
version: 0.1.0
4+
repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli/example/build/native_dynamic_linking
5+
6+
publish_to: none
7+
8+
environment:
9+
sdk: '>=3.7.0 <4.0.0'
10+
11+
dependencies:
12+
logging: ^1.1.1
13+
# native_assets_cli: ^0.13.0
14+
native_assets_cli:
15+
path: ../../../native_assets_cli/
16+
# native_toolchain_c: ^0.10.0
17+
native_toolchain_c:
18+
path: ../../../native_toolchain_c/
19+
reusable_dynamic_library:
20+
path: ../reusable_dynamic_library/
21+
22+
dev_dependencies:
23+
ffigen: ^18.0.0
24+
lints: ^5.1.1
25+
test: ^1.21.0

pkgs/native_assets_builder/test_data/system_library/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ dependencies:
1717
path: ../../../native_toolchain_c/
1818

1919
dev_dependencies:
20-
ffigen: ^10.0.0
20+
ffigen: ^18.0.0
2121
lints: ^5.1.1
2222
test: ^1.23.1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file
1+
// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

@@ -8,8 +8,8 @@
88
// ignore_for_file: type=lint
99
import 'dart:ffi' as ffi;
1010

11-
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(symbol: 'add')
11+
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>()
1212
external int add(int a, int b);
1313

14-
@ffi.Native<ffi.IntPtr Function(ffi.IntPtr, ffi.IntPtr)>(symbol: 'multiply')
14+
@ffi.Native<ffi.IntPtr Function(ffi.IntPtr, ffi.IntPtr)>()
1515
external int multiply(int a, int b);

pkgs/native_assets_builder/test_data/treeshaking_native_libs/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
path: ../../../native_toolchain_c/
1818

1919
dev_dependencies:
20-
ffigen: ^8.0.2
20+
ffigen: ^18.0.0
2121
lints: ^5.1.1
2222
some_dev_dep:
2323
path: ../some_dev_dep/

pkgs/native_assets_cli/example/build/download_asset/lib/native_add.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
// ignore_for_file: type=lint
99
import 'dart:ffi' as ffi;
1010

11-
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(symbol: 'add')
11+
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>()
1212
external int add(int a, int b);

pkgs/native_assets_cli/example/build/download_asset/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ dependencies:
2020

2121
dev_dependencies:
2222
args: ^2.6.0
23-
ffigen: ^8.0.2
23+
ffigen: ^18.0.0
2424
lints: ^5.1.1
2525
test: ^1.21.0

pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ dependencies:
1515
path: ../../../../native_assets_cli/
1616

1717
dev_dependencies:
18-
ffigen: ^8.0.2
18+
ffigen: ^18.0.0
1919
lints: ^5.1.1
2020
test: ^1.21.0

pkgs/native_assets_cli/example/build/native_add_library/lib/native_add_library.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
// ignore_for_file: type=lint
99
import 'dart:ffi' as ffi;
1010

11-
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(symbol: 'add')
11+
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>()
1212
external int add(int a, int b);

pkgs/native_assets_cli/example/build/native_add_library/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ dependencies:
1818
path: ../../../../native_toolchain_c/
1919

2020
dev_dependencies:
21-
ffigen: ^8.0.2
21+
ffigen: ^18.0.0
2222
lints: ^5.1.1
2323
test: ^1.21.0

pkgs/native_assets_cli/example/build/native_dynamic_linking/lib/add.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
// ignore_for_file: type=lint
99
import 'dart:ffi' as ffi;
1010

11-
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(symbol: 'add')
11+
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>()
1212
external int add(int a, int b);

pkgs/native_assets_cli/example/build/native_dynamic_linking/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ dependencies:
1818
path: ../../../../native_toolchain_c/
1919

2020
dev_dependencies:
21-
ffigen: ^8.0.2
21+
ffigen: ^18.0.0
2222
lints: ^5.1.1
2323
test: ^1.21.0

pkgs/native_assets_cli/example/build/system_library/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ dependencies:
1717
path: ../../../../native_toolchain_c/
1818

1919
dev_dependencies:
20-
ffigen: ^10.0.0
20+
ffigen: ^18.0.0
2121
lints: ^5.1.1
2222
test: ^1.23.1

pkgs/native_assets_cli/example/build/use_dart_api/lib/src/use_dart_api_bindings_generated.dart

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,16 @@
88
// ignore_for_file: type=lint
99
import 'dart:ffi' as ffi;
1010

11-
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>(symbol: 'add')
11+
@ffi.Native<ffi.Int32 Function(ffi.Int32, ffi.Int32)>()
1212
external int add(int a, int b);
1313

14-
@ffi.Native<ffi.IntPtr Function(ffi.Pointer<ffi.Void>)>(symbol: 'InitDartApiDL')
14+
@ffi.Native<ffi.IntPtr Function(ffi.Pointer<ffi.Void>)>()
1515
external int InitDartApiDL(ffi.Pointer<ffi.Void> data);
1616

17-
@ffi.Native<ffi.Pointer<ffi.Void> Function(ffi.Handle)>(
18-
symbol: 'NewPersistentHandle',
19-
)
17+
@ffi.Native<ffi.Pointer<ffi.Void> Function(ffi.Handle)>()
2018
external ffi.Pointer<ffi.Void> NewPersistentHandle(
2119
Object non_persistent_handle,
2220
);
2321

24-
@ffi.Native<ffi.Handle Function(ffi.Pointer<ffi.Void>)>(
25-
symbol: 'HandleFromPersistent',
26-
)
22+
@ffi.Native<ffi.Handle Function(ffi.Pointer<ffi.Void>)>()
2723
external Object HandleFromPersistent(ffi.Pointer<ffi.Void> persistent_handle);

pkgs/native_assets_cli/example/build/use_dart_api/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ dependencies:
1717
path: ../../../../native_toolchain_c/
1818

1919
dev_dependencies:
20-
ffigen: ^10.0.0
20+
ffigen: ^18.0.0
2121
lints: ^5.1.1
2222
test: ^1.23.1

0 commit comments

Comments
 (0)