azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(minor) Modify warning logic for separate classes dirs opt-out flag

Browse Source 
(cherry picked from commit 0dfe1a1)
This commit is contained in:
Sergey Igushkin
2017-08-28 15:05:46 +03:00
parent 0e28d612e7
commit e1924e0d2f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/CopyClassesToJavaOutputStatus.kt
+6 -3
View File
@@ -12,10 +12,13 @@ object CopyClassesToJavaOutputStatus {
fun isEnabled(project: Project): Boolean { fun isEnabled(project: Project): Boolean {
val kotlinJvmExt = project.kotlinJvmExt ?: return false val kotlinJvmExt = project.kotlinJvmExt ?: return false
if (kotlinJvmExt.copyClassesToJavaOutput) { if (kotlinJvmExt.copyClassesToJavaOutput) {
if (isGradleVersionTooLow(project) && warningReportedForProject.add(project)) { if (isGradleVersionTooLow(project)) {
project.logger.kotlinWarn(gradleVersionTooLowWarningMessage) if (warningReportedForProject.add(project)) {
project.logger.kotlinWarn(gradleVersionTooLowWarningMessage)
}
} else {
addCacheWarningToJavaTasks(project)
} }
addCacheWarningToJavaTasks(project)
return true return true
} }
return false return false