From 630d09010340d27b6be8fbb4f844bf2af1bef846 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Mon, 18 Sep 2017 18:41:08 +0200
Subject: [PATCH] Fix after rebasing on master

---
 idea/idea-gradle/build.gradle.kts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts
index 958952c0c04..65188e139ed 100644
--- a/idea/idea-gradle/build.gradle.kts
+++ b/idea/idea-gradle/build.gradle.kts
@@ -3,7 +3,7 @@ apply { plugin("kotlin") }
 dependencies {
 
     compileOnly(ideaSdkDeps("openapi", "idea", "external-system-rt"))
-    compileOnly(ideaPluginDeps("gradle-tooling-api", "gradle", plugin = "gradle"))
+    compileOnly(ideaPluginDeps("gradle-tooling-api", "gradle", "gradle-base-services", plugin = "gradle"))
     compileOnly(ideaPluginDeps("Groovy", plugin = "Groovy"))
 
     compileOnly(project(":idea"))
@@ -43,7 +43,10 @@ dependencies {
 }
 
 sourceSets {
-    "main" { projectDefault() }
+    "main" {
+        projectDefault()
+        resources.srcDir("res").apply { include("**") }
+    }
     "test" { projectDefault() }
 }