From fe194ea64ddf3f4292543851b8daef62df9f90f1 Mon Sep 17 00:00:00 2001
From: asie <kontakt@asie.pl>
Date: Sat, 15 Dec 2018 14:14:50 +0100
Subject: [PATCH] use resolved dependency version for mapping files

---
 .../net/fabricmc/loom/providers/MappingsProvider.java |  4 ++--
 .../net/fabricmc/loom/util/DependencyProvider.java    | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java b/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
index b837bf5f..0c42d67f 100644
--- a/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
@@ -55,9 +55,9 @@ public class MappingsProvider extends DependencyProvider {
 	public void provide(DependencyInfo dependency, Project project, LoomGradleExtension extension) throws Exception {
 		MinecraftProvider minecraftProvider = getDependencyManager().getProvider(MinecraftProvider.class);
 
-		project.getLogger().lifecycle(":setting up mappings (" + dependency.getDependency().getName() + " " + dependency.getDependency().getVersion() + ")");
+		project.getLogger().lifecycle(":setting up mappings (" + dependency.getDependency().getName() + " " + dependency.getResolvedVersion() + ")");
 
-		String version = dependency.getDependency().getVersion();
+		String version = dependency.getResolvedVersion();
 		String[] split = version.split("\\.");
 
 		File mappingsJar = dependency.resolveFile();
diff --git a/src/main/java/net/fabricmc/loom/util/DependencyProvider.java b/src/main/java/net/fabricmc/loom/util/DependencyProvider.java
index 1a2ce73a..637d6270 100644
--- a/src/main/java/net/fabricmc/loom/util/DependencyProvider.java
+++ b/src/main/java/net/fabricmc/loom/util/DependencyProvider.java
@@ -28,6 +28,7 @@ import net.fabricmc.loom.LoomGradleExtension;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.artifacts.ResolvedDependency;
 
 import java.io.File;
 import java.util.Set;
@@ -72,6 +73,16 @@ public abstract class DependencyProvider {
 			return dependency;
 		}
 
+		public String getResolvedVersion() {
+			for (ResolvedDependency rd : sourceConfiguration.getResolvedConfiguration().getFirstLevelModuleDependencies()) {
+				if (rd.getModuleGroup().equals(dependency.getGroup()) && rd.getModuleName().equals(dependency.getName())) {
+					return rd.getModuleVersion();
+				}
+			}
+
+			return dependency.getVersion();
+		}
+
 		public Configuration getSourceConfiguration() {
 			return sourceConfiguration;
 		}