[Pill] Remove 'jps-compatible' plugin from the root Kotlin project
'excludedDirs' definition is not needed anymore, so the plugin usage is not really useful.
This commit is contained in:
@@ -32,7 +32,6 @@ buildscript {
|
|||||||
plugins {
|
plugins {
|
||||||
base
|
base
|
||||||
idea
|
idea
|
||||||
id("jps-compatible")
|
|
||||||
id("org.jetbrains.gradle.plugin.idea-ext") version "1.0.1" // this version should be in sync with repo/buildsrc-compat/build.gradle.kts
|
id("org.jetbrains.gradle.plugin.idea-ext") version "1.0.1" // this version should be in sync with repo/buildsrc-compat/build.gradle.kts
|
||||||
id("build-time-report")
|
id("build-time-report")
|
||||||
id("java-instrumentation")
|
id("java-instrumentation")
|
||||||
@@ -50,15 +49,6 @@ plugins {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pill {
|
|
||||||
excludedDirs(
|
|
||||||
"out",
|
|
||||||
"buildSrc/build",
|
|
||||||
"buildSrc/prepare-deps/intellij-sdk/build",
|
|
||||||
"intellij"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
|
val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
|
||||||
|
|
||||||
val defaultSnapshotVersion: String by extra
|
val defaultSnapshotVersion: String by extra
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ class ModelParser(private val modulePrefix: String, private val globalExcludedDi
|
|||||||
}
|
}
|
||||||
|
|
||||||
val (includedProjects, excludedProjects) = project.allprojects
|
val (includedProjects, excludedProjects) = project.allprojects
|
||||||
.partition { it.plugins.hasPlugin("jps-compatible") }
|
.partition { it == project || it.plugins.hasPlugin("jps-compatible") }
|
||||||
|
|
||||||
val modules = includedProjects.flatMap { parseModules(it, excludedProjects) }
|
val modules = includedProjects.flatMap { parseModules(it, excludedProjects) }
|
||||||
val artifacts = parseArtifacts(project)
|
val artifacts = parseArtifacts(project)
|
||||||
|
|||||||
Reference in New Issue
Block a user