PL-9800 Use Gradle 4.2

This commit is contained in:
Yuriy Artamonov 2017-10-09 09:56:14 +04:00
parent b7950c6744
commit 2161381eeb
2 changed files with 5 additions and 5 deletions

View File

@ -293,8 +293,8 @@ configure(globalModule) {
}
task generateReleaseTimestamp(type: CubaReleaseTimeStamp) {
releaseTimeStampPath = "$buildDir/classes/main/com/haulmont/cuba/core/global/release.timestamp"
releaseNumberPath = "$buildDir/classes/main/com/haulmont/cuba/core/global/release.number"
releaseTimeStampPath = "${sourceSets.main.java.outputDir}/com/haulmont/cuba/core/global/release.timestamp"
releaseNumberPath = "${sourceSets.main.java.outputDir}/com/haulmont/cuba/core/global/release.number"
}
task enhance(type: CubaEnhancing)
@ -332,7 +332,8 @@ configure(globalModule) {
sourceJar {
exclude '**/entity/dummy/*'
exclude {
(it.file.name == 'base-persistence.xml' || it.file.name == 'cuba-persistence.xml') && sourceSets.main.java.srcDirs.contains(it.file.parentFile)
(it.file.name == 'base-persistence.xml' || it.file.name == 'cuba-persistence.xml') &&
sourceSets.main.java.srcDirs.contains(it.file.parentFile)
}
from "$buildDir/tmp/filtered"
}

View File

@ -1,6 +1,5 @@
#Fri Dec 09 12:01:27 SAMT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip