Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge

6 files changed, 25 insertions, 10 deletions

diff --git a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
index 69cc71ee..72cf4620 100644
--- a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
+++ b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
@@ -45,11 +45,13 @@ import org.gradle.jvm.JvmLibrary;
 import org.gradle.language.base.artifact.SourcesArtifact;
 
 import net.fabricmc.loom.LoomGradleExtension;
+import net.fabricmc.loom.LoomGradlePlugin;
 import net.fabricmc.loom.configuration.RemappedConfigurationEntry;
 import net.fabricmc.loom.configuration.mods.ModProcessor;
 import net.fabricmc.loom.configuration.processors.dependency.ModDependencyInfo;
 import net.fabricmc.loom.configuration.processors.dependency.RemapData;
 import net.fabricmc.loom.util.Constants;
+import net.fabricmc.loom.util.OperatingSystem;
 import net.fabricmc.loom.util.SourceRemapper;
 
 @SuppressWarnings("UnstableApiUsage")
@@ -57,7 +59,7 @@ public class ModCompileRemapper {
 	public static void remapDependencies(Project project, String mappingsSuffix, LoomGradleExtension extension, SourceRemapper sourceRemapper) {
 		Logger logger = project.getLogger();
 		DependencyHandler dependencies = project.getDependencies();
-		boolean refreshDeps = project.getGradle().getStartParameter().isRefreshDependencies();
+		boolean refreshDeps = LoomGradlePlugin.refreshDeps;
 
 		final File modStore = extension.getRemappedModCache();
 		final RemapData remapData = new RemapData(mappingsSuffix, modStore);
@@ -95,7 +97,7 @@ public class ModCompileRemapper {
 
 				File remappedSources = info.getRemappedOutput("sources");
 
-				if (!remappedSources.exists() || refreshDeps) {
+				if ((!remappedSources.exists() || refreshDeps) && !OperatingSystem.isCIBuild()) {
 					File sources = findSources(dependencies, artifact);
 
 					if (sources != null) {
@@ -180,9 +182,7 @@ public class ModCompileRemapper {
 	private static void scheduleSourcesRemapping(Project project, SourceRemapper sourceRemapper, File sources, String remappedLog, File remappedSources) {
 		project.getLogger().debug(":providing " + remappedLog + " sources");
 
-		boolean refreshDeps = project.getGradle().getStartParameter().isRefreshDependencies();
-
-		if (!remappedSources.exists() || sources.lastModified() <= 0 || sources.lastModified() > remappedSources.lastModified() || refreshDeps) {
+		if (!remappedSources.exists() || sources.lastModified() <= 0 || sources.lastModified() > remappedSources.lastModified() || LoomGradlePlugin.refreshDeps) {
 			sourceRemapper.scheduleRemapSources(sources, remappedSources, false, true); // Depenedency sources are used in ide only so don't need to be reproducable
 		} else {
 			project.getLogger().info(remappedSources.getName() + " is up to date with " + sources.getName());
diff --git a/src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java b/src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java
index d31d05ed..2b971427 100644
--- a/src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java
@@ -48,6 +48,7 @@ import org.gradle.api.artifacts.SelfResolvingDependency;
 import org.zeroturnaround.zip.ZipUtil;
 
 import net.fabricmc.loom.LoomGradleExtension;
+import net.fabricmc.loom.LoomGradlePlugin;
 
 public abstract class DependencyProvider {
 	private LoomDependencyManager dependencyManager;
@@ -88,7 +89,7 @@ public abstract class DependencyProvider {
 	}
 
 	public boolean isRefreshDeps() {
-		return getProject().getGradle().getStartParameter().isRefreshDependencies();
+		return LoomGradlePlugin.refreshDeps;
 	}
 
 	public static class DependencyInfo {
diff --git a/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java b/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
index 920b5982..e56ab411 100644
--- a/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
+++ b/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
@@ -130,7 +130,7 @@ public class LoomDependencyManager {
 					try {
 						provider.provide(info, afterTasks::add);
 					} catch (Exception e) {
-						throw new RuntimeException("Failed to provide " + dependency.getGroup() + ":" + dependency.getName() + ":" + dependency.getVersion() + " : " + e.getMessage(), e);
+						throw new RuntimeException("Failed to provide " + dependency.getGroup() + ":" + dependency.getName() + ":" + dependency.getVersion() + " : " + e.toString(), e);
 					}
 				}
 			}
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java
index 16dfe5ad..7ec517c0 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java
@@ -64,6 +64,7 @@ import org.zeroturnaround.zip.ZipEntrySource;
 import org.zeroturnaround.zip.ZipUtil;
 
 import net.fabricmc.loom.LoomGradleExtension;
+import net.fabricmc.loom.LoomGradlePlugin;
 import net.fabricmc.loom.configuration.providers.minecraft.MinecraftVersionInfo;
 import net.fabricmc.loom.util.DownloadUtil;
 import net.fabricmc.lorenztiny.TinyMappingsReader;
@@ -130,7 +131,7 @@ public class MojangMappingsDependency extends AbstractModuleDependency implement
 		Path clientMappings = mappingsDir.resolve(String.format("%s.%s-%s-client.map", GROUP, MODULE, getVersion()));
 		Path serverMappings = mappingsDir.resolve(String.format("%s.%s-%s-server.map", GROUP, MODULE, getVersion()));
 
-		if (!Files.exists(mappingsFile) || project.getGradle().getStartParameter().isRefreshDependencies()) {
+		if (!Files.exists(mappingsFile) || LoomGradlePlugin.refreshDeps) {
 			MappingSet mappingSet;
 
 			try {
diff --git a/src/main/java/net/fabricmc/loom/util/OperatingSystem.java b/src/main/java/net/fabricmc/loom/util/OperatingSystem.java
index 727948fe..2f69bcb8 100644
--- a/src/main/java/net/fabricmc/loom/util/OperatingSystem.java
+++ b/src/main/java/net/fabricmc/loom/util/OperatingSystem.java
@@ -48,4 +48,15 @@ public class OperatingSystem {
 	public static boolean is64Bit() {
 		return System.getProperty("sun.arch.data.model").contains("64");
 	}
+
+	public static boolean isCIBuild() {
+		String loomProperty = System.getProperty("fabric.loom.ci");
+
+		if (loomProperty != null) {
+			return loomProperty.equalsIgnoreCase("true");
+		}
+
+		// CI seems to be set by most popular CI services
+		return System.getenv("CI") != null;
+	}
 }
diff --git a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java
index 71672d92..750fbdeb 100644
--- a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java
+++ b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java
@@ -91,10 +91,12 @@ public class SourceRemapper {
 	}
 
 	public void remapAll() {
-		if (!remapTasks.isEmpty()) {
-			project.getLogger().lifecycle(":remapping sources");
+		if (remapTasks.isEmpty()) {
+			return;
 		}
 
+		project.getLogger().lifecycle(":remapping sources");
+
 		ProgressLogger progressLogger = ProgressLogger.getProgressFactory(project, SourceRemapper.class.getName());
 		progressLogger.start("Remapping dependency sources", "sources");