diff --git a/build.gradle b/build.gradle index 799bc7d521..9d7c1011f2 100644 --- a/build.gradle +++ b/build.gradle @@ -186,7 +186,7 @@ allprojects{ maven{ url 'https://jitpack.io' } } - tasks.register('clearCache'){ + task clearCache{ doFirst{ delete{ delete "$rootDir/core/assets/cache" @@ -272,7 +272,7 @@ project(":core"){ compileJava.options.fork = true - tasks.register('preGen'){ + task preGen{ outputs.upToDateWhen{ false } generateLocales() writeVersion() @@ -280,7 +280,7 @@ project(":core"){ writePlugins() } - tasks.register('copyChangelog'){ + task copyChangelog{ doLast{ def props = loadVersionProps() def androidVersion = props['androidBuildCode'].toInteger() - 2 @@ -288,9 +288,9 @@ project(":core"){ def notice = "[This is a truncated changelog, see Github for full notes]" def maxLength = 460 - def androidLogList = [notice] + loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]") } + def androidLogList = [notice] + loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]")} def result = "" - androidLogList.forEach{ line -> + androidLogList.forEach{line -> if(result.length() + line.length() + 1 < maxLength){ result += line + "\n" } @@ -304,21 +304,19 @@ project(":core"){ } } - tasks.register('sourcesJar', Jar){ - dependsOn classes + task sourcesJar(type: Jar, dependsOn: classes){ archiveClassifier = 'sources' from sourceSets.main.allSource } - tasks.register('assetsJar', Jar){ - dependsOn ":tools:pack" + task assetsJar(type: Jar, dependsOn: ":tools:pack"){ archiveClassifier = 'assets' from files("assets"){ exclude "config", "cache", "music", "sounds", "sprites/fallback" } } - tasks.register('musicJar', Jar){ + task musicJar(type: Jar){ archiveClassifier = 'music' from files("assets"){ include "music/*", "sounds/*" @@ -461,8 +459,8 @@ configure([":core", ":server"].collect{project(it)}){ } } -tasks.register('deployAll'){ - tasks.register('cleanDeployOutput'){ +task deployAll{ + task cleanDeployOutput{ doFirst{ if(getBuildVersion() == "custom build" || getBuildVersion() == "") throw new IllegalArgumentException("----\n\nSET A BUILD NUMBER FIRST!\n\n----") if(!project.hasProperty("release")) throw new IllegalArgumentException("----\n\nSET THE RELEASE PROJECT PROPERTY FIRST!\n\n----") @@ -484,11 +482,11 @@ tasks.register('deployAll'){ } } -tasks.register('resolveDependencies'){ +task resolveDependencies{ doLast{ rootProject.allprojects{ project -> Set configurations = project.buildscript.configurations + project.configurations - configurations.findAll{ c -> c.canBeResolved }.forEach{ c -> c.resolve() } + configurations.findAll{c -> c.canBeResolved}.forEach{c -> c.resolve()} } } }