update native_toolcain_conan

rainyl · Apr 21, 2024 · 73321d0 · 73321d0
1 parent f42685d
commit 73321d0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/build_test_native_assets.yaml b/.github/workflows/build_test_native_assets.yaml
@@ -4,7 +4,7 @@ on:
   push:
     branches: ["native-assets"]
     tags:
-      - "v*.*.*"
+      - "v2.*.*"
   pull_request:
     branches: ["native-assets"]
 
@@ -126,6 +126,7 @@ jobs:
       - name: setup
         run: |
           brew install --force --overwrite ninja ccache ffmpeg@6 nasm conan
+          brew link --overwrite ffmpeg@6
           conan profile detect -f
           cd ${{github.workspace}}
       - uses: subosito/flutter-action@v2
@@ -154,6 +155,7 @@ jobs:
         run: |
           # brew update
           brew install --force --overwrite ninja ccache ffmpeg@6 nasm conan
+          brew link --overwrite ffmpeg@6
           conan profile detect -f
           cd ${{github.workspace}}
       - uses: subosito/flutter-action@v2
@@ -181,6 +183,7 @@ jobs:
         - name: setup
           run: |
             brew install --force --overwrite ninja ccache ffmpeg@6 nasm conan
+            brew link --overwrite ffmpeg@6
             conan profile detect -f
             cd ${{github.workspace}}
         - name: Set up Flutter

diff --git a/analysis_options.yaml b/analysis_options.yaml
diff --git a/hook/native_toolchain_conan.dart b/hook/native_toolchain_conan.dart
@@ -14,9 +14,6 @@ abstract class Builder {
 }
 
 class ConanBuilder implements Builder {
-  /// What kind of artifact to build.
-  final _BuilderType _type;
-
   /// Name of the library or executable to build.
   ///
   /// The filename will be decided by [BuildConfig.targetOS] and
@@ -66,7 +63,7 @@ class ConanBuilder implements Builder {
     this.defines = const {},
     this.dartBuildFiles = const [],
     this.std,
-  }) : _type = _BuilderType.library;
+  });
 
   @override
   Future<void> run({
@@ -349,8 +346,3 @@ exitCode: $exitCode
 stdout: $stdout
 stderr: $stderr''';
 }
-
-enum _BuilderType {
-  executable,
-  library,
-}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -7,15 +7,14 @@ environment:
   sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
-  ffi: ^2.1.0
+  ffi: ^2.1.2
   equatable: ^2.0.5
   path: ^1.9.0
   native_assets_cli: ^0.5.4
   logging: ^1.2.0
 
 dev_dependencies:
   ffigen: ^11.0.0
-  flutter_lints: ^3.0.1
   test: ^1.25.2
 
 topics: