From c17a5bc8f27b5b520db5a28f35c1c1b2f794f0ed Mon Sep 17 00:00:00 2001
From: Andrey Uskov <Andrey.Uskov@jetbrains.com>
Date: Wed, 24 Jul 2019 12:55:18 +0300
Subject: [PATCH] Disable KaptImportingTest.testModulePerSourceSet in AS
 (KT-32683)

#KT-32683 Fixed
---
 .../org/jetbrains/kotlin/gradle/KaptImportingTest.kt      | 5 +++++
 .../kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt | 4 +++-
 .../gradle/MultiplatformTestCompatibilityMatrix.kt.as33   | 8 ++++++++
 .../gradle/MultiplatformTestCompatibilityMatrix.kt.as34   | 8 ++++++++
 .../gradle/MultiplatformTestCompatibilityMatrix.kt.as35   | 8 ++++++++
 .../gradle/MultiplatformTestCompatibilityMatrix.kt.as36   | 8 ++++++++
 6 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt
index 7dd1b4c4179..48334e1ca64 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt
@@ -30,6 +30,11 @@ class KaptImportingTest : MultiplePluginVersionGradleImportingTestCase() {
 
     @Test
     fun testModulePerSourceSet() {
+        // Disable testing import module per source set test in Android Studio as this mode is not supported in Android Studio
+        if (isAndroidStudio()) {
+            return
+        }
+
         configureByFiles()
         importProject(true)
 
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt
index aeee1b3be2a..74b1d77b95d 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt
@@ -12,4 +12,6 @@ fun MultiplatformProjectImportingTest.shouldRunTest(kotlinPluginVersion: String,
 
 fun NewMultiplatformProjectImportingTest.shouldRunTest(kotlinPluginVersion: String, gradleVersion: String): Boolean {
     return !gradleVersion.startsWith("3.")
-}
\ No newline at end of file
+}
+
+fun KaptImportingTest.isAndroidStudio() = false
\ No newline at end of file
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as33 b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as33
index e69de29bb2d..6bbb8c73dc3 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as33
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as33
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle
+
+fun KaptImportingTest.isAndroidStudio() = true
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as34 b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as34
index e69de29bb2d..6bbb8c73dc3 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as34
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as34
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle
+
+fun KaptImportingTest.isAndroidStudio() = true
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as35 b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as35
index e69de29bb2d..6bbb8c73dc3 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as35
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as35
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle
+
+fun KaptImportingTest.isAndroidStudio() = true
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as36 b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as36
index e69de29bb2d..6bbb8c73dc3 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as36
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt.as36
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle
+
+fun KaptImportingTest.isAndroidStudio() = true