[objective_c] Migrate to native assets (#2329)

Author: liamappelbe

.github/workflows/ffigen.yml

@@ -10,7 +10,7 @@ on:
       - 'pkgs/ffigen/**'
       - 'pkgs/objective_c/**'
   pull_request:
-    branches: [main, stable]
+    branches: [main]
     paths:
       - '.github/workflows/ffigen.yml'
       - 'pkgs/ffigen/**'
@@ -34,17 +34,17 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
         with:
-          channel: 'stable'
+          channel: stable
       - id: install
         name: Install dependencies
-        run: flutter pub get && flutter pub get --directory="example/shared_bindings" && flutter pub get --directory="../objective_c" && flutter pub get --directory="example/add"
+        run: dart pub get && dart pub get --directory="example/shared_bindings" && dart pub get --directory="../objective_c" && dart pub get --directory="example/add"
       - name: Check formatting
         run: dart format --output=none --set-exit-if-changed .
         if: always() && steps.install.outcome == 'success'
       - name: Build test dylib and bindings
         run: dart --enable-asserts test/setup.dart
       - name: Analyze code
-        run: flutter analyze --fatal-infos
+        run: dart analyze --fatal-infos
 
   test-linux:
     needs: analyze
@@ -56,9 +56,9 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
         with:
-          channel: 'stable'
+          channel: stable
       - name: Install dependencies
-        run: flutter pub get && flutter pub get --directory="../jni"
+        run: dart pub get && flutter pub get --directory="../jni"
       - name: Install libclang-14-dev
         run: sudo apt-get install libclang-14-dev
       - name: Build test dylib and bindings
@@ -82,7 +82,7 @@ jobs:
         with:
           channel: stable
       - name: Install dependencies
-        run: flutter pub get && flutter pub get --directory="../objective_c" && flutter pub get --directory="../jni"
+        run: dart pub get && dart pub get --directory="../objective_c" && flutter pub get --directory="../jni"
       - name: Install clang-format
         uses: ConorMacBride/install-package@3e7ad059e07782ee54fa35f827df52aae0626f30
         with:
@@ -92,7 +92,7 @@ jobs:
       - name: Install coverage
         run: dart pub global activate coverage
       - name: Run VM tests and collect coverage
-        run: dart pub global run coverage:test_with_coverage --scope-output=ffigen --scope-output=objective_c
+        run: dart test --coverage-path=./coverage/lcov.info
       - name: Generate package:jni bindings
         run: dart --enable-asserts run tool/generate_ffi_bindings.dart
         working-directory: pkgs/jni/
@@ -120,16 +120,16 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
         with:
-          channel: master
+          channel: stable
       - name: Install dependencies
-        run: flutter pub get && flutter pub get --directory="../objective_c" && flutter pub get --directory="../jni"
+        run: dart pub get && dart pub get --directory="../objective_c" && flutter pub get --directory="../jni"
       - name: Install clang-format
         uses: ConorMacBride/install-package@3e7ad059e07782ee54fa35f827df52aae0626f30
         with:
           brew: clang-format
       - name: Build test dylib and bindings
         run: dart --enable-asserts test/setup.dart
-      - name: Run VM tests and collect coverage
+      - name: Run VM tests
         run: dart test
 
   test-mac-flutter:
@@ -142,13 +142,13 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
         with:
-          channel: 'stable'
+          channel: stable
       - name: Install dependencies
-        run: flutter pub get && flutter pub get --directory="../objective_c"
+        run: dart pub get && dart pub get --directory="../objective_c"
       - name: Build test dylib and bindings
-        run: dart --enable-asserts test/setup.dart --main-thread-dispatcher
+        run: dart --enable-asserts test/setup.dart
       - name: Run Flutter tests
-        run: flutter test
+        run: dart test
 
   test-windows:
     needs: analyze
@@ -160,9 +160,9 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
         with:
-          channel: 'stable'
+          channel: stable
       - name: Install dependencies
-        run: flutter pub get && flutter pub get --directory="../jni"
+        run: dart pub get && flutter pub get --directory="../jni"
       - name: Build test dylib and bindings
         run: dart --enable-asserts test/setup.dart
       - name: Run VM tests
@@ -191,7 +191,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
         with:
-          channel: "master"
+          channel: stable
       - name: Install dependencies
         run: flutter pub get
       - name: Build test dylib and bindings

.github/workflows/ffigen_weekly.yml

@@ -6,11 +6,11 @@ name: ffigen_weekly
 on:
   # Run once a week.
   push:
-    branches: [main, stable]
+    branches: [main]
     paths:
       - '.github/workflows/ffigen_weekly.yml'
   pull_request:
-    branches: [main, stable]
+    branches: [main]
     paths:
       - '.github/workflows/ffigen_weekly.yml'
   schedule:
@@ -30,17 +30,17 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
         with:
-          channel: 'stable'
+          channel: stable
       - name: Install dependencies
-        run: flutter pub get && flutter pub get --directory="../objective_c" && flutter pub get --directory="../jni"
+        run: dart pub get && dart pub get --directory="../objective_c" && flutter pub get --directory="../jni"
       - name: Install clang-format
         uses: ConorMacBride/install-package@3e7ad059e07782ee54fa35f827df52aae0626f30
         with:
           brew: clang-format
       - name: Build test dylib and bindings
-        run: dart --enable-asserts test/setup.dart --main-thread-dispatcher
+        run: dart --enable-asserts test/setup.dart
       - name: Run VM tests
-        run: flutter test
+        run: dart test
       - name: Generate package:jni bindings
         run: dart --enable-asserts run tool/generate_ffi_bindings.dart
         working-directory: pkgs/jni/

.github/workflows/objective_c.yaml

@@ -3,14 +3,14 @@ name: objective_c
 on:
   # Run on PRs and pushes to the default branch.
   push:
-    branches: [main, stable]
+    branches: [main]
     paths:
       - '.github/workflows/objective_c.yaml'
       - 'pkgs/ffigen/**'
       - 'pkgs/native_test_helpers/**'
       - 'pkgs/objective_c/**'
   pull_request:
-    branches: [main, stable]
+    branches: [main]
     paths:
       - '.github/workflows/objective_c.yaml'
       - 'pkgs/ffigen/**'
@@ -35,10 +35,10 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
         with:
-          channel: 'stable'
+          channel: stable
       - id: install
         name: Install dependencies
-        run: flutter pub get
+        run: flutter pub get && flutter pub get --directory="example/command_line" && flutter pub get --directory="example/flutter_app"
       - name: Check formatting
         run: dart format --output=none --set-exit-if-changed .
         if: always() && steps.install.outcome == 'success'
@@ -54,14 +54,11 @@ jobs:
         working-directory: pkgs/objective_c/
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
-      - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
+      - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          channel: 'beta'
+          sdk: stable
       - name: Install dependencies
-        run: flutter pub get
-      - name: Build test dylib
-        # TODO(https://github.com/dart-lang/native/issues/1068): Remove this.
-        run: dart --enable-asserts test/setup.dart
+        run: dart pub get
       - name: Install coverage
         run: dart pub global activate coverage
       - name: Run VM tests and collect coverage
@@ -84,20 +81,40 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
 
-  build-example:
+  build-flutter-example:
     needs: analyze
     runs-on: 'macos-latest'
     defaults:
       run:
-        working-directory: pkgs/objective_c/example/
+        working-directory: pkgs/objective_c/example/flutter_app
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
         with:
-          channel: 'stable'
+          channel: stable
       - name: Install dependencies
         run: flutter pub get
-      - name: Build the example app
+      - name: Build the example app for macos
         run: flutter build macos
+      - name: Build the example app for ios
+        run: flutter build ios --no-codesign
       - name: Check for xcode for analyzer warnings
         run: xcodebuild analyze -workspace macos/Runner.xcworkspace -scheme Runner -configuration Debug GCC_TREAT_WARNINGS_AS_ERRORS=YES
+
+  build-command-line-example:
+    needs: analyze
+    runs-on: 'macos-latest'
+    defaults:
+      run:
+        working-directory: pkgs/objective_c/example/command_line
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+      - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
+        with:
+          sdk: stable
+      - name: Install dependencies
+        run: dart pub get
+      - name: Run the example app
+        run: dart run lib/main.dart
+
+

.github/workflows/swift2objc.yaml

@@ -3,13 +3,13 @@ name: swift2objc
 on:
   # Run on PRs and pushes to the default branch.
   push:
-    branches: [main, stable]
+    branches: [main]
     paths:
       - '.github/workflows/swift2objc.yaml'
       - 'pkgs/native_test_helpers/**'
       - 'pkgs/swift2objc/**'
   pull_request:
-    branches: [main, stable]
+    branches: [main]
     paths:
       - '.github/workflows/swift2objc.yaml'
       - 'pkgs/native_test_helpers/**'

.github/workflows/swiftgen.yaml

@@ -3,7 +3,7 @@ name: swiftgen
 on:
   # Run on PRs and pushes to the default branch.
   push:
-    branches: [main, stable]
+    branches: [main]
     paths:
       - '.github/workflows/swiftgen.yaml'
       - 'pkgs/ffigen/**'
@@ -12,7 +12,7 @@ on:
       - 'pkgs/swift2objc/**'
       - 'pkgs/swiftgen/**'
   pull_request:
-    branches: [main, stable]
+    branches: [main]
     paths:
       - '.github/workflows/swiftgen.yaml'
       - 'pkgs/ffigen/**'
@@ -39,10 +39,10 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
         with:
-          channel: 'stable'
+          channel: master
       - id: install
         name: Install dependencies
-        run: flutter pub get
+        run: dart pub get && dart pub get --directory="example"
       - name: Check formatting
         run: dart format --output=none --set-exit-if-changed .
         if: always() && steps.install.outcome == 'success'
@@ -60,16 +60,9 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e
         with:
-          channel: 'stable'
+          channel: master
       - name: Install dependencies
-        run: flutter pub get
-      - name: Install ObjC dependencies
-        working-directory: pkgs/objective_c/
-        run: flutter pub get
-      - name: Build ObjC test dylib
-        working-directory: pkgs/objective_c/
-        # TODO(https://github.com/dart-lang/native/issues/1068): Remove this.
-        run: dart test/setup.dart
+        run: dart pub get
       - name: Install coverage
         run: dart pub global activate coverage
       - name: Run VM tests and collect coverage

.gitignore

@@ -94,6 +94,7 @@ doc/api/
 # Files generated by tests for debugging purposes.
 **/test/debug_generated/*
 coverage/
+**/temp/
 
 ## Downloaded files and build artifacts
 *.jar

pkgs/ffigen/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 20.1.1
+
+- Update tests and examples now that package:objective_c is using native assets.
+
 ## 20.1.0
 
 - Add `xcodeUri`, `iosSdkUri`, and `macSdkUri`, to mirror `xcodePath`,

pkgs/ffigen/example/objective_c/play_audio.dart

@@ -6,15 +6,12 @@ import 'dart:ffi';
 
 import 'package:objective_c/objective_c.dart';
 
-// TODO(https://github.com/dart-lang/native/issues/1068): Remove this.
-import '../../../objective_c/test/setup.dart' as objc_setup;
 import 'avf_audio_bindings.dart';
 
 const _dylibPath =
     '/System/Library/Frameworks/AVFAudio.framework/Versions/Current/AVFAudio';
 
 void main(List<String> args) async {
-  objc_setup.main([]);
   DynamicLibrary.open(_dylibPath);
   for (final file in args) {
     final fileStr = NSString(file);

pkgs/ffigen/example/swift/example.dart

@@ -6,13 +6,9 @@ import 'dart:ffi';
 
 import 'package:objective_c/objective_c.dart';
 
-// TODO(https://github.com/dart-lang/native/issues/1068): Remove this.
-import '../../../objective_c/test/setup.dart' as objc_setup;
 import 'swift_api_bindings.dart';
 
 void main() {
-  objc_setup.main([]);
-
   // TODO(https://github.com/dart-lang/ffigen/issues/443): Add a test for this.
   DynamicLibrary.open('libswiftapi.dylib');
   final object = SwiftClass();

pkgs/ffigen/lib/src/code_generator/objc_built_in_types.dart

@@ -141,12 +141,3 @@ const objCBuiltInCategories = {
   'NSNumberIsFloat',
   'NSStringExtensionMethods',
 };
-
-const objCBuiltInGlobals = {
-  'NSKeyValueChangeIndexesKey',
-  'NSKeyValueChangeKindKey',
-  'NSKeyValueChangeNewKey',
-  'NSKeyValueChangeNotificationIsPriorKey',
-  'NSKeyValueChangeOldKey',
-  'NSLocalizedDescriptionKey',
-};