From 20e1f3dc82e12b863f92ad28d3b982ae3a271a1d Mon Sep 17 00:00:00 2001 From: lemmingllama Date: Sun, 10 Nov 2024 10:21:50 -0500 Subject: [PATCH 1/2] Updating bshook to 5.1.9 --- qpm.json | 7 ++- qpm.shared.json | 116 +++++++++++++++++++++++++++++------------------- 2 files changed, 76 insertions(+), 47 deletions(-) diff --git a/qpm.json b/qpm.json index 20e0141..6ac51b0 100644 --- a/qpm.json +++ b/qpm.json @@ -37,14 +37,17 @@ "pwsh ./scripts/pull-tombstone.ps1" ] }, - "qmodIncludeDirs": ["./build", "./extern/libs"], + "qmodIncludeDirs": [ + "./build", + "./extern/libs" + ], "qmodIncludeFiles": [], "qmodOutput": "SongChartVisualizer" }, "dependencies": [ { "id": "beatsaber-hook", - "versionRange": "^5.1.0", + "versionRange": "^5.1.9", "additionalData": {} }, { diff --git a/qpm.shared.json b/qpm.shared.json index 00b1017..af009e1 100644 --- a/qpm.shared.json +++ b/qpm.shared.json @@ -14,15 +14,41 @@ } }, "workspace": { - "scripts": {}, - "qmodIncludeDirs": [], + "scripts": { + "build": [ + "pwsh ./scripts/build.ps1" + ], + "clean": [ + "pwsh ./scripts/build.ps1 -clean" + ], + "copy": [ + "pwsh ./scripts/copy.ps1" + ], + "logcat": [ + "adb logcat -c", + "pwsh ./scripts/start-logging.ps1" + ], + "restart": [ + "pwsh ./scripts/restart-game.ps1" + ], + "stack": [ + "pwsh ./scripts/ndk-stack.ps1" + ], + "tomb": [ + "pwsh ./scripts/pull-tombstone.ps1" + ] + }, + "qmodIncludeDirs": [ + "./build", + "./extern/libs" + ], "qmodIncludeFiles": [], - "qmodOutput": null + "qmodOutput": "SongChartVisualizer" }, "dependencies": [ { "id": "beatsaber-hook", - "versionRange": "^5.1.0", + "versionRange": "^5.1.9", "additionalData": {} }, { @@ -68,28 +94,28 @@ { "dependency": { "id": "bsml", - "versionRange": "=0.4.42", + "versionRange": "=0.4.43", "additionalData": { - "soLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.42/libbsml.so", - "debugSoLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.42/debug_libbsml.so", + "soLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.43/libbsml.so", + "debugSoLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.43/debug_libbsml.so", "overrideSoName": "libbsml.so", - "modLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.42/BSML.qmod", - "branchName": "version/v0_4_42", + "modLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.43/BSML.qmod", + "branchName": "version/v0_4_43", "cmake": true } }, - "version": "0.4.42" + "version": "0.4.43" }, { "dependency": { "id": "paper", - "versionRange": "=3.6.3", + "versionRange": "=3.7.0", "additionalData": { - "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.3/libpaperlog.so", - "debugSoLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.3/debug_libpaperlog.so", + "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.7.0/libpaperlog.so", + "debugSoLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.7.0/debug_libpaperlog.so", "overrideSoName": "libpaperlog.so", - "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.3/paperlog.qmod", - "branchName": "version/v3_6_3", + "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.7.0/paperlog.qmod", + "branchName": "version/v3_7_0", "compileOptions": { "systemIncludes": [ "shared/utfcpp/source" @@ -98,18 +124,19 @@ "cmake": false } }, - "version": "3.6.3" + "version": "3.7.0" }, { "dependency": { - "id": "libil2cpp", - "versionRange": "=0.3.2", + "id": "rapidjson-macros", + "versionRange": "=1.2.1", "additionalData": { "headersOnly": true, - "cmake": false + "branchName": "version/v1_2_1", + "cmake": true } }, - "version": "0.3.2" + "version": "1.2.1" }, { "dependency": { @@ -128,13 +155,13 @@ { "dependency": { "id": "custom-types", - "versionRange": "=0.17.8", + "versionRange": "=0.17.10", "additionalData": { - "soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.8/libcustom-types.so", - "debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.8/debug_libcustom-types.so", + "soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/libcustom-types.so", + "debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/debug_libcustom-types.so", "overrideSoName": "libcustom-types.so", - "modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.8/CustomTypes.qmod", - "branchName": "version/v0_17_8", + "modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/CustomTypes.qmod", + "branchName": "version/v0_17_10", "compileOptions": { "cppFlags": [ "-Wno-invalid-offsetof" @@ -143,19 +170,18 @@ "cmake": true } }, - "version": "0.17.8" + "version": "0.17.10" }, { "dependency": { - "id": "rapidjson-macros", - "versionRange": "=1.2.1", + "id": "libil2cpp", + "versionRange": "=0.3.2", "additionalData": { "headersOnly": true, - "branchName": "version/v1_2_1", - "cmake": true + "cmake": false } }, - "version": "1.2.1" + "version": "0.3.2" }, { "dependency": { @@ -209,38 +235,38 @@ { "dependency": { "id": "lapiz", - "versionRange": "=0.2.11", + "versionRange": "=0.2.12", "additionalData": { - "soLink": "https://github.com/raineio/Lapiz/releases/download/v0.2.11/liblapiz.so", - "debugSoLink": "https://github.com/raineio/Lapiz/releases/download/v0.2.11/debug_liblapiz.so", + "soLink": "https://github.com/raineio/Lapiz/releases/download/v0.2.12/liblapiz.so", + "debugSoLink": "https://github.com/raineio/Lapiz/releases/download/v0.2.12/debug_liblapiz.so", "overrideSoName": "liblapiz.so", - "modLink": "https://github.com/raineio/Lapiz/releases/download/v0.2.11/Lapiz.qmod", - "branchName": "version/v0_2_11", + "modLink": "https://github.com/raineio/Lapiz/releases/download/v0.2.12/Lapiz.qmod", + "branchName": "version/v0_2_12", "cmake": true } }, - "version": "0.2.11" + "version": "0.2.12" }, { "dependency": { "id": "beatsaber-hook", - "versionRange": "=5.1.7", + "versionRange": "=5.1.9", "additionalData": { - "soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.7/libbeatsaber-hook_5_1_7.so", - "debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.7/debug_libbeatsaber-hook_5_1_7.so", - "branchName": "version/v5_1_7", + "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", "cmake": true } }, - "version": "5.1.7" + "version": "5.1.9" }, { "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/" @@ -251,7 +277,7 @@ } } }, - "version": "10.0.0" + "version": "11.0.2" }, { "dependency": { From f8d140246089841eb5f3a94a766bfff650b80891 Mon Sep 17 00:00:00 2001 From: lemmingllama Date: Sun, 10 Nov 2024 10:24:04 -0500 Subject: [PATCH 2/2] Update artifact version --- .github/workflows/build-ndk.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-ndk.yml b/.github/workflows/build-ndk.yml index 68b51a0..a85a92d 100644 --- a/.github/workflows/build-ndk.yml +++ b/.github/workflows/build-ndk.yml @@ -107,7 +107,7 @@ jobs: run: mv "./build/debug/${{ steps.libname.outputs.NAME }}" "./build/debug_${{ steps.libname.outputs.NAME }}" - name: Upload non-debug artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{ steps.libname.outputs.NAME }} path: ./build/${{ steps.libname.outputs.NAME }} @@ -124,7 +124,7 @@ jobs: filename: ./build/${{ steps.libname.outputs.NAME }} - name: Upload debug artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: debug_${{ steps.libname.outputs.NAME }} path: ./build/debug_${{ steps.libname.outputs.NAME }} @@ -141,7 +141,7 @@ jobs: filename: ./build/debug_${{ steps.libname.outputs.NAME }} - name: Upload qmod artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{env.qmod_name}}.qmod path: ./${{ env.qmod_name }}.qmod @@ -178,4 +178,4 @@ jobs: webhook-url: ${{ env.WEBHOOK }} content: "New Release published: `${{ steps.get_tag_version.outputs.TAG }}`" username: "${{ github.repository }}" - avatar-url: "http://github.com/${{ env.CI_ACTOR }}.png" \ No newline at end of file + avatar-url: "http://github.com/${{ env.CI_ACTOR }}.png"