Merge pull request #52 from AlexTMjugador/chore/updates

Assorted dependency updates
godotengine · Mar 24, 2024 · 0a151c8 · 0a151c8
2 parents c4168ca + c33d823
commit 0a151c8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 23 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -15,14 +15,14 @@ concurrency:
 
 jobs:
   build-windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install conan
         run: |
-          pip install --upgrade conan==1.58
+          pip install --upgrade conan==1.63.0
         shell: bash
 
       - name: Setup conan profile
@@ -102,7 +102,7 @@ jobs:
             FBX2glTF-windows-x86_64/FBX-SDK-License.rtf
 
       - name: FBX2glTF-windows-x86_64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: FBX2glTF-windows-x86_64
           path: FBX2glTF-windows-x86_64/*
@@ -111,11 +111,11 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install conan
         run: |
-          pip install --upgrade conan==1.58
+          pip install --upgrade conan==1.63.0
         shell: bash
 
       - name: Setup conan profile
@@ -192,25 +192,20 @@ jobs:
           files: FBX2glTF-linux-x86_64.zip
 
       - name: FBX2glTF-linux-x86_64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: FBX2glTF-linux-x86_64
           path: FBX2glTF-linux-x86_64/*
 
   build-macos:
-    runs-on: macos-11
+    runs-on: macos-13
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Update python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
+        uses: actions/checkout@v4
 
       - name: Install conan
         run: |
-          pip install --upgrade conan==1.58
+          pip install --upgrade conan==1.63.0
         shell: bash
 
       - name: Setup conan profile
@@ -292,7 +287,7 @@ jobs:
           files: FBX2glTF-macos-x86_64.zip
 
       - name: FBX2glTF-macos-x86_64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: FBX2glTF-macos-x86_64
           path: FBX2glTF-macos-x86_64/*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,7 +57,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # DRACO
 ExternalProject_Add(Draco
   GIT_REPOSITORY https://github.com/google/draco
-  GIT_TAG 75b82f7b68c797b4e0ff5e73ca8a81e2db3db797
+  GIT_TAG 8786740086a9f4d83f44aa83badfbea4dce7a1b5
   PREFIX draco
   INSTALL_DIR
   CMAKE_ARGS
@@ -181,7 +181,7 @@ set(LIB_SOURCE_FILES
 )
 
 add_library(libFBX2glTF STATIC ${LIB_SOURCE_FILES})
-set_target_properties(libFBX2glTF PROPERTIES OUTPUT_NAME "FBX2glTF")
+set_target_properties(libFBX2glTF PROPERTIES OUTPUT_NAME "libFBX2glTF")
 add_executable(FBX2glTF src/FBX2glTF.cpp)
 set_target_properties(FBX2glTF PROPERTIES OUTPUT_NAME "FBX2glTF")
 

diff --git a/conanfile.py b/conanfile.py
@@ -9,11 +9,11 @@
 class FBX2glTFConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     requires = (
-        ("boost/1.78.0"),
-        ("libiconv/1.15"),
-        ("zlib/1.2.11"),
-        ("libxml2/2.9.12"),
-        ("fmt/5.3.0"),
+        "boost/1.84.0",
+        "libiconv/1.17",
+        "zlib/1.3.1",
+        "libxml2/2.12.5",
+        "fmt/5.3.0",
     )
     generators = "cmake_find_package", "cmake_paths"