From 51c58d37523edf78cf8eeb7e0704d5ae5906f361 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 28 Nov 2025 10:25:33 +0100 Subject: [PATCH 01/10] [infra] bump dependencies undo some bumps fix lint Revert "fix lint" This reverts commit 450eb88056f7eacc22b9d60b98ed3b4087c3f566. --- pkgs/ffigen/example/objective_c/pubspec.yaml | 2 +- pkgs/ffigen/example/swift/pubspec.yaml | 2 +- pkgs/ffigen/pubspec.yaml | 4 ++-- .../example/command_line/pubspec.yaml | 2 +- pkgs/objective_c/pubspec.yaml | 8 ++++---- pubspec.yaml | 19 ++++++++++--------- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/ffigen/example/objective_c/pubspec.yaml b/pkgs/ffigen/example/objective_c/pubspec.yaml index bced920489..8a9136347a 100644 --- a/pkgs/ffigen/example/objective_c/pubspec.yaml +++ b/pkgs/ffigen/example/objective_c/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: args: ^2.6.0 ffi: ^2.0.1 logging: ^1.3.0 - objective_c: ^0.0.1 + objective_c: ^9.2.1 dev_dependencies: dart_flutter_team_lints: ^3.5.2 diff --git a/pkgs/ffigen/example/swift/pubspec.yaml b/pkgs/ffigen/example/swift/pubspec.yaml index 6465873724..51a68b63c5 100644 --- a/pkgs/ffigen/example/swift/pubspec.yaml +++ b/pkgs/ffigen/example/swift/pubspec.yaml @@ -10,7 +10,7 @@ environment: dependencies: args: ^2.6.0 ffi: ^2.0.1 - objective_c: ^0.0.1 + objective_c: ^9.2.1 dev_dependencies: dart_flutter_team_lints: ^3.5.2 diff --git a/pkgs/ffigen/pubspec.yaml b/pkgs/ffigen/pubspec.yaml index 8b50c2b92d..1a2ef4e08c 100644 --- a/pkgs/ffigen/pubspec.yaml +++ b/pkgs/ffigen/pubspec.yaml @@ -39,8 +39,8 @@ dev_dependencies: async: ^2.11.0 dart_flutter_team_lints: ^3.5.2 json_schema: ^5.1.1 - leak_tracker: ^10.0.7 - objective_c: ^9.2.0 + leak_tracker: ^11.0.2 + objective_c: ^9.2.1 test: ^1.26.2 dependency_overrides: diff --git a/pkgs/objective_c/example/command_line/pubspec.yaml b/pkgs/objective_c/example/command_line/pubspec.yaml index ff6cf0f7ad..fae3f21a89 100644 --- a/pkgs/objective_c/example/command_line/pubspec.yaml +++ b/pkgs/objective_c/example/command_line/pubspec.yaml @@ -11,5 +11,5 @@ dependencies: path: ../.. dev_dependencies: - lints: ^5.0.0 + lints: ^6.0.0 test: ^1.27.0 diff --git a/pkgs/objective_c/pubspec.yaml b/pkgs/objective_c/pubspec.yaml index b554292074..4d5df6ef48 100644 --- a/pkgs/objective_c/pubspec.yaml +++ b/pkgs/objective_c/pubspec.yaml @@ -18,18 +18,18 @@ environment: sdk: '>=3.10.0 <4.0.0' dependencies: - code_assets: ^0.19.0 + code_assets: ^1.0.0 collection: ^1.19.1 ffi: ^2.1.0 - hooks: ^0.20.5 + hooks: ^1.0.0 logging: ^1.3.0 - native_toolchain_c: ^0.17.2 + native_toolchain_c: ^0.17.4 pub_semver: ^2.1.4 dev_dependencies: args: ^2.6.0 dart_flutter_team_lints: ^3.5.2 - ffigen: ^20.1.0 + ffigen: ^20.1.1 native_test_helpers: path: ../native_test_helpers/ path: ^1.9.0 diff --git a/pubspec.yaml b/pubspec.yaml index e7a0307e49..b4733d2a02 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,6 +14,15 @@ workspace: - pkgs/code_assets/example/stb_image - pkgs/data_assets - pkgs/hooks + - pkgs/hooks/example/build/download_asset + - pkgs/hooks/example/build/local_asset + - pkgs/hooks/example/build/native_add_app + - pkgs/hooks/example/build/native_add_library + - pkgs/hooks/example/build/native_dynamic_linking + - pkgs/hooks/example/build/system_library + - pkgs/hooks/example/build/use_dart_api + - pkgs/hooks/example/link/app_with_asset_treeshaking + - pkgs/hooks/example/link/package_with_assets - pkgs/hooks_runner - pkgs/hooks_runner/test_data/add_asset_link - pkgs/hooks_runner/test_data/complex_link @@ -45,6 +54,7 @@ workspace: - pkgs/hooks_runner/test_data/native_dynamic_linking - pkgs/hooks_runner/test_data/native_subtract - pkgs/hooks_runner/test_data/no_asset_for_link + - pkgs/hooks_runner/test_data/no_build_output - pkgs/hooks_runner/test_data/no_hook - pkgs/hooks_runner/test_data/package_reading_metadata - pkgs/hooks_runner/test_data/package_with_metadata @@ -64,15 +74,6 @@ workspace: - pkgs/hooks_runner/test_data/wrong_build_output_3 - pkgs/hooks_runner/test_data/wrong_linker - pkgs/hooks_runner/test_data/wrong_namespace_asset - - pkgs/hooks/example/build/download_asset - - pkgs/hooks/example/build/local_asset - - pkgs/hooks/example/build/native_add_app - - pkgs/hooks/example/build/native_add_library - - pkgs/hooks/example/build/native_dynamic_linking - - pkgs/hooks/example/build/system_library - - pkgs/hooks/example/build/use_dart_api - - pkgs/hooks/example/link/app_with_asset_treeshaking - - pkgs/hooks/example/link/package_with_assets - pkgs/json_syntax_generator - pkgs/native_test_helpers - pkgs/native_toolchain_c From c14e193d262bf18af55af460bb9cc8a0524b8283 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 28 Nov 2025 11:30:34 +0100 Subject: [PATCH 02/10] [ffigen][ffi][objective_c] add to workspace --- pkgs/ffi/pubspec.yaml | 2 ++ pkgs/ffigen/example/add/pubspec.yaml | 2 ++ pkgs/ffigen/example/c_json/pubspec.yaml | 2 ++ pkgs/ffigen/example/ffinative/pubspec.yaml | 2 ++ .../example/libclang-example/pubspec.yaml | 2 ++ pkgs/ffigen/example/objective_c/pubspec.yaml | 9 ++---- .../example/shared_bindings/pubspec.yaml | 2 ++ pkgs/ffigen/example/simple/pubspec.yaml | 2 ++ pkgs/ffigen/example/swift/pubspec.yaml | 9 ++---- pkgs/ffigen/pubspec.yaml | 12 ++----- .../example/command_line/pubspec.yaml | 2 ++ .../example/flutter_app/pubspec.yaml | 2 ++ pkgs/objective_c/pubspec.yaml | 12 ++----- pubspec.yaml | 31 +++++++++++++++++++ 14 files changed, 59 insertions(+), 32 deletions(-) diff --git a/pkgs/ffi/pubspec.yaml b/pkgs/ffi/pubspec.yaml index 2a896eb52e..f81daa8813 100644 --- a/pkgs/ffi/pubspec.yaml +++ b/pkgs/ffi/pubspec.yaml @@ -9,6 +9,8 @@ topics: - ffi - codegen +resolution: workspace + environment: sdk: '>=3.7.0 <4.0.0' diff --git a/pkgs/ffigen/example/add/pubspec.yaml b/pkgs/ffigen/example/add/pubspec.yaml index 74488a76e1..68f05b8f64 100644 --- a/pkgs/ffigen/example/add/pubspec.yaml +++ b/pkgs/ffigen/example/add/pubspec.yaml @@ -2,6 +2,8 @@ name: add description: A simple end-to-end example showcasing FFIgen. publish_to: none +resolution: workspace + environment: sdk: '>=3.8.0 <4.0.0' diff --git a/pkgs/ffigen/example/c_json/pubspec.yaml b/pkgs/ffigen/example/c_json/pubspec.yaml index e218628ba5..8adf6e4eb3 100644 --- a/pkgs/ffigen/example/c_json/pubspec.yaml +++ b/pkgs/ffigen/example/c_json/pubspec.yaml @@ -4,6 +4,8 @@ name: c_json_example +resolution: workspace + environment: sdk: '>=3.8.0 <4.0.0' diff --git a/pkgs/ffigen/example/ffinative/pubspec.yaml b/pkgs/ffigen/example/ffinative/pubspec.yaml index e3a1b3d77f..d50662fc97 100644 --- a/pkgs/ffigen/example/ffinative/pubspec.yaml +++ b/pkgs/ffigen/example/ffinative/pubspec.yaml @@ -4,6 +4,8 @@ name: ffinative_example +resolution: workspace + environment: sdk: '>=3.8.0 <4.0.0' diff --git a/pkgs/ffigen/example/libclang-example/pubspec.yaml b/pkgs/ffigen/example/libclang-example/pubspec.yaml index c2a2e38632..1d5c04f390 100644 --- a/pkgs/ffigen/example/libclang-example/pubspec.yaml +++ b/pkgs/ffigen/example/libclang-example/pubspec.yaml @@ -4,6 +4,8 @@ name: libclang_example +resolution: workspace + environment: sdk: '>=3.8.0 <4.0.0' diff --git a/pkgs/ffigen/example/objective_c/pubspec.yaml b/pkgs/ffigen/example/objective_c/pubspec.yaml index 8a9136347a..86bd9c051f 100644 --- a/pkgs/ffigen/example/objective_c/pubspec.yaml +++ b/pkgs/ffigen/example/objective_c/pubspec.yaml @@ -4,6 +4,8 @@ name: objective_c_example +resolution: workspace + environment: sdk: '>=3.8.0 <4.0.0' @@ -15,9 +17,4 @@ dependencies: dev_dependencies: dart_flutter_team_lints: ^3.5.2 - ffigen: - path: ../../ - -dependency_overrides: - objective_c: - path: ../../../objective_c/ + ffigen: ^20.1.1 diff --git a/pkgs/ffigen/example/shared_bindings/pubspec.yaml b/pkgs/ffigen/example/shared_bindings/pubspec.yaml index cc1256fb55..ce7344ddcc 100644 --- a/pkgs/ffigen/example/shared_bindings/pubspec.yaml +++ b/pkgs/ffigen/example/shared_bindings/pubspec.yaml @@ -4,6 +4,8 @@ name: shared_bindings +resolution: workspace + environment: sdk: '>=3.8.0 <4.0.0' diff --git a/pkgs/ffigen/example/simple/pubspec.yaml b/pkgs/ffigen/example/simple/pubspec.yaml index 4b6df34dcf..8c02f8f78d 100644 --- a/pkgs/ffigen/example/simple/pubspec.yaml +++ b/pkgs/ffigen/example/simple/pubspec.yaml @@ -4,6 +4,8 @@ name: simple_example +resolution: workspace + environment: sdk: '>=3.8.0 <4.0.0' diff --git a/pkgs/ffigen/example/swift/pubspec.yaml b/pkgs/ffigen/example/swift/pubspec.yaml index 51a68b63c5..e8d811e175 100644 --- a/pkgs/ffigen/example/swift/pubspec.yaml +++ b/pkgs/ffigen/example/swift/pubspec.yaml @@ -4,6 +4,8 @@ name: swift_example +resolution: workspace + environment: sdk: '>=3.8.0 <4.0.0' @@ -14,9 +16,4 @@ dependencies: dev_dependencies: dart_flutter_team_lints: ^3.5.2 - ffigen: - path: ../../ - -dependency_overrides: - objective_c: - path: ../../../objective_c/ + ffigen: ^20.1.1 diff --git a/pkgs/ffigen/pubspec.yaml b/pkgs/ffigen/pubspec.yaml index 1a2ef4e08c..49568dc1aa 100644 --- a/pkgs/ffigen/pubspec.yaml +++ b/pkgs/ffigen/pubspec.yaml @@ -15,6 +15,8 @@ topics: - ffi - codegen +resolution: workspace + environment: sdk: '>=3.8.0 <4.0.0' @@ -42,13 +44,3 @@ dev_dependencies: leak_tracker: ^11.0.2 objective_c: ^9.2.1 test: ^1.26.2 - -dependency_overrides: - code_assets: - path: ../code_assets - hooks: - path: ../hooks - native_toolchain_c: - path: ../native_toolchain_c - objective_c: - path: ../objective_c diff --git a/pkgs/objective_c/example/command_line/pubspec.yaml b/pkgs/objective_c/example/command_line/pubspec.yaml index fae3f21a89..337744bcda 100644 --- a/pkgs/objective_c/example/command_line/pubspec.yaml +++ b/pkgs/objective_c/example/command_line/pubspec.yaml @@ -3,6 +3,8 @@ description: "Demonstrates using package:objective_c" version: 1.0.0 publish_to: none +resolution: workspace + environment: sdk: '>=3.9.0-21.0.dev <4.0.0' diff --git a/pkgs/objective_c/example/flutter_app/pubspec.yaml b/pkgs/objective_c/example/flutter_app/pubspec.yaml index a8dc3ec009..1b0ad658b6 100644 --- a/pkgs/objective_c/example/flutter_app/pubspec.yaml +++ b/pkgs/objective_c/example/flutter_app/pubspec.yaml @@ -3,6 +3,8 @@ description: "A new Flutter project." publish_to: 'none' version: 0.1.0 +resolution: workspace + environment: sdk: ^3.10.0 diff --git a/pkgs/objective_c/pubspec.yaml b/pkgs/objective_c/pubspec.yaml index 4d5df6ef48..47ef4cdc58 100644 --- a/pkgs/objective_c/pubspec.yaml +++ b/pkgs/objective_c/pubspec.yaml @@ -14,6 +14,8 @@ topics: - objective-c - codegen +resolution: workspace + environment: sdk: '>=3.10.0 <4.0.0' @@ -35,13 +37,3 @@ dev_dependencies: path: ^1.9.0 test: ^1.26.2 yaml: ^3.1.0 - -dependency_overrides: - code_assets: - path: ../code_assets - ffigen: - path: ../ffigen - hooks: - path: ../hooks - native_toolchain_c: - path: ../native_toolchain_c diff --git a/pubspec.yaml b/pubspec.yaml index b4733d2a02..183829e123 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,6 +13,16 @@ workspace: - pkgs/code_assets/example/sqlite_prebuilt - pkgs/code_assets/example/stb_image - pkgs/data_assets + - pkgs/ffi/ + - pkgs/ffigen + - pkgs/ffigen/example/add + - pkgs/ffigen/example/c_json + - pkgs/ffigen/example/ffinative + - pkgs/ffigen/example/libclang-example + - pkgs/ffigen/example/objective_c + - pkgs/ffigen/example/shared_bindings + - pkgs/ffigen/example/simple + - pkgs/ffigen/example/swift - pkgs/hooks - pkgs/hooks/example/build/download_asset - pkgs/hooks/example/build/local_asset @@ -51,6 +61,8 @@ workspace: - pkgs/hooks_runner/test_data/native_add - pkgs/hooks_runner/test_data/native_add_add_source - pkgs/hooks_runner/test_data/native_add_duplicate + # - pkgs/hooks_runner/test_data/native_add_version_skew # TODO + # - pkgs/hooks_runner/test_data/native_add_version_skew_2 # TODO - pkgs/hooks_runner/test_data/native_dynamic_linking - pkgs/hooks_runner/test_data/native_subtract - pkgs/hooks_runner/test_data/no_asset_for_link @@ -74,14 +86,33 @@ workspace: - pkgs/hooks_runner/test_data/wrong_build_output_3 - pkgs/hooks_runner/test_data/wrong_linker - pkgs/hooks_runner/test_data/wrong_namespace_asset + # - pkgs/jni # TODO + # - pkgs/jni/example # TODO + # - pkgs/jnigen # TODO + # - pkgs/jnigen/android_test_runner # TODO + # - pkgs/jnigen/example/in_app_java # TODO + # - pkgs/jnigen/example/kotlin_plugin # TODO + # - pkgs/jnigen/example/kotlin_plugin/example # TODO + # - pkgs/jnigen/example/notification_plugin # TODO + # - pkgs/jnigen/example/notification_plugin/example # TODO + # - pkgs/jnigen/example/pdfbox_plugin # TODO + # - pkgs/jnigen/example/pdfbox_plugin/dart_example # TODO + # - pkgs/jnigen/example/pdfbox_plugin/example # TODO - pkgs/json_syntax_generator + # - pkgs/native_doc_dartifier # TODO - pkgs/native_test_helpers - pkgs/native_toolchain_c + - pkgs/objective_c + - pkgs/objective_c/example/command_line + - pkgs/objective_c/example/flutter_app - pkgs/pub_formats - pkgs/record_use - pkgs/record_use/test_data/drop_data_asset - pkgs/record_use/test_data/drop_dylib_recording - pkgs/repo_lint_rules + # - pkgs/swift2objc # TODO + # - pkgs/swiftgen # TODO + # - pkgs/swiftgen/example # TODO # Hook user-defines are specified in the pub workspace. hooks: From 68270b257b2515c0624362b62f2d93ee2f96fe72 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 28 Nov 2025 14:08:33 +0100 Subject: [PATCH 03/10] remove flutter_app --- pkgs/objective_c/example/flutter_app/pubspec.yaml | 2 -- pubspec.yaml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/objective_c/example/flutter_app/pubspec.yaml b/pkgs/objective_c/example/flutter_app/pubspec.yaml index 1b0ad658b6..a8dc3ec009 100644 --- a/pkgs/objective_c/example/flutter_app/pubspec.yaml +++ b/pkgs/objective_c/example/flutter_app/pubspec.yaml @@ -3,8 +3,6 @@ description: "A new Flutter project." publish_to: 'none' version: 0.1.0 -resolution: workspace - environment: sdk: ^3.10.0 diff --git a/pubspec.yaml b/pubspec.yaml index 183829e123..c03ce8d8b4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -104,7 +104,7 @@ workspace: - pkgs/native_toolchain_c - pkgs/objective_c - pkgs/objective_c/example/command_line - - pkgs/objective_c/example/flutter_app + # - pkgs/objective_c/example/flutter_app # Requires Flutter. - pkgs/pub_formats - pkgs/record_use - pkgs/record_use/test_data/drop_data_asset From 9e00b698ebd89556f5ea878e9c0f4a1a4916dce0 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 28 Nov 2025 14:24:27 +0100 Subject: [PATCH 04/10] exclude flutter_app from main analysis fix --- analysis_options.yaml | 3 +++ tool/ci.dart | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 analysis_options.yaml diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 0000000000..47700e7e82 --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,3 @@ +analyzer: + exclude: + - pkgs/objective_c/example/flutter_app # Flutter app that does not analyze as part of `dart analyze` for the workspace. diff --git a/tool/ci.dart b/tool/ci.dart index a96dd1ba35..c312d52e94 100644 --- a/tool/ci.dart +++ b/tool/ci.dart @@ -2,8 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'dart:io'; import 'dart:ffi'; +import 'dart:io'; import 'package:args/args.dart'; import 'package:yaml/yaml.dart'; From 146a59938fac8f4c67a50be6ade7ad14ae9b2217 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 28 Nov 2025 14:53:08 +0100 Subject: [PATCH 05/10] run setup script --- .github/workflows/native.yaml | 3 +++ analysis_options.yaml | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml index 621b6a42bc..d4fde3e22d 100644 --- a/.github/workflows/native.yaml +++ b/.github/workflows/native.yaml @@ -67,6 +67,9 @@ jobs: - run: dart pub get + - name: Build test dylib and bindings + run: dart --enable-asserts pkgs/ffigen/test/setup.dart + - name: Run pub get, analysis, formatting, generators, and tests. # Don't run examples on stable, the experiment is not available on stable. run: dart tool/ci.dart --all --no-example diff --git a/analysis_options.yaml b/analysis_options.yaml index 47700e7e82..d2ddce3285 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,3 +1,5 @@ analyzer: exclude: - - pkgs/objective_c/example/flutter_app # Flutter app that does not analyze as part of `dart analyze` for the workspace. + # The following packages require Flutter and therefore cannot be analyzed as + # part of `dart analyze` for the workspace. + - pkgs/objective_c/example/flutter_app From f78aa69eafb1b7d0da21d54b0b5274358cac802b Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 28 Nov 2025 15:07:39 +0100 Subject: [PATCH 06/10] remove ffi.yml --- .github/workflows/ffi.yaml | 73 ----------------------------------- .github/workflows/native.yaml | 2 + 2 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 .github/workflows/ffi.yaml diff --git a/.github/workflows/ffi.yaml b/.github/workflows/ffi.yaml deleted file mode 100644 index ba6b369c26..0000000000 --- a/.github/workflows/ffi.yaml +++ /dev/null @@ -1,73 +0,0 @@ -name: ffi - -on: - # Run on PRs and pushes to the default branch. - push: - branches: [main] - paths: - - '.github/workflows/ffi.yaml' - - 'pkgs/ffi/**' - pull_request: - branches: [main] - paths: - - '.github/workflows/ffi.yaml' - - 'pkgs/ffi/**' - schedule: - - cron: "0 0 * * 0" - -env: - PUB_ENVIRONMENT: bot.github - -jobs: - # Check code formatting and static analysis on a single OS (linux) - # against Dart dev. - analyze: - runs-on: ubuntu-latest - defaults: - run: - working-directory: pkgs/ffi/ - strategy: - fail-fast: false - matrix: - sdk: [dev] - steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 - - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c - with: - sdk: ${{ matrix.sdk }} - - id: install - name: Install dependencies - run: dart pub get - - name: Check formatting - run: dart format --output=none --set-exit-if-changed . - if: always() && steps.install.outcome == 'success' - - name: Analyze code - run: dart analyze --fatal-infos - if: always() && steps.install.outcome == 'success' - - # Run tests on a matrix consisting of two dimensions: - # 1. OS: ubuntu-latest, (macos-latest, windows-latest) - # 2. release channel: dev - test: - needs: analyze - runs-on: ${{ matrix.os }} - defaults: - run: - working-directory: pkgs/ffi/ - strategy: - fail-fast: false - matrix: - # Add macos-latest and/or windows-latest if relevant for this package. - os: [ubuntu-latest] - sdk: [beta, dev] - steps: - - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 - - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c - with: - sdk: ${{ matrix.sdk }} - - id: install - name: Install dependencies - run: dart pub get - - name: Run VM tests - run: dart test --platform vm - if: always() && steps.install.outcome == 'success' diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml index d4fde3e22d..35c3ba35b4 100644 --- a/.github/workflows/native.yaml +++ b/.github/workflows/native.yaml @@ -12,6 +12,7 @@ on: - ".github/workflows/native.yaml" - "pkgs/code_assets/**" - "pkgs/data_assets/**" + - 'pkgs/ffi/**' - "pkgs/hooks_runner/**" - "pkgs/hooks/**" - "pkgs/json_syntax_generator/**" @@ -25,6 +26,7 @@ on: - ".github/workflows/native.yaml" - "pkgs/code_assets/**" - "pkgs/data_assets/**" + - 'pkgs/ffi/**' - "pkgs/hooks_runner/**" - "pkgs/hooks/**" - "pkgs/json_syntax_generator/**" From 1ff3aec1e36d22e239bff2a0439a7176ce2af881 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 28 Nov 2025 15:19:55 +0100 Subject: [PATCH 07/10] fix native workflow --- .github/workflows/native.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml index 35c3ba35b4..c4d08a421f 100644 --- a/.github/workflows/native.yaml +++ b/.github/workflows/native.yaml @@ -13,11 +13,15 @@ on: - "pkgs/code_assets/**" - "pkgs/data_assets/**" - 'pkgs/ffi/**' - - "pkgs/hooks_runner/**" + - 'pkgs/ffigen/**' - "pkgs/hooks/**" + - "pkgs/hooks_runner/**" - "pkgs/json_syntax_generator/**" - "pkgs/native_test_helpers/**" - "pkgs/native_toolchain_c/**" + - "pkgs/objective_c/**" + - "pkgs/pub_formats/**" + - "pkgs/record_use/**" - "pkgs/repo_lint_rules/**" - "tool/**" push: @@ -27,11 +31,15 @@ on: - "pkgs/code_assets/**" - "pkgs/data_assets/**" - 'pkgs/ffi/**' - - "pkgs/hooks_runner/**" + - 'pkgs/ffigen/**' - "pkgs/hooks/**" + - "pkgs/hooks_runner/**" - "pkgs/json_syntax_generator/**" - "pkgs/native_test_helpers/**" - "pkgs/native_toolchain_c/**" + - "pkgs/objective_c/**" + - "pkgs/pub_formats/**" + - "pkgs/record_use/**" - "pkgs/repo_lint_rules/**" - "tool/**" schedule: From 51f481f596fe7285c4ba2378f9ff7e6fb0517c87 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 28 Nov 2025 15:21:57 +0100 Subject: [PATCH 08/10] Update pubspec.yaml --- pubspec.yaml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index c03ce8d8b4..ab4018a212 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -61,8 +61,8 @@ workspace: - pkgs/hooks_runner/test_data/native_add - pkgs/hooks_runner/test_data/native_add_add_source - pkgs/hooks_runner/test_data/native_add_duplicate - # - pkgs/hooks_runner/test_data/native_add_version_skew # TODO - # - pkgs/hooks_runner/test_data/native_add_version_skew_2 # TODO + # - pkgs/hooks_runner/test_data/native_add_version_skew # TODO + # - pkgs/hooks_runner/test_data/native_add_version_skew_2 # TODO - pkgs/hooks_runner/test_data/native_dynamic_linking - pkgs/hooks_runner/test_data/native_subtract - pkgs/hooks_runner/test_data/no_asset_for_link @@ -86,33 +86,33 @@ workspace: - pkgs/hooks_runner/test_data/wrong_build_output_3 - pkgs/hooks_runner/test_data/wrong_linker - pkgs/hooks_runner/test_data/wrong_namespace_asset - # - pkgs/jni # TODO - # - pkgs/jni/example # TODO - # - pkgs/jnigen # TODO - # - pkgs/jnigen/android_test_runner # TODO - # - pkgs/jnigen/example/in_app_java # TODO + # - pkgs/jni # TODO + # - pkgs/jni/example # TODO + # - pkgs/jnigen # TODO + # - pkgs/jnigen/android_test_runner # TODO + # - pkgs/jnigen/example/in_app_java # TODO # - pkgs/jnigen/example/kotlin_plugin # TODO - # - pkgs/jnigen/example/kotlin_plugin/example # TODO - # - pkgs/jnigen/example/notification_plugin # TODO - # - pkgs/jnigen/example/notification_plugin/example # TODO - # - pkgs/jnigen/example/pdfbox_plugin # TODO - # - pkgs/jnigen/example/pdfbox_plugin/dart_example # TODO - # - pkgs/jnigen/example/pdfbox_plugin/example # TODO + # - pkgs/jnigen/example/kotlin_plugin/example # TODO + # - pkgs/jnigen/example/notification_plugin # TODO + # - pkgs/jnigen/example/notification_plugin/example # TODO + # - pkgs/jnigen/example/pdfbox_plugin # TODO + # - pkgs/jnigen/example/pdfbox_plugin/dart_example # TODO + # - pkgs/jnigen/example/pdfbox_plugin/example # TODO - pkgs/json_syntax_generator - # - pkgs/native_doc_dartifier # TODO + # - pkgs/native_doc_dartifier # TODO - pkgs/native_test_helpers - pkgs/native_toolchain_c - pkgs/objective_c - pkgs/objective_c/example/command_line - # - pkgs/objective_c/example/flutter_app # Requires Flutter. + # - pkgs/objective_c/example/flutter_app # Requires Flutter. - pkgs/pub_formats - pkgs/record_use - pkgs/record_use/test_data/drop_data_asset - pkgs/record_use/test_data/drop_dylib_recording - pkgs/repo_lint_rules - # - pkgs/swift2objc # TODO - # - pkgs/swiftgen # TODO - # - pkgs/swiftgen/example # TODO + # - pkgs/swift2objc # TODO + # - pkgs/swiftgen # TODO + # - pkgs/swiftgen/example # TODO # Hook user-defines are specified in the pub workspace. hooks: From 68af028064493a4ff352cc2bda77147903ecf39e Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 28 Nov 2025 15:32:14 +0100 Subject: [PATCH 09/10] fix deps --- .github/workflows/native.yaml | 14 ++++---------- pkgs/code_assets/pubspec.yaml | 2 +- pkgs/data_assets/pubspec.yaml | 2 +- pkgs/hooks/pubspec.yaml | 2 +- pkgs/hooks_runner/pubspec.yaml | 2 +- pkgs/json_syntax_generator/pubspec.yaml | 2 +- pkgs/native_toolchain_c/pubspec.yaml | 2 +- .../lib/src/avoid_import_outside_src_rule.dart | 2 +- pkgs/repo_lint_rules/pubspec.yaml | 6 +++--- 9 files changed, 14 insertions(+), 20 deletions(-) diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml index c4d08a421f..348ea14dec 100644 --- a/.github/workflows/native.yaml +++ b/.github/workflows/native.yaml @@ -12,8 +12,8 @@ on: - ".github/workflows/native.yaml" - "pkgs/code_assets/**" - "pkgs/data_assets/**" - - 'pkgs/ffi/**' - - 'pkgs/ffigen/**' + - "pkgs/ffi/**" + - "pkgs/ffigen/**" - "pkgs/hooks/**" - "pkgs/hooks_runner/**" - "pkgs/json_syntax_generator/**" @@ -30,8 +30,8 @@ on: - ".github/workflows/native.yaml" - "pkgs/code_assets/**" - "pkgs/data_assets/**" - - 'pkgs/ffi/**' - - 'pkgs/ffigen/**' + - "pkgs/ffi/**" + - "pkgs/ffigen/**" - "pkgs/hooks/**" - "pkgs/hooks_runner/**" - "pkgs/json_syntax_generator/**" @@ -80,14 +80,8 @@ jobs: - name: Build test dylib and bindings run: dart --enable-asserts pkgs/ffigen/test/setup.dart - - name: Run pub get, analysis, formatting, generators, and tests. - # Don't run examples on stable, the experiment is not available on stable. - run: dart tool/ci.dart --all --no-example - if: ${{ matrix.sdk == 'stable' }} - - name: Run pub get, analysis, formatting, generators, tests, and examples. run: dart tool/ci.dart --all - if: ${{ matrix.sdk != 'stable' }} - name: Upload coverage uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e diff --git a/pkgs/code_assets/pubspec.yaml b/pkgs/code_assets/pubspec.yaml index 073baa6dea..d7c686c34c 100644 --- a/pkgs/code_assets/pubspec.yaml +++ b/pkgs/code_assets/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: hooks: ^1.0.0 dev_dependencies: - custom_lint: ^0.7.5 + custom_lint: ^0.8.1 dart_flutter_team_lints: ^3.5.2 json_schema: ^5.2.0 # May only be used in tool/ and test/json_schema/. native_test_helpers: diff --git a/pkgs/data_assets/pubspec.yaml b/pkgs/data_assets/pubspec.yaml index 8738386860..3bb42d2024 100644 --- a/pkgs/data_assets/pubspec.yaml +++ b/pkgs/data_assets/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: hooks: ^1.0.0 dev_dependencies: - custom_lint: ^0.7.5 + custom_lint: ^0.8.1 dart_flutter_team_lints: ^3.5.2 json_schema: ^5.2.0 # May only be used in tool/ and test/json_schema/. native_test_helpers: diff --git a/pkgs/hooks/pubspec.yaml b/pkgs/hooks/pubspec.yaml index fbda872693..38297a7b31 100644 --- a/pkgs/hooks/pubspec.yaml +++ b/pkgs/hooks/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: dev_dependencies: args: ^2.6.0 code_assets: ^1.0.0 # Used for running tests with real asset types. - custom_lint: ^0.7.5 + custom_lint: ^0.8.1 dart_flutter_team_lints: ^3.5.2 data_assets: any # Used for running tests with real asset types. file_testing: ^3.0.2 diff --git a/pkgs/hooks_runner/pubspec.yaml b/pkgs/hooks_runner/pubspec.yaml index 7f113d1647..cb7143deea 100644 --- a/pkgs/hooks_runner/pubspec.yaml +++ b/pkgs/hooks_runner/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: dev_dependencies: args: any - custom_lint: ^0.7.5 + custom_lint: ^0.8.1 dart_flutter_team_lints: ^3.5.2 data_assets: any # Used in tests. file_testing: ^3.0.2 diff --git a/pkgs/json_syntax_generator/pubspec.yaml b/pkgs/json_syntax_generator/pubspec.yaml index 7a9a8effc2..5d25c73125 100644 --- a/pkgs/json_syntax_generator/pubspec.yaml +++ b/pkgs/json_syntax_generator/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: json_schema: ^5.2.0 dev_dependencies: - custom_lint: ^0.7.5 + custom_lint: ^0.8.1 dart_flutter_team_lints: ^3.5.2 native_test_helpers: path: ../native_test_helpers/ diff --git a/pkgs/native_toolchain_c/pubspec.yaml b/pkgs/native_toolchain_c/pubspec.yaml index 1a3e16f778..dac6b76583 100644 --- a/pkgs/native_toolchain_c/pubspec.yaml +++ b/pkgs/native_toolchain_c/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: dev_dependencies: collection: ^1.19.1 - custom_lint: ^0.7.5 + custom_lint: ^0.8.1 dart_flutter_team_lints: ^3.5.2 native_test_helpers: path: ../native_test_helpers/ diff --git a/pkgs/repo_lint_rules/lib/src/avoid_import_outside_src_rule.dart b/pkgs/repo_lint_rules/lib/src/avoid_import_outside_src_rule.dart index 6af5bd3aa4..d99dc71c1e 100644 --- a/pkgs/repo_lint_rules/lib/src/avoid_import_outside_src_rule.dart +++ b/pkgs/repo_lint_rules/lib/src/avoid_import_outside_src_rule.dart @@ -20,7 +20,7 @@ class AvoidImportOutsideSrcRule extends DartLintRule { @override void run( CustomLintResolver resolver, - ErrorReporter reporter, + DiagnosticReporter reporter, CustomLintContext context, ) { context.registry.addImportDirective((node) { diff --git a/pkgs/repo_lint_rules/pubspec.yaml b/pkgs/repo_lint_rules/pubspec.yaml index f881794329..74547cbc5c 100644 --- a/pkgs/repo_lint_rules/pubspec.yaml +++ b/pkgs/repo_lint_rules/pubspec.yaml @@ -10,10 +10,10 @@ environment: sdk: '>=3.9.0 <4.0.0' dependencies: - analyzer: ^7.3.0 - custom_lint_builder: ^0.7.5 + analyzer: ^8.4.0 + custom_lint_builder: ^0.8.1 dart_flutter_team_lints: ^3.5.2 path: ^1.9.1 dev_dependencies: - custom_lint: ^0.7.5 + custom_lint: ^0.8.1 From 8c631bac4c3c8edd3c5c287ee6cf2cee0fbe11b3 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Mon, 1 Dec 2025 12:43:29 +0100 Subject: [PATCH 10/10] bump ffigen --- pkgs/code_assets/example/host_name/pubspec.yaml | 2 +- pkgs/code_assets/example/mini_audio/pubspec.yaml | 2 +- pkgs/code_assets/example/sqlite/pubspec.yaml | 2 +- pkgs/code_assets/example/sqlite_prebuilt/pubspec.yaml | 2 +- pkgs/code_assets/example/stb_image/pubspec.yaml | 2 +- pkgs/ffigen/example/objective_c/pubspec.yaml | 2 +- pkgs/ffigen/example/swift/pubspec.yaml | 2 +- pkgs/hooks/example/build/download_asset/pubspec.yaml | 2 +- pkgs/hooks/example/build/local_asset/pubspec.yaml | 2 +- pkgs/hooks/example/build/native_add_library/pubspec.yaml | 2 +- pkgs/hooks/example/build/native_dynamic_linking/pubspec.yaml | 2 +- pkgs/hooks/example/build/system_library/pubspec.yaml | 2 +- pkgs/hooks/example/build/use_dart_api/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/depend_on_fail_build/pubspec.yaml | 2 +- .../test_data/depend_on_fail_build_app/pubspec.yaml | 2 +- .../test_data/dev_dependency_with_hook/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/fail_build/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/fail_on_os_sdk_version/pubspec.yaml | 2 +- .../test_data/fail_on_os_sdk_version_link/pubspec.yaml | 2 +- .../test_data/fail_on_os_sdk_version_linker/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/infra_failure/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/native_add/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/native_add_add_source/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/native_add_duplicate/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/native_dynamic_linking/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/native_subtract/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/no_hook/pubspec.yaml | 2 +- .../test_data/reusable_dynamic_library/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/reuse_dynamic_library/pubspec.yaml | 2 +- pkgs/hooks_runner/test_data/system_library/pubspec.yaml | 2 +- .../hooks_runner/test_data/treeshaking_native_libs/pubspec.yaml | 2 +- pkgs/objective_c/pubspec.yaml | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/code_assets/example/host_name/pubspec.yaml b/pkgs/code_assets/example/host_name/pubspec.yaml index 2049028aa1..845ec8f62c 100644 --- a/pkgs/code_assets/example/host_name/pubspec.yaml +++ b/pkgs/code_assets/example/host_name/pubspec.yaml @@ -16,5 +16,5 @@ dependencies: hooks: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip test: ^1.25.15 diff --git a/pkgs/code_assets/example/mini_audio/pubspec.yaml b/pkgs/code_assets/example/mini_audio/pubspec.yaml index 8c058b847c..e72a62083e 100644 --- a/pkgs/code_assets/example/mini_audio/pubspec.yaml +++ b/pkgs/code_assets/example/mini_audio/pubspec.yaml @@ -17,5 +17,5 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip test: ^1.25.15 diff --git a/pkgs/code_assets/example/sqlite/pubspec.yaml b/pkgs/code_assets/example/sqlite/pubspec.yaml index 3506825e27..f686e37290 100644 --- a/pkgs/code_assets/example/sqlite/pubspec.yaml +++ b/pkgs/code_assets/example/sqlite/pubspec.yaml @@ -17,5 +17,5 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip test: ^1.25.15 diff --git a/pkgs/code_assets/example/sqlite_prebuilt/pubspec.yaml b/pkgs/code_assets/example/sqlite_prebuilt/pubspec.yaml index d75505496e..a874197f7d 100644 --- a/pkgs/code_assets/example/sqlite_prebuilt/pubspec.yaml +++ b/pkgs/code_assets/example/sqlite_prebuilt/pubspec.yaml @@ -19,5 +19,5 @@ dependencies: pointycastle: ^4.0.0 dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip test: ^1.25.15 diff --git a/pkgs/code_assets/example/stb_image/pubspec.yaml b/pkgs/code_assets/example/stb_image/pubspec.yaml index 31ae8aff8a..1af39cf63e 100644 --- a/pkgs/code_assets/example/stb_image/pubspec.yaml +++ b/pkgs/code_assets/example/stb_image/pubspec.yaml @@ -22,5 +22,5 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip test: ^1.25.15 diff --git a/pkgs/ffigen/example/objective_c/pubspec.yaml b/pkgs/ffigen/example/objective_c/pubspec.yaml index 86bd9c051f..a9c5d99bee 100644 --- a/pkgs/ffigen/example/objective_c/pubspec.yaml +++ b/pkgs/ffigen/example/objective_c/pubspec.yaml @@ -17,4 +17,4 @@ dependencies: dev_dependencies: dart_flutter_team_lints: ^3.5.2 - ffigen: ^20.1.1 + ffigen: ^21.0.0-wip diff --git a/pkgs/ffigen/example/swift/pubspec.yaml b/pkgs/ffigen/example/swift/pubspec.yaml index e8d811e175..96adedaa8e 100644 --- a/pkgs/ffigen/example/swift/pubspec.yaml +++ b/pkgs/ffigen/example/swift/pubspec.yaml @@ -16,4 +16,4 @@ dependencies: dev_dependencies: dart_flutter_team_lints: ^3.5.2 - ffigen: ^20.1.1 + ffigen: ^21.0.0-wip diff --git a/pkgs/hooks/example/build/download_asset/pubspec.yaml b/pkgs/hooks/example/build/download_asset/pubspec.yaml index 85ccb935be..f302d8e691 100644 --- a/pkgs/hooks/example/build/download_asset/pubspec.yaml +++ b/pkgs/hooks/example/build/download_asset/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: dev_dependencies: args: ^2.6.0 - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks/example/build/local_asset/pubspec.yaml b/pkgs/hooks/example/build/local_asset/pubspec.yaml index 74c118b4c4..a6503be0d0 100644 --- a/pkgs/hooks/example/build/local_asset/pubspec.yaml +++ b/pkgs/hooks/example/build/local_asset/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: logging: ^1.3.0 dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip file_testing: ^3.0.2 lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks/example/build/native_add_library/pubspec.yaml b/pkgs/hooks/example/build/native_add_library/pubspec.yaml index 2ac0ac53e7..533ea36e1e 100644 --- a/pkgs/hooks/example/build/native_add_library/pubspec.yaml +++ b/pkgs/hooks/example/build/native_add_library/pubspec.yaml @@ -17,6 +17,6 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks/example/build/native_dynamic_linking/pubspec.yaml b/pkgs/hooks/example/build/native_dynamic_linking/pubspec.yaml index d80e727522..ff2932a61e 100644 --- a/pkgs/hooks/example/build/native_dynamic_linking/pubspec.yaml +++ b/pkgs/hooks/example/build/native_dynamic_linking/pubspec.yaml @@ -17,6 +17,6 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks/example/build/system_library/pubspec.yaml b/pkgs/hooks/example/build/system_library/pubspec.yaml index 98796805d6..5dd1994a3a 100644 --- a/pkgs/hooks/example/build/system_library/pubspec.yaml +++ b/pkgs/hooks/example/build/system_library/pubspec.yaml @@ -16,6 +16,6 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks/example/build/use_dart_api/pubspec.yaml b/pkgs/hooks/example/build/use_dart_api/pubspec.yaml index 378cac101b..af841dbbb1 100644 --- a/pkgs/hooks/example/build/use_dart_api/pubspec.yaml +++ b/pkgs/hooks/example/build/use_dart_api/pubspec.yaml @@ -16,6 +16,6 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks_runner/test_data/depend_on_fail_build/pubspec.yaml b/pkgs/hooks_runner/test_data/depend_on_fail_build/pubspec.yaml index 416798e037..b7132592f4 100644 --- a/pkgs/hooks_runner/test_data/depend_on_fail_build/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/depend_on_fail_build/pubspec.yaml @@ -15,6 +15,6 @@ dependencies: hooks: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks_runner/test_data/depend_on_fail_build_app/pubspec.yaml b/pkgs/hooks_runner/test_data/depend_on_fail_build_app/pubspec.yaml index db953a34ac..7b89cdeda6 100644 --- a/pkgs/hooks_runner/test_data/depend_on_fail_build_app/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/depend_on_fail_build_app/pubspec.yaml @@ -15,6 +15,6 @@ dependencies: hooks: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks_runner/test_data/dev_dependency_with_hook/pubspec.yaml b/pkgs/hooks_runner/test_data/dev_dependency_with_hook/pubspec.yaml index 67743f8913..ea091abc0e 100644 --- a/pkgs/hooks_runner/test_data/dev_dependency_with_hook/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/dev_dependency_with_hook/pubspec.yaml @@ -12,7 +12,7 @@ environment: dependencies: {} dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 native_add: path: ../native_add/ diff --git a/pkgs/hooks_runner/test_data/fail_build/pubspec.yaml b/pkgs/hooks_runner/test_data/fail_build/pubspec.yaml index 5c4884fa41..f853b8ffe2 100644 --- a/pkgs/hooks_runner/test_data/fail_build/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/fail_build/pubspec.yaml @@ -14,6 +14,6 @@ dependencies: hooks: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks_runner/test_data/fail_on_os_sdk_version/pubspec.yaml b/pkgs/hooks_runner/test_data/fail_on_os_sdk_version/pubspec.yaml index 421e8271ac..77c33ccc77 100644 --- a/pkgs/hooks_runner/test_data/fail_on_os_sdk_version/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/fail_on_os_sdk_version/pubspec.yaml @@ -14,6 +14,6 @@ dependencies: hooks: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks_runner/test_data/fail_on_os_sdk_version_link/pubspec.yaml b/pkgs/hooks_runner/test_data/fail_on_os_sdk_version_link/pubspec.yaml index 5440197d39..bb3dce1453 100644 --- a/pkgs/hooks_runner/test_data/fail_on_os_sdk_version_link/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/fail_on_os_sdk_version_link/pubspec.yaml @@ -16,6 +16,6 @@ dependencies: hooks: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks_runner/test_data/fail_on_os_sdk_version_linker/pubspec.yaml b/pkgs/hooks_runner/test_data/fail_on_os_sdk_version_linker/pubspec.yaml index 2889f4ba7a..9d02c7fb88 100644 --- a/pkgs/hooks_runner/test_data/fail_on_os_sdk_version_linker/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/fail_on_os_sdk_version_linker/pubspec.yaml @@ -14,6 +14,6 @@ dependencies: hooks: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks_runner/test_data/infra_failure/pubspec.yaml b/pkgs/hooks_runner/test_data/infra_failure/pubspec.yaml index 682d2b39ff..809d42c619 100644 --- a/pkgs/hooks_runner/test_data/infra_failure/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/infra_failure/pubspec.yaml @@ -14,6 +14,6 @@ dependencies: hooks: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks_runner/test_data/native_add/pubspec.yaml b/pkgs/hooks_runner/test_data/native_add/pubspec.yaml index ed9ae66f88..458fe5e6d3 100644 --- a/pkgs/hooks_runner/test_data/native_add/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/native_add/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 some_dev_dep: path: ../some_dev_dep/ diff --git a/pkgs/hooks_runner/test_data/native_add_add_source/pubspec.yaml b/pkgs/hooks_runner/test_data/native_add_add_source/pubspec.yaml index 652ec1f0e5..55bdd2c7e0 100644 --- a/pkgs/hooks_runner/test_data/native_add_add_source/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/native_add_add_source/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 some_dev_dep: path: ../some_dev_dep/ diff --git a/pkgs/hooks_runner/test_data/native_add_duplicate/pubspec.yaml b/pkgs/hooks_runner/test_data/native_add_duplicate/pubspec.yaml index 4e6665aebc..a031df62da 100644 --- a/pkgs/hooks_runner/test_data/native_add_duplicate/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/native_add_duplicate/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 some_dev_dep: path: ../some_dev_dep/ diff --git a/pkgs/hooks_runner/test_data/native_dynamic_linking/pubspec.yaml b/pkgs/hooks_runner/test_data/native_dynamic_linking/pubspec.yaml index b499b626f3..e443e42dd0 100644 --- a/pkgs/hooks_runner/test_data/native_dynamic_linking/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/native_dynamic_linking/pubspec.yaml @@ -17,6 +17,6 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks_runner/test_data/native_subtract/pubspec.yaml b/pkgs/hooks_runner/test_data/native_subtract/pubspec.yaml index 445648db15..891828f042 100644 --- a/pkgs/hooks_runner/test_data/native_subtract/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/native_subtract/pubspec.yaml @@ -16,6 +16,6 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks_runner/test_data/no_hook/pubspec.yaml b/pkgs/hooks_runner/test_data/no_hook/pubspec.yaml index 1584324d10..eb7366524b 100644 --- a/pkgs/hooks_runner/test_data/no_hook/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/no_hook/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 some_dev_dep: path: ../some_dev_dep/ diff --git a/pkgs/hooks_runner/test_data/reusable_dynamic_library/pubspec.yaml b/pkgs/hooks_runner/test_data/reusable_dynamic_library/pubspec.yaml index 84c65fef28..2877e6d347 100644 --- a/pkgs/hooks_runner/test_data/reusable_dynamic_library/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/reusable_dynamic_library/pubspec.yaml @@ -18,6 +18,6 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.21.0 diff --git a/pkgs/hooks_runner/test_data/reuse_dynamic_library/pubspec.yaml b/pkgs/hooks_runner/test_data/reuse_dynamic_library/pubspec.yaml index e482e4da68..a77f936d5b 100644 --- a/pkgs/hooks_runner/test_data/reuse_dynamic_library/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/reuse_dynamic_library/pubspec.yaml @@ -19,6 +19,6 @@ dependencies: path: ../reusable_dynamic_library/ dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.21.0 diff --git a/pkgs/hooks_runner/test_data/system_library/pubspec.yaml b/pkgs/hooks_runner/test_data/system_library/pubspec.yaml index 74c933cabf..2b478e0457 100644 --- a/pkgs/hooks_runner/test_data/system_library/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/system_library/pubspec.yaml @@ -16,6 +16,6 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 test: ^1.25.15 diff --git a/pkgs/hooks_runner/test_data/treeshaking_native_libs/pubspec.yaml b/pkgs/hooks_runner/test_data/treeshaking_native_libs/pubspec.yaml index ff992fc648..1f21a43862 100644 --- a/pkgs/hooks_runner/test_data/treeshaking_native_libs/pubspec.yaml +++ b/pkgs/hooks_runner/test_data/treeshaking_native_libs/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: native_toolchain_c: any dev_dependencies: - ffigen: ^20.0.0-dev.1 + ffigen: ^21.0.0-wip lints: ^6.0.0 some_dev_dep: path: ../some_dev_dep/ diff --git a/pkgs/objective_c/pubspec.yaml b/pkgs/objective_c/pubspec.yaml index 47ef4cdc58..8de318b4bb 100644 --- a/pkgs/objective_c/pubspec.yaml +++ b/pkgs/objective_c/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: dev_dependencies: args: ^2.6.0 dart_flutter_team_lints: ^3.5.2 - ffigen: ^20.1.1 + ffigen: ^21.0.0-wip native_test_helpers: path: ../native_test_helpers/ path: ^1.9.0