diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-08-14 02:31:16 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-08-14 02:31:16 +0800 |
| commit | 83de8bbc9afaa8da8ec0df95de9430da6678a3c4 (patch) | |
| tree | 86cdd94797bf046a609fbebfb5fd233c04bbc220 /src/test/resources/projects/kotlin | |
| parent | ab4ae39664f5bbb5aa12d6be5b249bdd29e4c4e4 (diff) | |
| parent | 159e573cade48ee649fc0dc2c9111cda77dd7816 (diff) | |
| download | architectury-loom-83de8bbc9afaa8da8ec0df95de9430da6678a3c4.tar.gz architectury-loom-83de8bbc9afaa8da8ec0df95de9430da6678a3c4.tar.bz2 architectury-loom-83de8bbc9afaa8da8ec0df95de9430da6678a3c4.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9
# Conflicts:
# build.gradle
# src/main/java/net/fabricmc/loom/LoomGradleExtension.java
# src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
# src/main/java/net/fabricmc/loom/build/JarRemapper.java
# src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/GradleMappingContext.java
# src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
# src/main/java/net/fabricmc/loom/task/AbstractLoomTask.java
# src/main/java/net/fabricmc/loom/task/AbstractRunTask.java
# src/main/java/net/fabricmc/loom/task/LoomTasks.java
# src/main/java/net/fabricmc/loom/util/Constants.java
# src/main/java/net/fabricmc/loom/util/SourceRemapper.java
# src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
# src/test/resources/projects/kotlin/build.gradle.kts
Diffstat (limited to 'src/test/resources/projects/kotlin')
| -rw-r--r-- | src/test/resources/projects/kotlin/build.gradle.kts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/resources/projects/kotlin/build.gradle.kts b/src/test/resources/projects/kotlin/build.gradle.kts index 3a72942e..b248cb06 100644 --- a/src/test/resources/projects/kotlin/build.gradle.kts +++ b/src/test/resources/projects/kotlin/build.gradle.kts @@ -1,8 +1,8 @@ import java.util.Properties plugins { - kotlin("jvm") version "1.4.31" - id("dev.architectury.loom") + kotlin("jvm") version "1.5.21" + id("dev.architectury.loom") } java { @@ -16,5 +16,5 @@ dependencies { minecraft(group = "com.mojang", name = "minecraft", version = "1.16.5") mappings(group = "net.fabricmc", name = "yarn", version = "1.16.5+build.5", classifier = "v2") modImplementation("net.fabricmc:fabric-loader:0.11.2") - modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = "1.5.0+kotlin.1.4.31") + modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = "1.6.3+kotlin.1.5.21") }
\ No newline at end of file |