a

badasintended · Jan 27, 2024 · bb111e3 · bb111e3
1 parent a4a370d
commit bb111e3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/head.yml b/.github/workflows/head.yml
@@ -17,20 +17,19 @@ jobs:
       - id: vars
         run: |
           echo "git_hash=${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
-      - run: chmod +x gradlew
-      - uses: actions/cache@v3
+      - uses: gradle/actions/setup-gradle@v3
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-${{ github.ref }}-${{ hashFiles('**/*.gradle.kts') }}
+          cache-read-only: ${{ github.repository != 'badasintended/megane' }}
+      - run: chmod +x gradlew
       - run: ./gradlew build
         env:
           GIT_HASH: ${{ steps.vars.outputs.git_hash }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: megane-${{ steps.vars.outputs.git_hash }}
           path: "./modules/**/build/libs/**.jar"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,27 +9,27 @@ jobs:
       - id: vars
         run: |
           echo "version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
+      - uses: gradle/actions/setup-gradle@v3
+        with:
+          cache-read-only: ${{ github.repository != 'badasintended/megane' }}
       - run: chmod +x gradlew
       - run: ./gradlew build publishMods
         env:
           MOD_VERSION: ${{ steps.vars.outputs.version }}
           CURSEFORGE_API: ${{ secrets.CURSEFORGE_API }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: megane-${{ steps.vars.outputs.git_hash }}
           path: "./modules/**/build/libs/**.jar"
-      - uses: alexellis/upload-assets@259de5111cb56966d046ced998941e93f91d2c93
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
+      - uses: softprops/action-gh-release@v1
         with:
-          asset_paths: |
-            [
-              "./modules/*/build/libs/*[0-9.].jar",
-              "./modules/*/*/build/libs/*[0-9.].jar",
-            ]
+          tag_name: ${{ steps.vars.outputs.version }}
+          files: |
+            ./modules/*/build/libs/*[0-9.].jar
+            ./modules/*/*/build/libs/*[0-9.].jar
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -15,8 +15,8 @@ object deps {
         const val loader = "net.fabricmc:fabric-loader:0.14.24"
 
         object wthit {
-            const val api = "mcp.mobius.waila:wthit-api:fabric-5.999-local"
-            const val runtime = "mcp.mobius.waila:wthit:fabric-5.999-local"
+            const val api = "mcp.mobius.waila:wthit-api:fabric-5.20.0"
+            const val runtime = "mcp.mobius.waila:wthit:fabric-5.20.0"
         }
 
         const val badpackets = "lol.bai:badpackets:fabric-0.2.3"
@@ -57,8 +57,8 @@ object deps {
         const val forge = "net.minecraftforge:forge:${versions.minecraft}-43.3.5"
 
         object wthit {
-            const val api = "mcp.mobius.waila:wthit-api:forge-5.999-local"
-            const val runtime = "mcp.mobius.waila:wthit:forge-5.999-local"
+            const val api = "mcp.mobius.waila:wthit-api:forge-5.20.0"
+            const val runtime = "mcp.mobius.waila:wthit:forge-5.20.0"
         }
 
         const val badpackets = "lol.bai:badpackets:forge-0.2.3"