commit a04c6cf8ca99e40b3e665bfe72ae19d7185ba4fd
author Aleksei.Cherepanov <aleksei.cherepanov@jetbrains.com> Thu Apr 28 15:56:26 2022 +0300
committer Aleksei.Cherepanov <aleksei.cherepanov@jetbrains.com> Fri May 06 10:34:45 2022 +0300
tree 5cb1994435514ce4bf03c8fee92ab71f0e9329cd
parent f8ef028da3b0ad673e464106147e600d618770c3

Fix JPS build for Kotlin

Disable gradle70 sourceSet for JPS buid

buildSrc/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts

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 4e20426..3251c12 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 @@
 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)
+}