Merge branch 'main' into add-add-package-licenses-and-symlinks-to-lic…

…ense-file
VOICEVOX · Dec 4, 2024 · 33facdf · 33facdf
2 parents cee3821 + 579d52c
commit 33facdf
Show file tree

Hide file tree

Showing 13 changed files with 7,159 additions and 16,203 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,8 +17,8 @@ jobs:
         include:
           - os: windows-2019
           - os: windows-2022
-          - os: macos-11
-          - os: macos-12
+          - os: macos-13
+          - os: macos-14
           - os: ubuntu-20.04
           - os: ubuntu-22.04
     runs-on: ${{ matrix.os }}

diff --git a/crates/open_jtalk-sys/Cargo.toml b/crates/open_jtalk-sys/Cargo.toml
@@ -10,7 +10,7 @@ generate-bindings = []
 
 [build-dependencies]
 cmake = "0.1.48"
-bindgen = "0.62.0"
+bindgen = "0.70.1"
 
 [dependencies]
 link-cplusplus = "1.0.6"
diff --git a/crates/open_jtalk-sys/build.rs b/crates/open_jtalk-sys/build.rs
@@ -92,9 +92,9 @@ fn generate_bindings(
         .header("wrapper.hpp")
         .allowlist_recursively(true)
         .clang_args(clang_args)
-        .parse_callbacks(Box::new(bindgen::CargoCallbacks))
+        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
         .size_t_is_usize(true)
-        .rustfmt_bindings(true)
+        .formatter(bindgen::Formatter::Prettyplease)
         .rustified_enum(".*");
     let paths = std::fs::read_dir(include_dir).unwrap();
     for path in paths {