[ffigen][ffi][objective_c] add to workspace

goderbauer · goderbauer · commit 3950db07e1b4 · 2025-11-28T11:30:34.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
