Skip to content

Commit

Permalink
Update to Loom 1.1 (#2860)
Browse files Browse the repository at this point in the history
(cherry picked from commit eff3bcb77a45ef5c763b772f2ed6477c3c78aa59)
  • Loading branch information
modmuss50 committed Jan 31, 2023
1 parent a1ccd7b commit 683b889
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 19 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manage_issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 1 addition & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
fabric.loom.multiProjectOptimisation=true

version=0.73.1
minecraft_version=23w04a
Expand Down

0 comments on commit 683b889

Please sign in to comment.