Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
73 changes: 0 additions & 73 deletions .github/workflows/ffi.yaml

This file was deleted.

21 changes: 14 additions & 7 deletions .github/workflows/native.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@ on:
- ".github/workflows/native.yaml"
- "pkgs/code_assets/**"
- "pkgs/data_assets/**"
- "pkgs/hooks_runner/**"
- "pkgs/ffi/**"
- "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:
Expand All @@ -25,11 +30,16 @@ on:
- ".github/workflows/native.yaml"
- "pkgs/code_assets/**"
- "pkgs/data_assets/**"
- "pkgs/hooks_runner/**"
- "pkgs/ffi/**"
- "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:
Expand Down Expand Up @@ -67,14 +77,11 @@ jobs:

- run: dart pub get

- 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: Build test dylib and bindings
run: dart --enable-asserts pkgs/ffigen/test/setup.dart

- 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@648a8eb78e6d50909eff900e4ec85cab4524a45b
Expand Down
5 changes: 5 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
analyzer:
exclude:
# The following packages require Flutter and therefore cannot be analyzed as
# part of `dart analyze` for the workspace.
- pkgs/objective_c/example/flutter_app
2 changes: 1 addition & 1 deletion pkgs/code_assets/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pkgs/data_assets/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions pkgs/ffi/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ topics:
- ffi
- codegen

resolution: workspace

environment:
sdk: '>=3.7.0 <4.0.0'

Expand Down
2 changes: 2 additions & 0 deletions pkgs/ffigen/example/add/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 2 additions & 0 deletions pkgs/ffigen/example/c_json/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

name: c_json_example

resolution: workspace

environment:
sdk: '>=3.8.0 <4.0.0'

Expand Down
2 changes: 2 additions & 0 deletions pkgs/ffigen/example/ffinative/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

name: ffinative_example

resolution: workspace

environment:
sdk: '>=3.8.0 <4.0.0'

Expand Down
2 changes: 2 additions & 0 deletions pkgs/ffigen/example/libclang-example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

name: libclang_example

resolution: workspace

environment:
sdk: '>=3.8.0 <4.0.0'

Expand Down
11 changes: 4 additions & 7 deletions pkgs/ffigen/example/objective_c/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,17 @@

name: objective_c_example

resolution: workspace

environment:
sdk: '>=3.8.0 <4.0.0'

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
ffigen:
path: ../../

dependency_overrides:
objective_c:
path: ../../../objective_c/
ffigen: ^20.1.1
2 changes: 2 additions & 0 deletions pkgs/ffigen/example/shared_bindings/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

name: shared_bindings

resolution: workspace

environment:
sdk: '>=3.8.0 <4.0.0'

Expand Down
2 changes: 2 additions & 0 deletions pkgs/ffigen/example/simple/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

name: simple_example

resolution: workspace

environment:
sdk: '>=3.8.0 <4.0.0'

Expand Down
11 changes: 4 additions & 7 deletions pkgs/ffigen/example/swift/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@

name: swift_example

resolution: workspace

environment:
sdk: '>=3.8.0 <4.0.0'

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
ffigen:
path: ../../

dependency_overrides:
objective_c:
path: ../../../objective_c/
ffigen: ^20.1.1
16 changes: 4 additions & 12 deletions pkgs/ffigen/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ topics:
- ffi
- codegen

resolution: workspace

environment:
sdk: '>=3.8.0 <4.0.0'

Expand All @@ -39,16 +41,6 @@ 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:
code_assets:
path: ../code_assets
hooks:
path: ../hooks
native_toolchain_c:
path: ../native_toolchain_c
objective_c:
path: ../objective_c
2 changes: 1 addition & 1 deletion pkgs/hooks/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/hooks_runner/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/json_syntax_generator/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion pkgs/native_toolchain_c/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 3 additions & 1 deletion pkgs/objective_c/example/command_line/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -11,5 +13,5 @@ dependencies:
path: ../..

dev_dependencies:
lints: ^5.0.0
lints: ^6.0.0
test: ^1.27.0
20 changes: 6 additions & 14 deletions pkgs/objective_c/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,26 @@ topics:
- objective-c
- codegen

resolution: workspace

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
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class AvoidImportOutsideSrcRule extends DartLintRule {
@override
void run(
CustomLintResolver resolver,
ErrorReporter reporter,
DiagnosticReporter reporter,
CustomLintContext context,
) {
context.registry.addImportDirective((node) {
Expand Down
Loading
Loading