From e4f5504a89b78893d130e7191bbc50315141ccdb Mon Sep 17 00:00:00 2001 From: Shawn Buckley Date: Sun, 18 Oct 2015 22:50:44 -0400 Subject: [PATCH 1/4] Update dependencies --- build.gradle | 108 ++++++++++++++++++++++++++++++++++++----------- build.properties | 22 ++++++++++ 2 files changed, 105 insertions(+), 25 deletions(-) create mode 100644 build.properties diff --git a/build.gradle b/build.gradle index ba2e368b..fb8b1601 100644 --- a/build.gradle +++ b/build.gradle @@ -16,30 +16,84 @@ buildscript { } apply plugin: 'forge' +apply plugin: 'idea' -version = "5.08" -group= "gregtech" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +file "build.properties" withReader { + def prop = new Properties() + prop.load(it) + ext.config = new ConfigSlurper().parse prop +} + +version = "${config.gt.version}" +group= "gregtech" archivesBaseName = "gregtech" minecraft { - version = "1.7.10-10.13.4.1481-1.7.10" + version = "${config.minecraft.version}-${config.forge.version}" runDir = "eclipse" } +configurations { + provided + embedded + compile.extendsFrom provided, embedded +} + +repositories { + maven { + name 'Forge' + url 'http://files.minecraftforge.net/maven' + } + maven { + name = "chickenbones" + url = "http://chickenbones.net/maven/" + } + maven { + name = "ic2, forestry" + url = "http://maven.ic2.player.to/" + } + maven { // EnderIO & EnderCore + name 'tterrag Repo' + url "http://maven.tterrag.com" + } + maven { // AppleCore + url "http://www.ryanliptak.com/maven/" + } + ivy { + name "BuildCraft" + artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]" + } + ivy { + name 'CoFHLib' + artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhlib.cf}/[module]-[revision].[ext]" + } + ivy { + name 'CoFHCore' + artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhcore.cf}/[module]-[revision].[ext]" + } + ivy { + name 'Railcraft' + artifactPattern "http://addons-origin.cursecdn.com/files/${config.railcraft.cf}/[module]_[revision].[ext]" + } +} + dependencies { - // you may put jars on which you depend on in ./libs - // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" - - // real examples - //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // for more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html - + provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") { + exclude module: '*' + } + provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev" + provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev" + provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev" + provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev" + provided "applecore:AppleCore:${config.applecore.version}:api" + provided "com.enderio.core:EnderCore:${config.enderiocore.version}:dev" + provided ("com.enderio:EnderIO:${config.enderio.version}:dev") { + transitive = false + } + provided name: 'buildcraft', version: config.buildcraft.version, classifier: "dev", ext: 'jar' + provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' + provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' + provided name: 'Railcraft', version: config.railcraft.version, ext: 'jar' } processResources @@ -61,17 +115,21 @@ processResources exclude 'mcmod.info' } } + task sourceJar(type: Jar) { -from sourceSets.main.allSource -classifier = 'sources'} + from sourceSets.main.allSource + classifier = 'sources' +} + task devJar(type: Jar) { -from sourceSets.main.output -classifier = 'dev' -manifest { -//attributes 'FMLCorePlugin': 'WhateverLoaderClass' -//attributes 'FMLCorePluginContainsFMLMod': 'true' -} + from sourceSets.main.output + classifier = 'dev' + manifest { + //attributes 'FMLCorePlugin': 'WhateverLoaderClass' + //attributes 'FMLCorePluginContainsFMLMod': 'true' + } } + artifacts { -archives devJar + archives devJar } \ No newline at end of file diff --git a/build.properties b/build.properties new file mode 100644 index 00000000..a269d221 --- /dev/null +++ b/build.properties @@ -0,0 +1,22 @@ +minecraft.version=1.7.10 +forge.version=10.13.4.1448-1.7.10 + +gt.version=5.08.31 +gt.subversion=dev + +applecore.version=1.7.10-1.2.1+107.59407 +ae2.version=rv2-beta-33 +buildcraft.version=7.1.11 +ic2.version=2.2.780-experimental +codechickenlib.version=1.1.3.140 +cofhcore.cf=2246/697 +cofhcore.version=[1.7.10]3.0.3B4-302-dev +cofhlib.cf=2230/207 +cofhlib.version=[1.7.10]1.0.0RC7-127 +railcraft.cf=2219/321 +railcraft.version=1.7.10-9.4.0.0 +forestry.version=3.6.9.28 +enderio.cf=2219/296 +enderio.version=1.7.10-2.3.0.417_beta +enderiocore.version=1.7.10-0.1.0.25_beta +nei.version=1.0.3.57 From 02d954475de5762a82aaab00a8c842501ffc2e92 Mon Sep 17 00:00:00 2001 From: Shawn Buckley Date: Sun, 18 Oct 2015 22:54:59 -0400 Subject: [PATCH 2/4] Organize build.properties --- build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.properties b/build.properties index a269d221..aa25dd25 100644 --- a/build.properties +++ b/build.properties @@ -4,19 +4,19 @@ forge.version=10.13.4.1448-1.7.10 gt.version=5.08.31 gt.subversion=dev -applecore.version=1.7.10-1.2.1+107.59407 ae2.version=rv2-beta-33 +applecore.version=1.7.10-1.2.1+107.59407 buildcraft.version=7.1.11 -ic2.version=2.2.780-experimental codechickenlib.version=1.1.3.140 cofhcore.cf=2246/697 cofhcore.version=[1.7.10]3.0.3B4-302-dev cofhlib.cf=2230/207 cofhlib.version=[1.7.10]1.0.0RC7-127 -railcraft.cf=2219/321 -railcraft.version=1.7.10-9.4.0.0 -forestry.version=3.6.9.28 enderio.cf=2219/296 enderio.version=1.7.10-2.3.0.417_beta enderiocore.version=1.7.10-0.1.0.25_beta +forestry.version=3.6.9.28 +ic2.version=2.2.780-experimental nei.version=1.0.3.57 +railcraft.cf=2219/321 +railcraft.version=1.7.10-9.4.0.0 From 16997a455fe0028d0f1997a8b74e66a419079caa Mon Sep 17 00:00:00 2001 From: Shawn Buckley Date: Mon, 19 Oct 2015 10:42:00 -0400 Subject: [PATCH 3/4] Correct build.properties to use Forge 1481 --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index aa25dd25..2aa2463e 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft.version=1.7.10 -forge.version=10.13.4.1448-1.7.10 +forge.version=10.13.4.1481-1.7.10 gt.version=5.08.31 gt.subversion=dev From ab0559cba0ef2eaca2dc9810bfa9a9e160566189 Mon Sep 17 00:00:00 2001 From: Shawn Buckley Date: Mon, 19 Oct 2015 17:41:42 -0400 Subject: [PATCH 4/4] Remove unused subversion property --- build.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/build.properties b/build.properties index 2aa2463e..1a6e24f1 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,6 @@ minecraft.version=1.7.10 forge.version=10.13.4.1481-1.7.10 gt.version=5.08.31 -gt.subversion=dev ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407