diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-09-11 04:24:40 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-09-11 04:24:40 +0800 |
| commit | d06081d560f3f75e7a9e558828a2ff72cdcde6d2 (patch) | |
| tree | 7b7fd1756b179b0aba091713ee6154646e2d8e68 /src/test/resources/projects/simple/build.gradle | |
| parent | 3bc5ab25c0e1bcd9a7476ca9f988c8c2b86c253b (diff) | |
| parent | 2c464cdef372e92ea719eec618ae713d54cede89 (diff) | |
| download | architectury-loom-d06081d560f3f75e7a9e558828a2ff72cdcde6d2.tar.gz architectury-loom-d06081d560f3f75e7a9e558828a2ff72cdcde6d2.tar.bz2 architectury-loom-d06081d560f3f75e7a9e558828a2ff72cdcde6d2.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/future
# Conflicts:
# build.gradle
# src/main/java/net/fabricmc/loom/LoomGradleExtension.java
# src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
# src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
# src/main/java/net/fabricmc/loom/build/MixinRefmapHelper.java
# src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/MavenPublication.java
# src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
# src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java
# src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java
# src/main/java/net/fabricmc/loom/task/RemapJarTask.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/util/ProjectTestTrait.groovy
Diffstat (limited to 'src/test/resources/projects/simple/build.gradle')
| -rw-r--r-- | src/test/resources/projects/simple/build.gradle | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/test/resources/projects/simple/build.gradle b/src/test/resources/projects/simple/build.gradle index b8917573..2201339c 100644 --- a/src/test/resources/projects/simple/build.gradle +++ b/src/test/resources/projects/simple/build.gradle @@ -7,7 +7,7 @@ sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 archivesBaseName = project.archives_base_name -version = project.mod_version +version = loom.modVersion group = project.maven_group repositories { @@ -31,14 +31,6 @@ dependencies { // You may need to force-disable transitiveness on them. } -processResources { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - tasks.withType(JavaCompile).configureEach { // ensure that the encoding is set to UTF-8, no matter what the system default is // this fixes some edge cases with special characters not displaying correctly @@ -72,13 +64,7 @@ jar { publishing { publications { mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } + from components.java } } |