From 4626531f95e60e03086da163cde5edf5411a8d9b Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Thu, 9 Nov 2017 21:43:37 +0300
Subject: Drop dependency on intellij-core-analysis

Instead of it, download idea.jar and manually strip it
Also, depends on same as kotlin-compiler openapi version
---
 core/build.gradle | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

(limited to 'core/build.gradle')

diff --git a/core/build.gradle b/core/build.gradle
index 3d3e2317..3420e4e7 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -3,6 +3,7 @@ import javax.tools.ToolProvider
 buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_compiler_to_compile_core_version"
+        classpath "org.jetbrains.intellij.plugins:gradle-intellij-plugin:$gradle_intellij_plugin_version"
     }
 }
 
@@ -17,8 +18,6 @@ dependencies {
     compile group: 'com.google.inject', name: 'guice', version: '3.0'
     compile "org.jsoup:jsoup:1.8.3"
 
-    compile files("../lib/intellij-core-analysis.jar")
-
     compile "teamcity:kotlin-compiler:$kotlin_compiler_version"
     compile "teamcity:kotlin-script-runtime:$kotlin_compiler_version"
 
@@ -33,7 +32,32 @@ dependencies {
     compile project(":integration")
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit', version: kotlin_version
+    testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit', version: kotlin_compiler_to_compile_core_version
     testCompile "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
 }
 
+apply plugin: 'org.jetbrains.intellij'
+
+{ ->
+    intellij {
+        version = ideaVersion
+        instrumentCode = false
+        configureDefaultDependencies = false
+        extraDependencies 'intellij-core'
+    }
+
+    ["patchPluginXml", "prepareSandbox", "prepareTestingSandbox",
+     "verifyPlugin", "runIde", "buildPlugin", "publishPlugin"].each {
+        tasks.remove(tasks.findByName(it))
+    }
+}()
+
+afterEvaluate {
+    dependencies {
+        compile intellij {
+            include("openapi.jar")
+        }
+        compile intellijExtra("intellij-core") { include("intellij-core.jar") }
+        compile project(path: ":strippedIdeaJar", configuration: "proguardOut")
+    }
+}
-- 
cgit