From 3a51777b4bbb9b27bcb5cfd8fc7b0f66660e6f62 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 4 Jul 2021 00:58:09 +0100 Subject: Use a detached configuration to add jetbrains annotations to the source remapper classpath. --- .../net/fabricmc/loom/configuration/providers/LaunchProvider.java | 3 +-- src/main/java/net/fabricmc/loom/util/SourceRemapper.java | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/main/java/net/fabricmc/loom') diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java index 980cecf0..ce5320c1 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java @@ -48,7 +48,6 @@ import net.fabricmc.loom.configuration.RemappedConfigurationEntry; import net.fabricmc.loom.util.Constants; public class LaunchProvider extends DependencyProvider { - public Dependency annotationDependency; public LaunchProvider(Project project) { super(project); @@ -81,7 +80,7 @@ public class LaunchProvider extends DependencyProvider { addDependency(Constants.Dependencies.DEV_LAUNCH_INJECTOR + Constants.Dependencies.Versions.DEV_LAUNCH_INJECTOR, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES); addDependency(Constants.Dependencies.TERMINAL_CONSOLE_APPENDER + Constants.Dependencies.Versions.TERMINAL_CONSOLE_APPENDER, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES); - annotationDependency = addDependency(Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS, JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME); + addDependency(Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS, JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME); postPopulationScheduler.accept(this::writeRemapClassPath); } diff --git a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java index 1e3eb801..ae750c7f 100644 --- a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java +++ b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java @@ -189,9 +189,9 @@ public class SourceRemapper { m.getClassPath().add(extension.getMinecraftMappedProvider().getMappedJar().toPath()); m.getClassPath().add(extension.getMinecraftMappedProvider().getIntermediaryJar().toPath()); - Dependency annotationDependency = extension.getDependencyManager().getProvider(LaunchProvider.class).annotationDependency; - Set files = project.getConfigurations().getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME) - .files(annotationDependency); + Set files = project.getConfigurations() + .detachedConfiguration(project.getDependencies().create(Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS)) + .resolve(); for (File file : files) { m.getClassPath().add(file.toPath()); -- cgit From 8ce991dadcbfad4c135c0c7c8897f77e50194bb2 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 4 Jul 2021 01:00:18 +0100 Subject: Fix build... --- .../java/net/fabricmc/loom/configuration/providers/LaunchProvider.java | 2 -- src/main/java/net/fabricmc/loom/util/SourceRemapper.java | 3 --- 2 files changed, 5 deletions(-) (limited to 'src/main/java/net/fabricmc/loom') diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java index ce5320c1..b1d4c96d 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java @@ -40,7 +40,6 @@ import java.util.stream.Collectors; import org.apache.commons.io.FileUtils; import org.gradle.api.Project; -import org.gradle.api.artifacts.Dependency; import org.gradle.api.plugins.JavaPlugin; import net.fabricmc.loom.configuration.DependencyProvider; @@ -48,7 +47,6 @@ import net.fabricmc.loom.configuration.RemappedConfigurationEntry; import net.fabricmc.loom.util.Constants; public class LaunchProvider extends DependencyProvider { - public LaunchProvider(Project project) { super(project); } diff --git a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java index ae750c7f..bd3e6aac 100644 --- a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java +++ b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java @@ -37,13 +37,10 @@ import org.cadixdev.lorenz.MappingSet; import org.cadixdev.mercury.Mercury; import org.cadixdev.mercury.remapper.MercuryRemapper; import org.gradle.api.Project; -import org.gradle.api.artifacts.Dependency; -import org.gradle.api.plugins.JavaPlugin; import org.zeroturnaround.zip.ZipUtil; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.configuration.RemappedConfigurationEntry; -import net.fabricmc.loom.configuration.providers.LaunchProvider; import net.fabricmc.loom.configuration.providers.mappings.MappingsProviderImpl; import net.fabricmc.loom.util.gradle.ProgressLogger; import net.fabricmc.lorenztiny.TinyMappingsReader; -- cgit From b24e067215bd36f128210830c508535135a41c58 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 5 Jul 2021 23:04:08 +0100 Subject: Fix yet another gradle deprecation, expand tests to cover it --- src/main/java/net/fabricmc/loom/task/UnpickJarTask.java | 2 +- .../net/fabricmc/loom/test/integration/UnpickTest.groovy | 12 ++++++++++-- .../net/fabricmc/loom/test/util/ProjectTestTrait.groovy | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'src/main/java/net/fabricmc/loom') diff --git a/src/main/java/net/fabricmc/loom/task/UnpickJarTask.java b/src/main/java/net/fabricmc/loom/task/UnpickJarTask.java index e27d2ff2..7f66aa61 100644 --- a/src/main/java/net/fabricmc/loom/task/UnpickJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/UnpickJarTask.java @@ -47,7 +47,7 @@ public class UnpickJarTask extends JavaExec { public UnpickJarTask() { getOutputs().upToDateWhen(e -> false); classpath(getProject().getConfigurations().getByName(Constants.Configurations.UNPICK_CLASSPATH)); - setMain("daomephsta.unpick.cli.Main"); + getMainClass().set("daomephsta.unpick.cli.Main"); } @Override diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/UnpickTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/UnpickTest.groovy index 2be479ea..d7717a2d 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/UnpickTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/UnpickTest.groovy @@ -42,17 +42,25 @@ class UnpickTest extends Specification implements ProjectTestTrait { def "unpick decompile"() { when: - def result = create("genSources") + def result = create("genSources", gradle) then: result.task(":genSources").outcome == SUCCESS getClassSource("net/minecraft/block/CakeBlock.java").contains("Block.DEFAULT_SET_BLOCK_STATE_FLAG") + where: + gradle | _ + DEFAULT_GRADLE | _ + PRE_RELEASE_GRADLE | _ } def "unpick build"() { when: - def result = create("build") + def result = create("build", gradle) then: result.task(":build").outcome == SUCCESS + where: + gradle | _ + DEFAULT_GRADLE | _ + PRE_RELEASE_GRADLE | _ } String getClassSource(String classname, String mappings = MAPPINGS) { diff --git a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy index 58e6cb92..932229f8 100644 --- a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy @@ -29,7 +29,7 @@ import org.gradle.testkit.runner.GradleRunner trait ProjectTestTrait { final static String DEFAULT_GRADLE = "7.0.1" - final static String PRE_RELEASE_GRADLE = "7.2-20210703221006+0000" + final static String PRE_RELEASE_GRADLE = "7.2-20210704221017+0000" static File gradleHome = File.createTempDir() File testProjectDir = File.createTempDir() -- cgit