Bump game version to 1.40.3 and fix version.txt path

.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
+          draft: true

.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

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"
+echo "Task Completed"

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": [],

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,56 +23,46 @@
   "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": {}
     },
     {
       "id": "config-utils",
       "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
+      }
     }
   ]
-}
+}