From b6fe2dc14d368f3239cba04babf5a072f1e85c68 Mon Sep 17 00:00:00 2001 From: bdew Date: Fri, 13 Dec 2013 17:25:23 +0200 Subject: [PATCH] Switched to use the token replacement in forgegradle --- build.gradle | 27 +++------------------------ resources/mcmod.info | 2 +- src/net/bdew/lib/BdLib.scala | 4 ++-- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 036fb21..fe7c4e6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,6 @@ buildscript { repositories { mavenCentral() - maven { - name = "bdew" - url = "http://jenkins.bdew.net/maven" - } maven { name = "forge" url = "http://files.minecraftforge.net/maven" @@ -32,11 +28,11 @@ ext.versuffix = "mc164" minecraft { version = "1.6.4-9.11.1.964" + replace("BDLIB_VER", project.version) } import org.apache.tools.ant.filters.ReplaceTokens -def myTokens = [BdLibVer: project.version] sourceSets { main { @@ -47,30 +43,13 @@ sourceSets { srcDir 'resources' } } - processed { - scala { - srcDir 'build/stage' - } - } -} - -task stage(type: Sync) { - inputs.property "tokens", myTokens - from sourceSets.main.scala - into 'build/stage' - filter(ReplaceTokens, tokens: myTokens) -} - -compileScala { - source = sourceSets.processed.scala - dependsOn stage } processResources { - inputs.property "tokens", myTokens + inputs.property "tokens", minecraft.replacements from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' - filter(ReplaceTokens, tokens: myTokens) + filter(ReplaceTokens, tokens: minecraft.replacements) } from(sourceSets.main.resources.srcDirs) { diff --git a/resources/mcmod.info b/resources/mcmod.info index a5c5240..30e716a 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "bdlib", "name": "BD Lib", "description": "", - "version": "@BdLibVer@", + "version": "@BDLIB_VER@", "url": "bdew.net/mods/", "updateUrl": "", "authorList": [ diff --git a/src/net/bdew/lib/BdLib.scala b/src/net/bdew/lib/BdLib.scala index e6405a0..0da6c7f 100644 --- a/src/net/bdew/lib/BdLib.scala +++ b/src/net/bdew/lib/BdLib.scala @@ -3,9 +3,9 @@ package net.bdew.lib import cpw.mods.fml.common.Mod import cpw.mods.fml.common.event.FMLPreInitializationEvent -@Mod(modid = "bdlib", version = "@BdLibVer@", modLanguage = "scala") +@Mod(modid = "bdlib", name="BD lib", version = "BDLIB_VER", modLanguage = "scala") object BdLib { def preInit(ev: FMLPreInitializationEvent) { - ev.getModLog.info("bdlib @BdLibVer@ loaded") + ev.getModLog.info("bdlib BDLIB_VER loaded") } }