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

1 files changed, 101 insertions, 15 deletions

diff --git a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
index 146be30d..5230f9b9 100644
--- a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
+++ b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
@@ -34,6 +34,9 @@ import org.gradle.api.Action;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.provider.ListProperty;
+import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.SourceSet;
 import org.jetbrains.annotations.ApiStatus;
@@ -44,31 +47,77 @@ import net.fabricmc.loom.configuration.ide.RunConfigSettings;
 import net.fabricmc.loom.configuration.launch.LaunchProviderSettings;
 import net.fabricmc.loom.configuration.processors.JarProcessor;
 import net.fabricmc.loom.configuration.providers.mappings.LayeredMappingSpecBuilder;
+import net.fabricmc.loom.util.DeprecationHelper;
 import net.fabricmc.loom.util.ModPlatform;
 
 /**
  * This is the public api available exposed to build scripts.
  */
 public interface LoomGradleExtensionAPI {
-	File getAccessWidener();
+	@ApiStatus.Internal
+	DeprecationHelper getDeprecationHelper();
+
+	RegularFileProperty getAccessWidenerPath();
+
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default File getAccessWidener() {
+		getDeprecationHelper().replaceWithInLoom0_11("accessWidener", "accessWidenerPath");
+		return getAccessWidenerPath().getAsFile().getOrNull();
+	}
+
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default void setAccessWidener(File file) {
+		getDeprecationHelper().replaceWithInLoom0_11("accessWidener", "accessWidenerPath");
+		getAccessWidenerPath().set(file);
+	}
 
-	void setAccessWidener(Object file);
+	Property<Boolean> getShareRemapCaches();
 
-	void setShareCaches(boolean shareCaches);
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default void setShareCaches(boolean shareCaches) {
+		getDeprecationHelper().replaceWithInLoom0_11("shareCaches", "shareRemapCaches");
+		getShareRemapCaches().set(shareCaches);
+	}
 
-	boolean isShareCaches();
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default boolean isShareCaches() {
+		getDeprecationHelper().replaceWithInLoom0_11("shareCaches", "shareRemapCaches");
+		return getShareRemapCaches().get();
+	}
 
 	default void shareCaches() {
-		setShareCaches(true);
+		getShareRemapCaches().set(true);
+	}
+
+	ListProperty<LoomDecompiler> getGameDecompilers();
+
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default List<LoomDecompiler> getDecompilers() {
+		getDeprecationHelper().replaceWithInLoom0_11("decompilers", "gameDecompilers");
+		return getGameDecompilers().get();
 	}
 
-	List<LoomDecompiler> getDecompilers();
+	default void addDecompiler(LoomDecompiler decompiler) {
+		getGameDecompilers().add(decompiler);
+	}
 
-	void addDecompiler(LoomDecompiler decompiler);
+	ListProperty<JarProcessor> getGameJarProcessors();
 
-	List<JarProcessor> getJarProcessors();
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default List<JarProcessor> getJarProcessors() {
+		getDeprecationHelper().replaceWithInLoom0_11("jarProcessors", "gameJarProcessors");
+		return getGameJarProcessors().get();
+	}
 
-	void addJarProcessor(JarProcessor processor);
+	default void addJarProcessor(JarProcessor processor) {
+		getGameJarProcessors().add(processor);
+	}
 
 	ConfigurableFileCollection getLog4jConfigs();
 
@@ -78,13 +127,35 @@ public interface LoomGradleExtensionAPI {
 
 	Dependency layered(Action<LayeredMappingSpecBuilder> action);
 
-	String getRefmapName();
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default String getRefmapName() {
+		getDeprecationHelper().replaceWithInLoom0_11("refmapName", "mixin.defaultRefmapName");
+		return getMixin().getDefaultRefmapName().get();
+	}
+
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default void setRefmapName(String refmapName) {
+		getDeprecationHelper().replaceWithInLoom0_11("refmapName", "mixin.defaultRefmapName");
+		getMixin().getDefaultRefmapName().set(refmapName);
+	}
 
-	void setRefmapName(String refmapName);
+	Property<Boolean> getRemapArchives();
 
-	boolean isRemapMod();
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default boolean isRemapMod() {
+		getDeprecationHelper().replaceWithInLoom0_11("remapMod", "remapArchives");
+		return getRemapArchives().get();
+	}
 
-	void setRemapMod(boolean remapMod);
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default void setRemapMod(boolean remapMod) {
+		getDeprecationHelper().replaceWithInLoom0_11("remapMod", "remapArchives");
+		getRemapArchives().set(remapMod);
+	}
 
 	void runs(Action<NamedDomainObjectContainer<RunConfigSettings>> action);
 
@@ -93,9 +164,24 @@ public interface LoomGradleExtensionAPI {
 	@ApiStatus.Experimental
 	void mixin(Action<MixinApExtensionAPI> action);
 
-	void setCustomManifest(String customManifest);
+	@ApiStatus.Experimental
+	MixinApExtensionAPI getMixin();
+
+	Property<String> getCustomMinecraftManifest();
 
-	String getCustomManifest();
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default void setCustomManifest(String customManifest) {
+		getDeprecationHelper().replaceWithInLoom0_11("customManifest", "customMinecraftManifest");
+		getCustomMinecraftManifest().set(customManifest);
+	}
+
+	@Deprecated(forRemoval = true)
+	@ApiStatus.ScheduledForRemoval(inVersion = "0.11")
+	default String getCustomManifest() {
+		getDeprecationHelper().replaceWithInLoom0_11("customManifest", "customMinecraftManifest");
+		return getCustomMinecraftManifest().getOrNull();
+	}
 
 	// ===================
 	//  Architectury Loom