Update dependencies

bsq-ports · Jan 26, 2025 · 468ff07 · 468ff07
1 parent 35e91f1
commit 468ff07
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 46 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,14 +28,14 @@ target_link_libraries(
     log
     z
     ${EXTERN_DIR}/libs/libzip.so
-    ${EXTERN_DIR}/libs/libpaperlog.so
+    ${EXTERN_DIR}/libs/libpaper2_scotland2.so
     ${EXTERN_DIR}/libs/libweb-utils.so
 )
 
 target_include_directories(beatsaverplusplus PRIVATE ${INCLUDE_DIR})
 target_include_directories(beatsaverplusplus PRIVATE ${SHARED_DIR})
 target_include_directories(beatsaverplusplus PRIVATE ${EXTERN_DIR}/includes)
-target_include_directories(beatsaverplusplus SYSTEM PRIVATE ${EXTERN_DIR}/includes/paper/shared/utfcpp/source)
+target_include_directories(beatsaverplusplus SYSTEM PRIVATE ${EXTERN_DIR}/includes/paper2_scotland2/shared/utfcpp/source)
 target_include_directories(beatsaverplusplus SYSTEM PRIVATE ${EXTERN_DIR}/includes/fmt/fmt/include/)
 target_include_directories(beatsaverplusplus SYSTEM PRIVATE ${EXTERN_DIR}/includes/beatsaber-hook/shared/rapidjson/include/)
 target_include_directories(beatsaverplusplus SYSTEM PRIVATE ${EXTERN_DIR}/includes/libil2cpp/il2cpp/libil2cpp)

diff --git a/include/logging.hpp b/include/logging.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "paper/shared/logger.hpp"
+#include "paper2_scotland2/shared/logger.hpp"
 #include <string_view>
 
 #define INFO(str, ...) Paper::Logger::fmtLogTag<Paper::LogLevel::INF>(str, "BeatSaverPlusPlus" __VA_OPT__(, __VA_ARGS__))

diff --git a/qpm.json b/qpm.json
@@ -19,12 +19,15 @@
         "qpm qmod manifest",
         "pwsh ./scripts/createqmod.ps1 BeatSaverPlusPlus"
       ]
-    }
+    },
+    "qmodIncludeDirs": [],
+    "qmodIncludeFiles": [],
+    "qmodOutput": null
   },
   "dependencies": [
     {
-      "id": "paper",
-      "versionRange": "^3.6.1",
+      "id": "paper2_scotland2",
+      "versionRange": "^4.0.0",
       "additionalData": {}
     },
     {
@@ -34,19 +37,14 @@
         "private": true
       }
     },
-    {
-      "id": "beatsaber-hook",
-      "versionRange": "^5.1.9",
-      "additionalData": {}
-    },
     {
       "id": "web-utils",
       "versionRange": "^0.6.0",
       "additionalData": {}
     },
     {
-      "id": "fmt",
-      "versionRange": "^10.0.0",
+      "id": "beatsaber-hook",
+      "versionRange": "*",
       "additionalData": {}
     }
   ]

diff --git a/qpm.shared.json b/qpm.shared.json
@@ -27,8 +27,8 @@
     },
     "dependencies": [
       {
-        "id": "paper",
-        "versionRange": "^3.6.1",
+        "id": "paper2_scotland2",
+        "versionRange": "^4.0.0",
         "additionalData": {}
       },
       {
@@ -38,19 +38,14 @@
           "private": true
         }
       },
-      {
-        "id": "beatsaber-hook",
-        "versionRange": "^5.1.9",
-        "additionalData": {}
-      },
       {
         "id": "web-utils",
         "versionRange": "^0.6.0",
         "additionalData": {}
       },
       {
-        "id": "fmt",
-        "versionRange": "^10.0.0",
+        "id": "beatsaber-hook",
+        "versionRange": "*",
         "additionalData": {}
       }
     ]
@@ -73,14 +68,13 @@
     },
     {
       "dependency": {
-        "id": "paper",
-        "versionRange": "=3.6.4",
+        "id": "paper2_scotland2",
+        "versionRange": "=4.4.2",
         "additionalData": {
-          "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.4/libpaperlog.so",
-          "debugSoLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.4/debug_libpaperlog.so",
-          "overrideSoName": "libpaperlog.so",
-          "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.4/paperlog.qmod",
-          "branchName": "version/v3_6_4",
+          "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.4.2/libpaper2_scotland2.so",
+          "overrideSoName": "libpaper2_scotland2.so",
+          "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.4.2/paper2_scotland2.qmod",
+          "branchName": "version/v4_4_2",
           "compileOptions": {
             "systemIncludes": [
               "shared/utfcpp/source"
@@ -89,7 +83,7 @@
           "cmake": false
         }
       },
-      "version": "3.6.4"
+      "version": "4.4.2"
     },
     {
       "dependency": {
@@ -107,34 +101,41 @@
     {
       "dependency": {
         "id": "libil2cpp",
-        "versionRange": "=0.3.2",
+        "versionRange": "=0.4.0",
         "additionalData": {
           "headersOnly": true,
-          "cmake": false
+          "compileOptions": {
+            "systemIncludes": [
+              "il2cpp/external/baselib/Include",
+              "il2cpp/external/baselib/Platforms/Android/Include"
+            ]
+          }
         }
       },
-      "version": "0.3.2"
+      "version": "0.4.0"
     },
     {
       "dependency": {
         "id": "beatsaber-hook",
-        "versionRange": "=5.1.9",
+        "versionRange": "=6.4.0",
         "additionalData": {
-          "soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.9/libbeatsaber-hook_5_1_9.so",
-          "debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.9/debug_libbeatsaber-hook_5_1_9.so",
-          "branchName": "version/v5_1_9",
+          "soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.0/libbeatsaber-hook.so",
+          "debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.0/debug_libbeatsaber-hook.so",
+          "overrideSoName": "libbeatsaber-hook.so",
+          "modLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.0/beatsaber-hook.qmod",
+          "branchName": "version/v6_4_0",
           "cmake": true
         }
       },
-      "version": "5.1.9"
+      "version": "6.4.0"
     },
     {
       "dependency": {
         "id": "fmt",
-        "versionRange": "=10.0.0",
+        "versionRange": "=11.0.2",
         "additionalData": {
           "headersOnly": true,
-          "branchName": "version/v10_0_0",
+          "branchName": "version/v11_0_2",
           "compileOptions": {
             "systemIncludes": [
               "fmt/include/"
@@ -145,20 +146,20 @@
           }
         }
       },
-      "version": "10.0.0"
+      "version": "11.0.2"
     },
     {
       "dependency": {
         "id": "scotland2",
-        "versionRange": "=0.1.4",
+        "versionRange": "=0.1.6",
         "additionalData": {
-          "soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.4/libsl2.so",
-          "debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.4/debug_libsl2.so",
+          "soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/libsl2.so",
+          "debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/debug_libsl2.so",
           "overrideSoName": "libsl2.so",
-          "branchName": "version/v0_1_4"
+          "branchName": "version/v0_1_6"
         }
       },
-      "version": "0.1.4"
+      "version": "0.1.6"
     }
   ]
 }