Merge remote-tracking branch 'upstream/exp/1.4' into exp/1.4

# Conflicts:
#	.gitignore
#	build.gradle
#	settings.gradle
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/task/service/JarManifestService.java
#	src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
This commit is contained in:
shedaniel
2023-09-23 16:11:29 +08:00
61 changed files with 1597 additions and 305 deletions

View File

@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [8.1.0-jdk17]
version: [8.3.0-jdk17]
runs-on: ubuntu-22.04
container:
image: gradle:${{ matrix.version }}
@@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-22.04
container:
image: gradle:8.1.0-jdk17
image: gradle:8.3.0-jdk17
options: --user root
steps:
@@ -51,7 +51,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [8.1.0-jdk17]
version: [8.3.0-jdk17]
test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
runs-on: ubuntu-22.04