Make used ForgeGradle version independently configurable

NOVA-Team · Jun 23, 2018 · e27ca96 · e27ca96
1 parent 4522f32
commit e27ca96
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/minecraft/1.7/gradle.properties b/minecraft/1.7/gradle.properties
@@ -2,6 +2,7 @@ group = nova.core
 
 minecraft.version = 1.7.10
 forge.version = 10.13.4.1448-1.7.10
+forgeGradleVersion = 1.2-SNAPSHOT
 
 packaging = jar
 info.inceptionYear = 2015

diff --git a/minecraft/1.8/gradle.properties b/minecraft/1.8/gradle.properties
@@ -2,6 +2,7 @@ group = nova.core
 
 minecraft.version = 1.8
 forge.version = 11.14.3.1491
+forgeGradleVersion = 1.2-SNAPSHOT
 
 packaging = jar
 info.inceptionYear = 2015

diff --git a/minecraft/build.gradle b/minecraft/build.gradle
@@ -1,16 +1,20 @@
-buildscript{
-	repositories{
-		mavenCentral()
-		maven {
-			name "forge"
-			url "http://files.minecraftforge.net/maven"
+subprojects {
+	buildscript {
+		repositories {
+			mavenCentral()
+			maven {
+				name "forge"
+				url "http://files.minecraftforge.net/maven"
+			}
+			maven {
+				name "sonatype"
+				url "https://oss.sonatype.org/content/repositories/snapshots/"
+			}
 		}
-		maven {
-			name "sonatype"
-			url "https://oss.sonatype.org/content/repositories/snapshots/"
+		dependencies {
+			// Minecraft Forge 11.14.3.1503 and newer requires ForgeGradle 2.x,
+			// whereas Minecraft Forge 11.14.3.1502 or older requires ForgeGradle 1.x.
+			classpath 'net.minecraftforge.gradle:ForgeGradle:' + property('forgeGradleVersion')
 		}
 	}
-	dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-	}
 }