Use 'idea' plugin to specify excluded dirs

This commit is contained in:
Ilya Gorbunov
2017-10-05 15:10:19 +03:00
parent a8766a00c6
commit 5f51a293ba
2 changed files with 19 additions and 19 deletions
-19
View File
@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="kotlin" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="org.jetbrains.kotlin" external.system.module.version="1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../..">
<excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
<excludeFolder url="file://$MODULE_DIR$/../../build" />
<excludeFolder url="file://$MODULE_DIR$/../../dependencies" />
<excludeFolder url="file://$MODULE_DIR$/../../dist" />
<excludeFolder url="file://$MODULE_DIR$/../../ideaSDK/androidSDK" />
<excludeFolder url="file://$MODULE_DIR$/../../ideaSDK/config" />
<excludeFolder url="file://$MODULE_DIR$/../../ideaSDK/config-idea" />
<excludeFolder url="file://$MODULE_DIR$/../../ideaSDK/system" />
<excludeFolder url="file://$MODULE_DIR$/../../ideaSDK/system-idea" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
+19
View File
@@ -2,6 +2,7 @@ import org.gradle.api.Project
import java.util.*
import java.io.File
import org.gradle.api.tasks.bundling.Jar
import org.gradle.plugins.ide.idea.model.IdeaModel
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
@@ -34,6 +35,7 @@ buildscript {
plugins {
`build-scan`
idea
}
buildScan {
@@ -447,6 +449,23 @@ tasks {
"check" { dependsOn("test") }
}
the<IdeaModel>().apply {
module {
excludeDirs = files(
project.buildDir,
".gradle",
"dependencies",
"dist",
"ideaSDK/bin",
"ideaSDK/androidSDK",
"ideaSDK/config",
"ideaSDK/config-idea",
"ideaSDK/system",
"ideaSDK/system-idea"
).toSet()
}
}
fun jdkPathIfFound(version: String): String? {
val jdkName = "JDK_${version.replace(".", "")}"
val jdkMajorVersion = JdkMajorVersion.valueOf(jdkName)