Merge remote-tracking branch 'origin/1.20.1-forge' into 1.20.1-forge

The-Fireplace-Minecraft-Mods · Jan 3, 2024 · 379cc38 · 379cc38
2 parents 6cf8b06 + 0b34695
commit 379cc38
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/build.gradle b/build.gradle
@@ -80,7 +80,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.jetbrains:annotations:24.0.1'
+    implementation 'org.jetbrains:annotations:24.1.0'
     minecraft "net.minecraftforge:forge:" + minecraftVersion + "-" + forgeVersion
 }
 

diff --git a/settings.gradle b/settings.gradle
@@ -7,5 +7,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }