From ac9c7fc1037721c9a8734f7e1c7db61de598ddc0 Mon Sep 17 00:00:00 2001 From: asie Date: Wed, 24 Jul 2019 22:34:27 +0200 Subject: [PATCH] downgrade to gradle 4.9, fix tiny-remapper deprecations, restore old dev/noclassifier behaviour for default RemapJarTask settings --- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/net/fabricmc/loom/AbstractPlugin.java | 7 ++++--- src/main/java/net/fabricmc/loom/task/RemapJarTask.java | 7 ++++--- src/main/java/net/fabricmc/loom/util/MapJarsTiny.java | 2 +- src/main/java/net/fabricmc/loom/util/ModProcessor.java | 2 +- src/main/java/net/fabricmc/loom/util/NestedJars.java | 2 +- .../net/fabricmc/loom/EmptyBuildFunctionalTest.groovy | 2 +- .../net/fabricmc/loom/MixinBuildFunctionalTest.groovy | 2 +- .../net/fabricmc/loom/SimpleBuildFunctionalTest.groovy | 2 +- 10 files changed, 19 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index de6f4ff..6be4362 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ targetCompatibility = 1.8 group = 'net.fabricmc' archivesBaseName = project.name -version = '0.2.5-SNAPSHOT' +version = '0.2.290-SNAPSHOT' def build = "local" def ENV = System.getenv() @@ -57,7 +57,7 @@ dependencies { // Testing testImplementation(gradleTestKit()) - testImplementation("org.spockframework:spock-core:1.3-groovy-2.5") + testImplementation("org.spockframework:spock-core:1.3-groovy-2.4") } jar { @@ -67,12 +67,12 @@ jar { } task sourcesJar(type: Jar, dependsOn: classes) { - archiveClassifier = 'sources' + classifier = 'sources' from sourceSets.main.allSource } task javadocJar(type: Jar, dependsOn: javadoc) { - archiveClassifier = 'javadoc' + classifier = 'javadoc' from javadoc.destinationDir } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b880d01..071bbc5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java index 5ed2d86..26798ef 100644 --- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java +++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java @@ -311,13 +311,14 @@ public class AbstractPlugin implements Plugin { assert remapJarTask != null; if (!remapJarTask.getInput().isPresent()) { - remapJarTask.getArchiveClassifier().set("remapped"); - remapJarTask.getInput().set(jarTask.getArchiveFile()); + jarTask.setClassifier("dev"); + remapJarTask.setClassifier(""); + remapJarTask.getInput().set(jarTask.getArchivePath()); } remapJarTask.getAddNestedDependencies().set(true); - remapJarTask.doLast(task -> project1.getArtifacts().add("archives", remapJarTask.getArchiveFile())); + remapJarTask.doLast(task -> project1.getArtifacts().add("archives", remapJarTask.getArchivePath())); remapJarTask.dependsOn(project1.getTasks().getByName("jar")); project1.getTasks().getByName("build").dependsOn(remapJarTask); diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java index 996aad1..94816a8 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java @@ -33,6 +33,7 @@ import net.fabricmc.tinyremapper.OutputConsumerPath; import net.fabricmc.tinyremapper.TinyRemapper; import net.fabricmc.tinyremapper.TinyUtils; import org.gradle.api.Project; +import org.gradle.api.file.RegularFile; import org.gradle.api.file.RegularFileProperty; import org.gradle.api.provider.Property; import org.gradle.api.tasks.Input; @@ -53,7 +54,7 @@ public class RemapJarTask extends Jar { public RemapJarTask() { super(); - input = getProject().getObjects().fileProperty(); + input = getProject().getLayout().fileProperty(); addNestedDependencies = getProject().getObjects().property(Boolean.class); } @@ -62,7 +63,7 @@ public class RemapJarTask extends Jar { Project project = getProject(); LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); Path input = this.getInput().getAsFile().get().toPath(); - Path output = this.getArchiveFile().get().getAsFile().toPath(); + Path output = this.getArchivePath().toPath(); if (!Files.exists(input)) { throw new FileNotFoundException(input.toString()); @@ -98,7 +99,7 @@ public class RemapJarTask extends Jar { TinyRemapper remapper = remapperBuilder.build(); - try (OutputConsumerPath outputConsumer = new OutputConsumerPath(output)) { + try (OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(output).build()) { outputConsumer.addNonClassFiles(input); remapper.readClassPath(classpath); remapper.readInputs(input); diff --git a/src/main/java/net/fabricmc/loom/util/MapJarsTiny.java b/src/main/java/net/fabricmc/loom/util/MapJarsTiny.java index 72225c6..d33e406 100644 --- a/src/main/java/net/fabricmc/loom/util/MapJarsTiny.java +++ b/src/main/java/net/fabricmc/loom/util/MapJarsTiny.java @@ -66,7 +66,7 @@ public class MapJarsTiny { .rebuildSourceFilenames(true) .build(); - try (OutputConsumerPath outputConsumer = new OutputConsumerPath(output)) { + try (OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(output).build()) { outputConsumer.addNonClassFiles(input); remapper.readClassPath(classpath); remapper.readInputs(input); diff --git a/src/main/java/net/fabricmc/loom/util/ModProcessor.java b/src/main/java/net/fabricmc/loom/util/ModProcessor.java index 6a91a72..863bd77 100644 --- a/src/main/java/net/fabricmc/loom/util/ModProcessor.java +++ b/src/main/java/net/fabricmc/loom/util/ModProcessor.java @@ -167,7 +167,7 @@ public class ModProcessor { .withMappings(TinyRemapperMappingsHelper.create(mappingsProvider.getMappings(), fromM, toM)) .build(); - try (OutputConsumerPath outputConsumer = new OutputConsumerPath(Paths.get(output.getAbsolutePath()))) { + try (OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(Paths.get(output.getAbsolutePath())).build()) { outputConsumer.addNonClassFiles(inputPath); remapper.readClassPath(modCompiles.toArray(new Path[0])); remapper.readClassPath(mc); diff --git a/src/main/java/net/fabricmc/loom/util/NestedJars.java b/src/main/java/net/fabricmc/loom/util/NestedJars.java index 3aa6ebb..e1b6910 100644 --- a/src/main/java/net/fabricmc/loom/util/NestedJars.java +++ b/src/main/java/net/fabricmc/loom/util/NestedJars.java @@ -107,7 +107,7 @@ public class NestedJars { for (Task task : remapJarTasks.isEmpty() ? jarTasks : remapJarTasks) { if (task instanceof RemapJarTask) { - fileList.add(((RemapJarTask) task).getArchiveFile().get().getAsFile()); + fileList.add(((RemapJarTask) task).getArchivePath()); } else if (task instanceof AbstractArchiveTask) { fileList.add(((AbstractArchiveTask) task).getArchivePath()); } diff --git a/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy b/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy index 55a01a5..b9d6301 100644 --- a/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy @@ -37,7 +37,7 @@ class EmptyBuildFunctionalTest extends Specification { .withProjectDir(testProjectDir.root) .withArguments('build') .withPluginClasspath() - .withGradleVersion("5.1.1") + .withGradleVersion("4.9") .build() then: diff --git a/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy b/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy index 4ac2e90..bc737fb 100644 --- a/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy @@ -62,7 +62,7 @@ class MixinBuildFunctionalTest extends Specification { .withProjectDir(testProjectDir.root) .withArguments('build') .withPluginClasspath() - .withGradleVersion("5.1.1") + .withGradleVersion("4.9") .build() then: diff --git a/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy b/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy index 9ff669e..3db6cb5 100644 --- a/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy @@ -47,7 +47,7 @@ class SimpleBuildFunctionalTest extends Specification { .withProjectDir(testProjectDir.root) .withArguments('build') .withPluginClasspath() - .withGradleVersion("5.1.1") + .withGradleVersion("4.9") .build() then: