From eff3bcb77a45ef5c763b772f2ed6477c3c78aa59 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Tue, 31 Jan 2023 08:54:35 +0000
Subject: [PATCH] Update to Loom 1.1 (#2860)
---
.github/workflows/build.yml | 10 +++++-----
.github/workflows/manage_issues.yml | 2 +-
.github/workflows/release.yml | 4 ++--
build.gradle | 12 +-----------
gradle.properties | 1 +
5 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3b8a8de4e..32c58a56d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
image: eclipse-temurin:${{ matrix.java }}
options: --user root
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: gradle/wrapper-validation-action@v1
@@ -20,15 +20,15 @@ jobs:
with:
reports: |
**/build/reports/checkstyle/*.xml
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
with:
name: Artifacts
path: build/libs/
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
with:
name: Artifacts
path: ./*/build/libs/
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
with:
name: Maven Local
path: /root/.m2/repository
@@ -47,7 +47,7 @@ jobs:
uses: modmuss50/xvfb-action@v1
with:
run: ./gradlew runProductionAutoTestClient --stacktrace --warning-mode=fail
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
if: always()
with:
name: Test Screenshots
diff --git a/.github/workflows/manage_issues.yml b/.github/workflows/manage_issues.yml
index b3259ecea..8494d106c 100644
--- a/.github/workflows/manage_issues.yml
+++ b/.github/workflows/manage_issues.yml
@@ -8,7 +8,7 @@ jobs:
labels:
runs-on: ubuntu-latest
steps:
- - uses: FabricMC/fabric-action-scripts@v1
+ - uses: FabricMC/fabric-action-scripts@v2
with:
context: ${{ github.event.action }}
label: ${{ github.event.label.name }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 97fff87a2..25bff8044 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,10 +13,10 @@ jobs:
steps:
- run: apt update && apt install git -y && git --version
- run: git config --global --add safe.directory /__w/fabric/fabric
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
fetch-depth: 0
- - uses: FabricMC/fabric-action-scripts@v1
+ - uses: FabricMC/fabric-action-scripts@v2
id: changelog
with:
context: changelog
diff --git a/build.gradle b/build.gradle
index 60153cea4..287272683 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ plugins {
id "idea"
id "maven-publish"
id 'jacoco'
- id "fabric-loom" version "1.0.12" apply false
+ id "fabric-loom" version "1.1.8" apply false
id "com.diffplug.spotless" version "6.11.0"
id "org.ajoberstar.grgit" version "3.1.0"
id "com.matthewprenger.cursegradle" version "1.4.0"
@@ -525,16 +525,6 @@ subprojects {
loom.disableDeprecatedPomGeneration(publishing.publications.mavenJava)
javadoc.enabled = false
-
- afterEvaluate {
- // Disable the gen sources task on sub projects
- genClientOnlySourcesWithFernFlower.enabled = false
- genClientOnlySourcesWithCfr.enabled = false
- genCommonSourcesWithCfr.enabled = false
- genCommonSourcesWithFernFlower.enabled = false
- unpickClientOnlyJar.enabled = false
- unpickCommonJar.enabled = false
- }
}
publishing {
diff --git a/gradle.properties b/gradle.properties
index 978031e30..edd12b0ff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,6 @@
org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
+fabric.loom.multiProjectOptimisation=true
version=0.73.0
minecraft_version=1.19.3