Bump for 1.40.1_3323

DanTheMan827-BeatSaber · Feb 1, 2025 · 9d26496 · 9d26496
1 parent 4966029
commit 9d26496
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 54 deletions.
diff --git a/.github/actions/canary-ndk/action.yml b/.github/actions/canary-ndk/action.yml
diff --git a/.github/workflows/build-ndk.yml b/.github/workflows/build-ndk.yml
@@ -57,16 +57,6 @@ jobs:
 
     - uses: seanmiddleditch/gha-setup-ninja@v3
 
-    # Use canary NDK to avoid lesser known compile bugs
-    - name: Setup canary NDK
-      id: setup-ndk
-      uses: ./.github/actions/canary-ndk
-
-    - name: Create ndkpath.txt
-      run: |
-        echo ${{ steps.setup-ndk.outputs.ndk-path }} > ${GITHUB_WORKSPACE}/ndkpath.txt
-        cat ${GITHUB_WORKSPACE}/ndkpath.txt
-
     # get version from pushed tag or workflow dispatch
     - name: Extract version
       if: startsWith(github.ref, 'refs/tags/v') || github.event.inputs.version != ''
@@ -116,13 +106,15 @@ jobs:
         cache: true
         publish: false
 
+    - name: Install NDK
+      run: |
+        qpm ndk resolve -d
+
     - name: Build & Create Qmod
       run: |
         cd ${GITHUB_WORKSPACE}
         qpm s qmod
 
-
-
     - name: Get Library Name
       id: libname
       run: |

diff --git a/mod.template.json b/mod.template.json
@@ -7,7 +7,7 @@
   "author": "DanTheMan827",
   "version": "${version}",
   "packageId": "com.beatgames.beatsaber",
-  "packageVersion": "1.40.0_2229",
+  "packageVersion": "1.40.1_3323",
   "description": "Sets the player age to an adult.",
   "dependencies": [],
   "lateModFiles": ["${binary}"],

diff --git a/qpm.json b/qpm.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.schema.json",
   "sharedDir": "shared",
   "dependenciesDir": "extern",
   "version": "0.1.0",
@@ -47,12 +48,13 @@
       "./build",
       "./extern/libs"
     ],
-    "qmodOutput": "./Fake ID.qmod"
+    "qmodOutput": "./Fake ID.qmod",
+    "ndk": "^27.0.0"
   },
   "dependencies": [
     {
       "id": "bs-cordl",
-      "versionRange": "4000.*",
+      "versionRange": "4010.*",
       "additionalData": {}
     },
     {

diff --git 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.1.0",
     "sharedDir": "shared",
@@ -44,6 +45,7 @@
           "pwsh ./scripts/pull-tombstone.ps1"
         ]
       },
+      "ndk": "^27.0.0",
       "qmodIncludeDirs": [
         "./build",
         "./extern/libs"
@@ -54,7 +56,7 @@
     "dependencies": [
       {
         "id": "bs-cordl",
-        "versionRange": "4000.*",
+        "versionRange": "4010.*",
         "additionalData": {}
       },
       {
@@ -80,10 +82,10 @@
     {
       "dependency": {
         "id": "bs-cordl",
-        "versionRange": "=4000.2.0",
+        "versionRange": "=4010.0.0",
         "additionalData": {
           "headersOnly": true,
-          "branchName": "version/v4000_2_0",
+          "branchName": "version/v4010_0_0",
           "compileOptions": {
             "includePaths": [
               "include"
@@ -99,7 +101,7 @@
           }
         }
       },
-      "version": "4000.2.0"
+      "version": "4010.0.0"
     },
     {
       "dependency": {