diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-10-13 15:09:08 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-10-13 15:13:02 +0800 |
| commit | 72295a81969f129a6ef5e2339b6a4f78d7cbc240 (patch) | |
| tree | cfdaf150718eecc1116b163b7c8ae199048493c9 /src/test/resources | |
| parent | 64f10eb47bd6b0411e62566cbcf692946b9fa812 (diff) | |
| parent | d8675e056b7b16fd9b8307191301a06d931ecd1f (diff) | |
| download | architectury-loom-72295a81969f129a6ef5e2339b6a4f78d7cbc240.tar.gz architectury-loom-72295a81969f129a6ef5e2339b6a4f78d7cbc240.tar.bz2 architectury-loom-72295a81969f129a6ef5e2339b6a4f78d7cbc240.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0
Signed-off-by: shedaniel <daniel@shedaniel.me>
# Conflicts:
# .github/workflows/test.yml
# src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
# src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
# src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
# src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
# src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
# src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
# src/main/java/net/fabricmc/loom/util/SourceRemapper.java
# src/test/resources/projects/parchment/build.gradle
Diffstat (limited to 'src/test/resources')
5 files changed, 24 insertions, 6 deletions
diff --git a/src/test/resources/projects/decompile/build.gradle b/src/test/resources/projects/decompile/build.gradle index a142f77f..bd5d5bca 100644 --- a/src/test/resources/projects/decompile/build.gradle +++ b/src/test/resources/projects/decompile/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - minecraft "com.mojang:minecraft:1.16.5" - mappings "net.fabricmc:yarn:1.16.5+build.5:v2" - modImplementation "net.fabricmc:fabric-loader:0.11.2" + minecraft "com.mojang:minecraft:21w38a" + mappings "net.fabricmc:yarn:21w38a+build.11:v2" + modImplementation "net.fabricmc:fabric-loader:0.11.7" } diff --git a/src/test/resources/projects/java16/gradle.properties b/src/test/resources/projects/java16/gradle.properties index 941d7f52..753673c4 100644 --- a/src/test/resources/projects/java16/gradle.properties +++ b/src/test/resources/projects/java16/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx1G -minecraft_version=21w38a -yarn_mappings=21w38a+build.9 +minecraft_version=21w39a +yarn_mappings=21w39a+build.1 loader_version=0.11.7 fabric_version=0.40.4+1.18 diff --git a/src/test/resources/projects/multiproject/example/build.gradle b/src/test/resources/projects/multiproject/example/build.gradle index c40184a8..65ab9790 100644 --- a/src/test/resources/projects/multiproject/example/build.gradle +++ b/src/test/resources/projects/multiproject/example/build.gradle @@ -2,4 +2,10 @@ archivesBaseName = "example" dependencies { implementation project(path: ":core", configuration: "dev") +} + +loom { + runConfigs.configureEach { + ideConfigGenerated = true + } }
\ No newline at end of file diff --git a/src/test/resources/projects/parchment/build.gradle b/src/test/resources/projects/parchment/build.gradle index 12d72f75..5484a2fb 100644 --- a/src/test/resources/projects/parchment/build.gradle +++ b/src/test/resources/projects/parchment/build.gradle @@ -13,7 +13,7 @@ dependencies { minecraft "com.mojang:minecraft:1.16.5" mappings loom.layered() { officialMojangMappings() - parchment("org.parchmentmc.data:parchment-1.16.5:2021.08.08@zip") + parchment("org.parchmentmc.data:parchment-1.16.5:2021.10.10@zip") } modImplementation "net.fabricmc:fabric-loader:0.11.3" diff --git a/src/test/resources/projects/simple/src/test/java/net/fabricmc/example/test/ExampleMod.java b/src/test/resources/projects/simple/src/test/java/net/fabricmc/example/test/ExampleMod.java new file mode 100644 index 00000000..ae0a3108 --- /dev/null +++ b/src/test/resources/projects/simple/src/test/java/net/fabricmc/example/test/ExampleMod.java @@ -0,0 +1,12 @@ +package net.fabricmc.example.test; + +import net.fabricmc.api.ModInitializer; +import net.minecraft.client.gui.screen.TitleScreen; + +// Just a simple class to ensure the tests can compile against loader and minecraft +public class ExampleMod implements ModInitializer { + @Override + public void onInitialize() { + TitleScreen screen = null; + } +} |