Take intellij-core-analysis back

Use plain maven-like repository to resolve it,
remove usage of gradle-intellij-plugin

6 files changed, 24 insertions, 86 deletions

diff --git a/build.gradle b/build.gradle
index 92de25cc..f9c2bd70 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,6 @@ allprojects {
             maven { url "http://dl.bintray.com/kotlin/kotlin-eap" }
             maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
             maven { url "https://plugins.gradle.org/m2/" }
-            maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-            maven { url "http://dl.bintray.com/jetbrains/intellij-plugin-service" }
             ivy(repo)
         }
         dependencies {
diff --git a/core/build.gradle b/core/build.gradle
index c31b3945..3c602a6b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -3,7 +3,6 @@ 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"
     }
 }
 
@@ -11,6 +10,15 @@ apply plugin: 'kotlin'
 
 sourceCompatibility = 1.6
 
+repositories {
+    maven { url 'https://www.jetbrains.com/intellij-repository/snapshots' }
+    maven { url 'https://www.jetbrains.com/intellij-repository/releases' }
+}
+
+configurations {
+    intellijCore
+}
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_compiler_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_compiler_version"
@@ -34,30 +42,15 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     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'
+    intellijCore "com.jetbrains.intellij.idea:intellij-core:$ideaVersion"
+}
 
-{ ->
-    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")
+        compile zipTree(configurations.intellijCore.singleFile).matching ({
+            include("intellij-core-analysis.jar")
+        })
     }
-}
+}
\ No newline at end of file
diff --git a/runners/gradle-plugin/build.gradle b/runners/gradle-plugin/build.gradle
index 5af6b427..fff58092 100644
--- a/runners/gradle-plugin/build.gradle
+++ b/runners/gradle-plugin/build.gradle
@@ -10,6 +10,14 @@ tasks.withType(AbstractCompile) {
     classpath += configurations.shadow
 }
 
+
+compileKotlin {
+
+    kotlinOptions {
+        freeCompilerArgs += "-Xjsr305-annotations=strict"
+    }
+
+}
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
 
diff --git a/settings.gradle b/settings.gradle
index e6694bf9..4dcfd255 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,5 +6,4 @@ include 'core',
         'runners:maven-plugin',
         'runners:gradle-plugin',
         'runners:android-gradle-plugin',
-        'runners:gradle-integration-tests',
-        'strippedIdeaJar'
+        'runners:gradle-integration-tests'
diff --git a/strippedIdeaJar/build.gradle b/strippedIdeaJar/build.gradle
deleted file mode 100644
index e8104d00..00000000
--- a/strippedIdeaJar/build.gradle
+++ /dev/null
@@ -1,52 +0,0 @@
-import proguard.gradle.ProGuardTask
-
-buildscript {
-    dependencies {
-        classpath "org.jetbrains.intellij.plugins:gradle-intellij-plugin:$gradle_intellij_plugin_version"
-        classpath "net.sf.proguard:proguard-gradle:5.3.3"
-    }
-}
-
-apply plugin: 'org.jetbrains.intellij'
-
-{ ->
-    intellij {
-        version = ideaVersion
-        instrumentCode = false
-        configureDefaultDependencies = false
-    }
-
-    ["patchPluginXml", "prepareSandbox", "prepareTestingSandbox",
-     "verifyPlugin", "runIde", "buildPlugin", "publishPlugin"].each {
-        tasks.remove(tasks.findByName(it))
-    }
-}()
-
-configurations {
-    proguardInput
-    proguardOut
-}
-
-afterEvaluate {
-    dependencies {
-        proguardInput intellij { include("idea.jar") }
-    }
-}
-
-
-task strip(type: ProGuardTask) {
-    configuration file('ideaJar.pro')
-    afterEvaluate {
-        injars configurations.proguardInput.files, filter: "**.class"
-        outjars file("$buildDir/idea-stripped.jar")
-    }
-}
-
-
-afterEvaluate {
-    artifacts {
-        proguardOut(strip.outputs.files.singleFile) {
-            builtBy strip
-        }
-    }
-}
\ No newline at end of file
diff --git a/strippedIdeaJar/ideaJar.pro b/strippedIdeaJar/ideaJar.pro
deleted file mode 100644
index 63efbd95..00000000
--- a/strippedIdeaJar/ideaJar.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-
--dontwarn **
-
--dontobfuscate
--dontoptimize
-
--keep class com.intellij.openapi.roots.impl.ProjectOrderEnumerator { *; }
--keep class com.intellij.core.CoreModuleManager { *; }