tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge pull request #161 from FireBall1725/rv2

Browse source 
Added support for TeamCity adding version data
This commit is contained in:
thatsIch 2014-09-28 18:57:21 +02:00
commit d3699f00e5
3 changed files with 49 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build.gradle
View file

@ -29,12 +29,17 @@ configurations.all {
resolutionStrategy.cacheDynamicVersionsFor 7200, 'hours' resolutionStrategy.cacheDynamicVersionsFor 7200, 'hours'
} }
sourceCompatibility = JavaVersion.VERSION_1_6
targetCompatibility = JavaVersion.VERSION_1_6 targetCompatibility = JavaVersion.VERSION_1_6
version = config.version + "-" + config.aechannel + "-" + config.build version = config.version + "-" + config.aechannel + "-" + config.build
group = config.group group = config.group
archivesBaseName = config.archivesBaseName archivesBaseName = config.archivesBaseName
if (hasProperty("teamcity")) {
version = teamcity["build.number"]
}
// Add Coremod Manifest // Add Coremod Manifest
jar { jar {
manifest { manifest {

31
build.properties
View file

@ -1,14 +1,41 @@
version=rv2 version=rv2
aechannel=alpha aechannel=alpha
build=_ build=0
group=appeng group=appeng
archivesBaseName=appliedenergistics2 archivesBaseName=appliedenergistics2
#########################################################
# Versions #
#########################################################
minecraft_version=1.7.10 minecraft_version=1.7.10
forge_version=10.13.1.1217 forge_version=10.13.1.1217
#########################################################
# APIs used for development #
#########################################################
cb_minecraft_version=1.7.10 cb_minecraft_version=1.7.10
fmp_version=1.1.0.306 fmp_version=1.1.0.306
code_chicken_lib_version=1.1.1.104 code_chicken_lib_version=1.1.1.104
code_chicken_core_version=1.0.3.26 code_chicken_core_version=1.0.3.26
nei_version=1.0.3.56 nei_version=1.0.3.56
ic2_version=2.2.643
waila_version=1.5.3a_1.7.10 waila_version=1.5.3a_1.7.10
#########################################################
# API Stubs #
# Note: Do not edit these version numbers as they are #
# not the version of the mod, but stub code for AE2 to #
# compile #
#########################################################
api_betterstorage_version=1
api_coloredlightscore_version=1
api_craftguide_version=1
api_ic2_version=1
api_immibis_version=1
api_invtweaks_version=1
api_mekansim_version=1
api_mfr_version=1
api_railcraft_version=1
api_rblocks_version=1
api_rf_version=1
api_rotarycraft_version=1
dev_buildcraft_version=1

28
gradle/scripts/dependencies.gradle
View file

@ -11,7 +11,7 @@ repositories {
} }
maven { maven {
name "FireBall API Depo" name "FireBall API Depot"
url "http://dl.tsr.me/artifactory/libs-release-local" url "http://dl.tsr.me/artifactory/libs-release-local"
} }
} }
@ -25,19 +25,19 @@ dependencies {
compile "mcp.mobius.waila:Waila:${config.waila_version}" compile "mcp.mobius.waila:Waila:${config.waila_version}"
compile(group: 'api', name: 'betterstorage', version: '1') compile(group: 'api', name: 'betterstorage', version: "${config.api_betterstorage_version}")
compile(group: 'api', name: 'coloredlightscore', version: '1') compile(group: 'api', name: 'coloredlightscore', version: "${config.api_coloredlightscore_version}")
compile(group: 'api', name: 'craftguide', version: '1') compile(group: 'api', name: 'craftguide', version: "${config.api_craftguide_version}")
compile(group: 'api', name: 'ic2', version: '1') compile(group: 'api', name: 'ic2', version: "${config.api_ic2_version}")
compile(group: 'api', name: 'immibis', version: '1') compile(group: 'api', name: 'immibis', version: "${config.api_immibis_version}")
compile(group: 'api', name: 'invtweaks', version: '1') compile(group: 'api', name: 'invtweaks', version: "${config.api_invtweaks_version}")
compile(group: 'api', name: 'mekansim', version: '1') compile(group: 'api', name: 'mekansim', version: "${config.api_mekansim_version}")
compile(group: 'api', name: 'mfr', version: '1') compile(group: 'api', name: 'mfr', version: "${config.api_mfr_version}")
compile(group: 'api', name: 'railcraft', version: '1') compile(group: 'api', name: 'railcraft', version: "${config.api_railcraft_version}")
compile(group: 'api', name: 'rblocks', version: '1') compile(group: 'api', name: 'rblocks', version: "${config.api_rblocks_version}")
compile(group: 'api', name: 'rf', version: '1') compile(group: 'api', name: 'rf', version: "${config.api_rf_version}")
compile(group: 'api', name: 'rotarycraft', version: '1') compile(group: 'api', name: 'rotarycraft', version: "${config.api_rotarycraft_version}")
compile(group: 'dev', name: 'buildcraft', version: '1') compile(group: 'dev', name: 'buildcraft', version: "${config.dev_buildcraft_version}")
// add hacked buildcraft jar to compile time (for facades) // add hacked buildcraft jar to compile time (for facades)
compile fileTree(dir: 'libs', include: '*.jar') compile fileTree(dir: 'libs', include: '*.jar')