Update dependencies

(Thanks to CanerKaraca23 https://github.com/CaffeineMC/lithium-fabric/pull/538/files )
CaffeineMC · Sep 13, 2024 · 081f109 · 081f109
1 parent bf7551a
commit 081f109
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 60 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -1,29 +1,36 @@
-name: gradle-ci
+name: Build CI
 
 on: [ push ]
 
 jobs:
-  build:
-      runs-on: ubuntu-latest
+    Build:
+        runs-on: ubuntu-latest
 
-      steps:
-          -   uses: actions/checkout@v2
-          -   name: Set up JDK 21
-              uses: actions/setup-java@v2
+        steps:
+            - name: Checkout Repository
+              uses: actions/checkout@v4
+
+            - name: Setup JDK 21
+              uses: actions/setup-java@v4
               with:
-                  distribution: 'adopt'
+                  distribution: adopt
                   java-version: 21
-          -   name: Grant execute permission for gradlew
+
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v4
+
+            - name: Grant execute permission for gradlew
               run: chmod +x gradlew
-          -   name: Build with Gradle
+
+            - name: Build with Gradle
               run: ./gradlew build
 
-          -   name: run test server
+            - name: Run Test Server
               timeout-minutes: 5
               run: ./gradlew runAutoTestServer
 
-          -   name: Upload build artifacts
-              uses: actions/upload-artifact@v1
+            - name: Upload Build Artifacts
+              uses: actions/upload-artifact@v4
               with:
                   name: build-artifacts
                   path: build/libs
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,29 +1,36 @@
-name: release-artifacts
+name: Release CI
 
 on:
-  release:
-     types:
-       - published
+    release:
+        types:
+            - published
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v2
-      - name: Set up JDK 21
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: 21
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Upload assets to CurseForge
-        run: ./gradlew build
-        env:
-          BUILD_RELEASE: ${{ github.event.prerelease == false }}
-      - name: Upload assets to GitHub
-        uses: AButler/[email protected]
-        with:
-          files: 'build/libs/*.jar;!build/libs/*-dev.jar;LICENSE'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+    Build:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout Repository
+              uses: actions/checkout@v4
+
+            - name: Setup JDK 21
+              uses: actions/setup-java@v4
+              with:
+                  distribution: adopt
+                  java-version: 21
+
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v4
+
+            - name: Grant execute permission for gradlew
+              run: chmod +x gradlew
+
+            - name: Upload assets to CurseForge
+              run: ./gradlew build
+              env:
+                  BUILD_RELEASE: ${{ github.event.prerelease == false }}
+
+            - name: Upload assets to GitHub
+              uses: AButler/[email protected]
+              with:
+                  files: 'build/libs/*.jar;!build/libs/*-dev.jar;LICENSE'
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -1,23 +1,30 @@
-name: gradle-ci
+name: PR CI
 
 on: [ pull_request ]
 
 jobs:
-    build:
+    Build:
         runs-on: ubuntu-latest
 
         steps:
-            -   uses: actions/checkout@v2
-            -   name: Set up JDK 17
-                uses: actions/setup-java@v2
-                with:
-                    distribution: 'adopt'
-                    java-version: 17
-            -   name: Grant execute permission for gradlew
-                run: chmod +x gradlew
-            -   name: Build with Gradle
-                run: ./gradlew build
-
-            -   name: run test server
-                timeout-minutes: 5
-                run: ./gradlew runAutoTestServer
+            - name: Checkout Repository
+              uses: actions/checkout@v4
+
+            - name: Setup JDK 21
+              uses: actions/setup-java@v4
+              with:
+                  distribution: adopt
+                  java-version: 21
+
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v4
+
+            - name: Grant execute permission for gradlew
+              run: chmod +x gradlew
+
+            - name: Build with Gradle
+              run: ./gradlew build
+
+            - name: Run Test Server
+              timeout-minutes: 5
+              run: ./gradlew runAutoTestServer
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
     // This dependency is only used to determine the state of the Git working tree so that build artifacts can be
     // more easily identified. TODO: Lazily load GrGit via a service only when builds are performed.
-    id 'org.ajoberstar.grgit' version '5.0.0'
+    id 'org.ajoberstar.grgit' version '5.2.2'
 
     // Mixin config plugin is a subproject for creating lithium's settings from annotations in each mixin package.
     id 'net.caffeinemc.mixin-config-plugin' version '1.0-SNAPSHOT'

diff --git a/components/mixin-config-plugin/build.gradle b/components/mixin-config-plugin/build.gradle
@@ -23,8 +23,8 @@ gradlePlugin {
     }
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
 // this fixes some edge cases with special characters not displaying correctly

diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -1,5 +1,5 @@
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
 // this fixes some edge cases with special characters not displaying correctly

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME