Bump version to 2.2
This commit is contained in:
parent
fb888cb769
commit
db3c7f0585
1 changed files with 199 additions and 200 deletions
55
build.gradle
55
build.gradle
|
@ -61,7 +61,8 @@ repositories {
|
|||
url = "http://maven.ic2.player.to/"
|
||||
}
|
||||
|
||||
maven {// HWYLA
|
||||
maven {
|
||||
// HWYLA
|
||||
name "TehNut"
|
||||
url "http://tehnut.info/maven/"
|
||||
}
|
||||
|
@ -77,7 +78,7 @@ configurations {
|
|||
}
|
||||
|
||||
|
||||
version = "2.1.11"
|
||||
version = "2.2.0"
|
||||
|
||||
def ENV = System.getenv()
|
||||
if (ENV.BUILD_NUMBER) {
|
||||
|
@ -103,7 +104,7 @@ group = 'TechReborn'
|
|||
|
||||
|
||||
dependencies {
|
||||
deobfCompile ('RebornCore:RebornCore-1.11.2:+:universal'){
|
||||
deobfCompile('RebornCore:RebornCore-1.11.2:+:universal') {
|
||||
transitive = false
|
||||
}
|
||||
deobfCompile "mezz.jei:jei_1.11.2:+"
|
||||
|
@ -115,13 +116,13 @@ dependencies {
|
|||
//deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170"
|
||||
deobfCompile "mcjty.theoneprobe:TheOneProbe:1.11-1.3.3-46"
|
||||
compile "CraftTweaker:CraftTweaker:1.11.2-3.0.24"
|
||||
compile ("codechicken:CodeChickenLib:1.11.2-+:deobf"){
|
||||
compile("codechicken:CodeChickenLib:1.11.2-+:deobf") {
|
||||
transitive = false
|
||||
}
|
||||
compile ("codechicken:NotEnoughItems:1.11.2-+:deobf"){
|
||||
compile("codechicken:NotEnoughItems:1.11.2-+:deobf") {
|
||||
transitive = false
|
||||
}
|
||||
compile ("codechicken:ForgeMultipart:1.11.2-+:deobf"){
|
||||
compile("codechicken:ForgeMultipart:1.11.2-+:deobf") {
|
||||
transitive = false
|
||||
}
|
||||
compileOnly 'net.industrial-craft:industrialcraft-2:2.6.129-ex110'
|
||||
|
@ -139,7 +140,7 @@ processResources
|
|||
include 'mcmod.info'
|
||||
|
||||
// replace version and mcversion
|
||||
expand 'version':project.version, 'mcversion':project.minecraft.version
|
||||
expand 'version': project.version, 'mcversion': project.minecraft.version
|
||||
}
|
||||
|
||||
// copy everything else, thats not the mcmod.info
|
||||
|
@ -159,13 +160,13 @@ task deobfJar(type: Jar) {
|
|||
jar {
|
||||
exclude "**/*.psd"
|
||||
classifier = 'universal'
|
||||
// configurations.shade.each { dep ->
|
||||
// from(project.zipTree(dep)){
|
||||
// include 'ic2/api/'
|
||||
// include 'forestry/api/fuels/'
|
||||
// exclude 'META-INF', 'META-INF/**', '**/*.java'
|
||||
// }
|
||||
// }
|
||||
// configurations.shade.each { dep ->
|
||||
// from(project.zipTree(dep)){
|
||||
// include 'ic2/api/'
|
||||
// include 'forestry/api/fuels/'
|
||||
// exclude 'META-INF', 'META-INF/**', '**/*.java'
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
task apiJar(type: Jar) {
|
||||
|
@ -191,15 +192,12 @@ uploadArchives {
|
|||
repositories {
|
||||
mavenDeployer {
|
||||
//This is used when the build is done on a slave node
|
||||
if (project.hasProperty('mavenPass'))
|
||||
{
|
||||
if (project.hasProperty('mavenPass')) {
|
||||
println 'Uploading to remote Maven Repo'
|
||||
repository(url: "http://mavenupload.modmuss50.me/") {
|
||||
authentication(userName: "buildslave", password: project.getProperty('mavenPass'))
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
//this is when the build is executed on the master node
|
||||
println 'Uploading to local Maven Repo'
|
||||
repository(url: "file:///var/www/maven/")
|
||||
|
@ -233,12 +231,12 @@ uploadArchives {
|
|||
developer {
|
||||
id 'modmuss50'
|
||||
name 'modmuss50'
|
||||
roles { role 'developer' }
|
||||
roles {role 'developer'}
|
||||
}
|
||||
developer {
|
||||
id 'Gigabit101'
|
||||
name 'Gigabit101'
|
||||
roles { role 'developer' }
|
||||
roles {role 'developer'}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -276,15 +274,15 @@ task updateMappings(dependsOn: sourceJar) {
|
|||
into remapped
|
||||
include '**/*.java'
|
||||
|
||||
filter { javaLine ->
|
||||
map.entrySet().each { entry ->
|
||||
filter {javaLine ->
|
||||
map.entrySet().each {entry ->
|
||||
javaLine = javaLine.replace(entry.getKey(), entry.getValue())
|
||||
}
|
||||
return javaLine
|
||||
}
|
||||
|
||||
includeEmptyDirs = false
|
||||
eachFile { println "Processing: $it.name" }
|
||||
eachFile {println "Processing: $it.name"}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -310,14 +308,15 @@ build.dependsOn signJar
|
|||
|
||||
apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle'
|
||||
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import groovy.util.XmlSlurper;
|
||||
import java.io.File;
|
||||
import groovy.util.XmlSlurper
|
||||
import org.apache.commons.io.FileUtils
|
||||
|
||||
task curseTools {
|
||||
doLast {
|
||||
def cacheFiles = new File(".gradle/curseTools")
|
||||
if (!cacheFiles.exists()) cacheFiles.mkdirs()
|
||||
if (!cacheFiles.exists()) {
|
||||
cacheFiles.mkdirs()
|
||||
}
|
||||
|
||||
def mavenMetadata = new File(cacheFiles, "maven-metadata.xml")
|
||||
|
||||
|
|
Loading…
Reference in a new issue