From e1924e0d2ff7a6a0a7b12c95196489c61d6282f9 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <sergey.igushkin@jetbrains.com>
Date: Mon, 28 Aug 2017 15:05:46 +0300
Subject: [PATCH] (minor) Modify warning logic for separate classes dirs
 opt-out flag

(cherry picked from commit 0dfe1a1)
---
 .../gradle/plugin/CopyClassesToJavaOutputStatus.kt       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/CopyClassesToJavaOutputStatus.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/CopyClassesToJavaOutputStatus.kt
index 6c0c5307dde..d1b288ac6ff 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/CopyClassesToJavaOutputStatus.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/CopyClassesToJavaOutputStatus.kt
@@ -12,10 +12,13 @@ object CopyClassesToJavaOutputStatus {
     fun isEnabled(project: Project): Boolean {
         val kotlinJvmExt = project.kotlinJvmExt ?: return false
         if (kotlinJvmExt.copyClassesToJavaOutput) {
-            if (isGradleVersionTooLow(project) && warningReportedForProject.add(project)) {
-                project.logger.kotlinWarn(gradleVersionTooLowWarningMessage)
+            if (isGradleVersionTooLow(project)) {
+                if (warningReportedForProject.add(project)) {
+                    project.logger.kotlinWarn(gradleVersionTooLowWarningMessage)
+                }
+            } else {
+                addCacheWarningToJavaTasks(project)
             }
-            addCacheWarningToJavaTasks(project)
             return true
         }
         return false