diff options
author | Dominik Stadler <centic@apache.org> | 2019-10-26 05:26:56 +0000 |
---|---|---|
committer | Dominik Stadler <centic@apache.org> | 2019-10-26 05:26:56 +0000 |
commit | b574f4492020ace25e37df4b1da515a5f154314b (patch) | |
tree | 4e6763b159af97eb6f374745148e8705f5d00a2b /build.gradle | |
parent | 14812bee45f28ae07d32da4873ee434a7210224e (diff) | |
download | poi-b574f4492020ace25e37df4b1da515a5f154314b.tar.gz poi-b574f4492020ace25e37df4b1da515a5f154314b.zip |
Update to latest Gradle 5.6 to allow to build with newer Java versions
Adjust build.gradle slightly to work with new version of Gradle
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1868983 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/build.gradle b/build.gradle index 8c671456ec..85faeb64e2 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,20 @@ ant.taskdef(name: "junit", classname: "org.apache.tools.ant.taskdefs.optional.junit.JUnitTask", classpath: configurations.antLibs.asPath) -ant.importBuild 'build.xml' +wrapper { + gradleVersion = '5.6' +} + +task adjustWrapperPropertiesFile { + doLast { + ant.replaceregexp(match:'^#.*', replace:'', flags:'g', byline:true) { + fileset(dir: project.projectDir, includes: 'gradle/wrapper/gradle-wrapper.properties') + } + new File(project.projectDir, 'gradle/wrapper/gradle-wrapper.properties').with { it.text = it.readLines().findAll { it }.sort().join('\n') } + ant.fixcrlf(file: 'gradle/wrapper/gradle-wrapper.properties', eol: 'lf') + } +} +wrapper.finalizedBy adjustWrapperPropertiesFile /** @@ -61,21 +74,6 @@ Define properties for all projects, including this one */ allprojects { apply plugin: 'eclipse' - - task wrapper(type: Wrapper) { - gradleVersion = '4.10.3' - } - - task adjustWrapperPropertiesFile { - doLast { - ant.replaceregexp(match:'^#.*', replace:'', flags:'g', byline:true) { - fileset(dir: project.projectDir, includes: 'gradle/wrapper/gradle-wrapper.properties') - } - new File(project.projectDir, 'gradle/wrapper/gradle-wrapper.properties').with { it.text = it.readLines().findAll { it }.sort().join('\n') } - ant.fixcrlf(file: 'gradle/wrapper/gradle-wrapper.properties', eol: 'lf') - } - } - wrapper.finalizedBy adjustWrapperPropertiesFile } /** |