From 0d0d7a96595b7ed1012b1d63634b70fc71bae370 Mon Sep 17 00:00:00 2001
From: "Aleksei.Cherepanov" <aleksei.cherepanov@jetbrains.com>
Date: Thu, 28 Apr 2022 15:56:26 +0300
Subject: [PATCH] Fix JPS build for Kotlin

Disable gradle70 sourceSet for JPS buid
---
 .../gradle-plugin-common-configuration.gradle.kts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/buildSrc/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts b/buildSrc/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts
index 4e204266f96..3251c120ae1 100644
--- a/buildSrc/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts
+++ b/buildSrc/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts
@@ -46,10 +46,11 @@ tasks {
 val commonSourceSet = createGradleCommonSourceSet()
 reconfigureMainSourcesSetForGradlePlugin(commonSourceSet)
 publishShadowedJar(sourceSets[SourceSet.MAIN_SOURCE_SET_NAME], commonSourceSet)
-
-// Used for Gradle 7.0+ versions
-val gradle70SourceSet = createGradlePluginVariant(
-    GradlePluginVariant.GRADLE_70,
-    commonSourceSet = commonSourceSet
-)
-publishShadowedJar(gradle70SourceSet, commonSourceSet)
+if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
+    // Used for Gradle 7.0+ versions
+    val gradle70SourceSet = createGradlePluginVariant(
+        GradlePluginVariant.GRADLE_70,
+        commonSourceSet = commonSourceSet
+    )
+    publishShadowedJar(gradle70SourceSet, commonSourceSet)
+}