From f2fd28e84fc4e6ac9a5dd1724c9f37b4b73b6665 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Wed, 16 Jan 2019 19:00:21 +0300 Subject: [PATCH] JPS build: add idea settings to build.gradle.kts #KT-29323 Fixed --- build.gradle.kts | 37 +++++++++++++++++++++++++++++++++++++ buildSrc/build.gradle.kts | 3 +++ 2 files changed, 40 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index b189dd6c94b..c244714cc3a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,6 +5,8 @@ import org.gradle.api.file.FileCollection import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import proguard.gradle.ProGuardTask +import org.gradle.kotlin.dsl.* +import org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.* buildscript { extra["defaultSnapshotVersion"] = "1.3-SNAPSHOT" @@ -35,6 +37,7 @@ plugins { `build-scan` version "1.15" idea id("jps-compatible") + id("org.jetbrains.gradle.plugin.idea-ext") } pill { @@ -807,3 +810,37 @@ allprojects { } } } + +allprojects { + apply(mapOf("plugin" to "idea")) +} + +val isJpsBuildEnabled = findProperty("jpsBuild")?.toString() == "true" +if (isJpsBuildEnabled) { + afterEvaluate { + allprojects { + idea { + module { + inheritOutputDirs = true + } + } + } + + rootProject.idea { + project { + settings { + compiler { + processHeapSize = 2000 + addNotNullAssertions = true + parallelCompilation = true + } + + delegateActions { + delegateBuildRunToGradle = false + testRunner = PLATFORM + } + } + } + } + } +} \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6264fff8b3f..f33bf4f7417 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -87,6 +87,7 @@ repositories { jcenter() maven("https://jetbrains.bintray.com/intellij-third-party-dependencies/") + maven("https://plugins.gradle.org/m2/") } dependencies { @@ -97,6 +98,8 @@ dependencies { compile("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}") compile("org.jetbrains.intellij.deps:asm-all:7.0") + + compile("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.4.2") } samWithReceiver {