diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 6fdcd90..132f498 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -13,7 +13,7 @@ env: jobs: build: runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v4 name: Checkout @@ -25,7 +25,7 @@ jobs: run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - uses: seanmiddleditch/gha-setup-ninja@v5 - + - name: Get QPM uses: Fernthedev/qpm-action@v1 with: @@ -56,7 +56,7 @@ jobs: - name: Get BSVersion & Update mod.template.json shell: pwsh run: | - $BSVersion = Get-Content ./extern/includes/bs-cordl/version.txt + $BSVersion = Get-Content ./extern/includes/bs-cordl/include/version.txt echo "BSVersion=$($BSVersion)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append $modTemplate = Get-Content ./mod.template.json -Raw | ConvertFrom-Json $modTemplate.packageVersion = $BSVersion @@ -69,7 +69,7 @@ jobs: # $externcmake = Get-Content $cmakeFilePath -Raw # $partToRemove = 'add_library(${COMPILE_ID} SHARED ${EXTERN_DIR}/includes/bs-cordl/version.txt)' # $externcmake -replace [regex]::Escape($partToRemove), '' | Set-Content $cmakeFilePath - + - name: Build run: | cd ${GITHUB_WORKSPACE} @@ -98,4 +98,4 @@ jobs: ./build/${{ env.module_id }}.so ./build/debug_${{ env.module_id }}.so body_path: ./rl-notes.md - draft: true \ No newline at end of file + draft: true diff --git a/.github/workflows/buildMod.yml b/.github/workflows/buildMod.yml index e9eeaf7..931260c 100644 --- a/.github/workflows/buildMod.yml +++ b/.github/workflows/buildMod.yml @@ -21,11 +21,11 @@ on: env: module_id: ClockMod - + jobs: build: runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v4 name: Checkout @@ -37,7 +37,7 @@ jobs: shell: pwsh run: | $branchParts = '${{ github.ref_name }}'.Split('/'); $branchMain = $branchParts[0]; if ($branchParts[0] -match "^\d+$") { $branchMain = 'pr'; $branchSub = "$($branchParts[0])." } elseif ($branchParts.Length -eq 2) { $branchSub = "$($branchParts[1].Replace('.', '-'))." }; echo "version=$((Get-Content ./qpm.shared.json -Raw | ConvertFrom-Json).config.info.version.Split('-')[0])-$($branchMain).${{ github.run_number }}+$($branchSub)ra${{ github.run_attempt }}.$($env:GITHUB_SHA.Substring(0, 7))" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - + - uses: seanmiddleditch/gha-setup-ninja@v5 @@ -55,7 +55,7 @@ jobs: - name: QPM Collapse run: | qpm collapse - + - name: Check dependency Folders run: | echo "Checking extern includes" @@ -71,7 +71,7 @@ jobs: - name: Get BSVersion & Update mod.template.json shell: pwsh run: | - $BSVersion = Get-Content ./extern/includes/bs-cordl/version.txt + $BSVersion = Get-Content ./extern/includes/bs-cordl/include/version.txt echo "BSVersion=$($BSVersion)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append $modTemplate = Get-Content ./mod.template.json -Raw | ConvertFrom-Json $modTemplate.packageVersion = $BSVersion diff --git a/buildQMOD.ps1 b/buildQMOD.ps1 index 7f302cf..be79e8c 100644 --- a/buildQMOD.ps1 +++ b/buildQMOD.ps1 @@ -50,11 +50,11 @@ echo "Packaging QMod $qmodName" # Update BS Version in mod.template.json using bs-cordl version.txt $modTemplate = Get-Content "./mod.template.json" -Raw | ConvertFrom-Json - $bsversion = Get-Content "./extern/includes/bs-cordl/version.txt" + $bsversion = Get-Content "./extern/includes/bs-cordl/include/version.txt" if (-not [string]::IsNullOrWhitespace($bsversion)) { Write-Output "Setting Package Version to $bsversion" $modTemplate.packageVersion = $bsversion - $modTemplate | ConvertTo-Json -Depth 10 | Set-Content "./mod.template.json" + $modTemplate | ConvertTo-Json -Depth 10 | Set-Content "./mod.template.json" } else { Write-Error "Missing bs-cordl version.txt" } @@ -84,4 +84,4 @@ $qmod = $qmodName + ".qmod" & qpm qmod zip -i ./build/ -i ./extern/libs/ $qmod -echo "Task Completed" \ No newline at end of file +echo "Task Completed" diff --git a/mod.template.json b/mod.template.json index 7a186ac..831e145 100644 --- a/mod.template.json +++ b/mod.template.json @@ -7,7 +7,7 @@ "modloader": "Scotland2", "version": "${version}", "packageId": "com.beatgames.beatsaber", - "packageVersion": "1.40.2_4113", + "packageVersion": "1.40.3_4614", "description": "Displays the time in game. Alternatively also the Battery Percentage", "coverImage": "Cover.jpg", "dependencies": [], diff --git a/qpm.json b/qpm.json index 6feb093..c41ceab 100644 --- a/qpm.json +++ b/qpm.json @@ -1,4 +1,5 @@ { + "$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.schema.json", "version": "0.4.0", "sharedDir": "shared", "dependenciesDir": "extern", @@ -22,40 +23,22 @@ "dependencies": [ { "id": "beatsaber-hook", - "versionRange": "^6.3.0", + "versionRange": "^6.4.1", "additionalData": {} }, - { - "id": "scotland2", - "versionRange": "^0.1.6", - "additionalData": { - "includeQmod": false, - "private": true - } - }, { "id": "bs-cordl", - "versionRange": "^4020.0.0", - "additionalData": { - } - }, - { - "id": "bs-cordl", - "versionRange": "^4020.0.0", - "additionalData": { - "extraFiles": [ - "version.txt" - ] - } + "versionRange": "4030.*", + "additionalData": {} }, { - "id": "custom-types", - "versionRange": "^0.18.0", + "id": "bsml", + "versionRange": "^0.4.50", "additionalData": {} }, { - "id": "bsml", - "versionRange": "^0.4.48", + "id": "conditional-dependencies", + "versionRange": "^0.3.0", "additionalData": {} }, { @@ -63,15 +46,23 @@ "versionRange": "^2.0.2", "additionalData": {} }, + { + "id": "custom-types", + "versionRange": "^0.18.2", + "additionalData": {} + }, { "id": "paper2_scotland2", "versionRange": "^4.5.0", "additionalData": {} }, { - "id": "conditional-dependencies", - "versionRange": "^0.3.0", - "additionalData": {} + "id": "scotland2", + "versionRange": "^0.1.6", + "additionalData": { + "includeQmod": false, + "private": true + } } ] -} \ No newline at end of file +} diff --git a/qpm.shared.json b/qpm.shared.json index 8d1990d..d2bb46f 100644 --- a/qpm.shared.json +++ b/qpm.shared.json @@ -1,4 +1,5 @@ { + "$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.shared.schema.json", "config": { "version": "0.4.0", "sharedDir": "shared", @@ -23,39 +24,22 @@ "dependencies": [ { "id": "beatsaber-hook", - "versionRange": "^6.3.0", + "versionRange": "^6.4.1", "additionalData": {} }, - { - "id": "scotland2", - "versionRange": "^0.1.6", - "additionalData": { - "includeQmod": false, - "private": true - } - }, { "id": "bs-cordl", - "versionRange": "^4020.0.0", + "versionRange": "4030.*", "additionalData": {} }, { - "id": "bs-cordl", - "versionRange": "^4020.0.0", - "additionalData": { - "extraFiles": [ - "version.txt" - ] - } - }, - { - "id": "custom-types", - "versionRange": "^0.18.0", + "id": "bsml", + "versionRange": "^0.4.50", "additionalData": {} }, { - "id": "bsml", - "versionRange": "^0.4.48", + "id": "conditional-dependencies", + "versionRange": "^0.3.0", "additionalData": {} }, { @@ -63,15 +47,23 @@ "versionRange": "^2.0.2", "additionalData": {} }, + { + "id": "custom-types", + "versionRange": "^0.18.2", + "additionalData": {} + }, { "id": "paper2_scotland2", "versionRange": "^4.5.0", "additionalData": {} }, { - "id": "conditional-dependencies", - "versionRange": "^0.3.0", - "additionalData": {} + "id": "scotland2", + "versionRange": "^0.1.6", + "additionalData": { + "includeQmod": false, + "private": true + } } ] }, @@ -79,27 +71,27 @@ { "dependency": { "id": "bsml", - "versionRange": "=0.4.49", + "versionRange": "=0.4.50", "additionalData": { - "soLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.49/libbsml.so", - "debugSoLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.49/debug_libbsml.so", + "soLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.50/libbsml.so", + "debugSoLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.50/debug_libbsml.so", "overrideSoName": "libbsml.so", - "modLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.49/BSML.qmod", - "branchName": "version/v0_4_49", + "modLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.50/BSML.qmod", + "branchName": "version/v0_4_50", "cmake": true } }, - "version": "0.4.49" + "version": "0.4.50" }, { "dependency": { "id": "paper2_scotland2", - "versionRange": "=4.5.0", + "versionRange": "=4.6.1", "additionalData": { - "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.5.0/libpaper2_scotland2.so", + "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.1/libpaper2_scotland2.so", "overrideSoName": "libpaper2_scotland2.so", - "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.5.0/paper2_scotland2.qmod", - "branchName": "version/v4_5_0", + "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.1/paper2_scotland2.qmod", + "branchName": "version/v4_6_1", "compileOptions": { "systemIncludes": [ "shared/utfcpp/source" @@ -108,7 +100,7 @@ "cmake": false } }, - "version": "4.5.0" + "version": "4.6.1" }, { "dependency": { @@ -144,18 +136,6 @@ }, "version": "0.18.2" }, - { - "dependency": { - "id": "rapidjson-macros", - "versionRange": "=2.0.2", - "additionalData": { - "headersOnly": true, - "branchName": "version/v2_0_2", - "cmake": false - } - }, - "version": "2.0.2" - }, { "dependency": { "id": "libil2cpp", @@ -172,13 +152,25 @@ }, "version": "0.4.0" }, + { + "dependency": { + "id": "rapidjson-macros", + "versionRange": "=2.1.0", + "additionalData": { + "headersOnly": true, + "branchName": "version/v2_1_0", + "cmake": false + } + }, + "version": "2.1.0" + }, { "dependency": { "id": "bs-cordl", - "versionRange": "=4020.0.0", + "versionRange": "=4030.0.0", "additionalData": { "headersOnly": true, - "branchName": "version/v4020_0_0", + "branchName": "version/v4030_0_0", "compileOptions": { "includePaths": [ "include" @@ -194,7 +186,7 @@ } } }, - "version": "4020.0.0" + "version": "4030.0.0" }, { "dependency": { @@ -211,17 +203,17 @@ { "dependency": { "id": "beatsaber-hook", - "versionRange": "=6.4.0", + "versionRange": "=6.4.1", "additionalData": { - "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", + "soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.1/libbeatsaber-hook.so", + "debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.1/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", + "modLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.1/beatsaber-hook.qmod", + "branchName": "version/v6_4_1", "cmake": true } }, - "version": "6.4.0" + "version": "6.4.1" }, { "dependency": { @@ -236,6 +228,21 @@ }, "version": "0.1.6" }, + { + "dependency": { + "id": "tinyxml2", + "versionRange": "=10.0.0", + "additionalData": { + "soLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/libtinyxml2.so", + "debugSoLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/debug_libtinyxml2.so", + "overrideSoName": "libtinyxml2.so", + "modLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/tinyxml2.qmod", + "branchName": "version/v10_0_0", + "cmake": true + } + }, + "version": "10.0.0" + }, { "dependency": { "id": "fmt", @@ -254,21 +261,6 @@ } }, "version": "11.0.2" - }, - { - "dependency": { - "id": "tinyxml2", - "versionRange": "=10.0.0", - "additionalData": { - "soLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/libtinyxml2.so", - "debugSoLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/debug_libtinyxml2.so", - "overrideSoName": "libtinyxml2.so", - "modLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/tinyxml2.qmod", - "branchName": "version/v10_0_0", - "cmake": true - } - }, - "version": "10.0.0" } ] } \ No newline at end of file