Make all dependencies to idea sdk intransitive

This commit is contained in:
Ilya Chernikov
2017-11-24 17:42:06 +01:00
committed by Vyacheslav Gerasimov
parent e76cd802d8
commit a4f28cd94f
65 changed files with 341 additions and 106 deletions
@@ -1,3 +1,8 @@
plugins {
id 'org.jetbrains.intellij'
}
apply plugin: 'kotlin'
apply plugin: 'maven'
@@ -6,6 +11,13 @@ repositories {
jcenter()
}
intellij {
version = rootProject.ext["versions.intellij"]
instrumentCode = false
configureDefaultDependencies = false
extraDependencies = ['intellij-core']
}
dependencies {
compile project(':kotlin-gradle-plugin-api')
// Use this dependency instead when building apart from the other modules:
@@ -20,4 +32,10 @@ dependencies {
compileOnly project(':compiler:cli')
compileOnly gradleApi()
}
afterEvaluate {
dependencies {
compileOnly intellijExtra('intellij-core')
}
}
@@ -13,6 +13,10 @@ buildscript {
}
}
plugins {
id 'org.jetbrains.intellij'
}
configureJvmProject(project)
configurePublishing(project)
@@ -22,6 +26,13 @@ repositories {
maven { url 'https://maven.google.com' }
}
intellij {
version = rootProject.ext["versions.intellij"]
instrumentCode = false
configureDefaultDependencies = false
extraDependencies = ['intellij-core']
}
configurations {
agp25CompileOnly
}
@@ -65,6 +76,12 @@ dependencies {
testCompileOnly project(':kotlin-annotation-processing-gradle')
}
afterEvaluate {
dependencies {
compileOnly intellijExtra('intellij-core')
}
}
tasks.withType(project.compileKotlin.class) {
kotlinOptions.jdkHome = JDK_18
}
@@ -3,6 +3,8 @@ description = "Kotlin scripting support utilities"
apply { plugin("kotlin") }
configureIntellijPlugin()
dependencies {
compile(project(":kotlin-stdlib"))
compile(project(":kotlin-script-runtime"))
@@ -22,6 +24,13 @@ dependencies {
testRuntime("org.apache.maven:maven-core:3.0.3")
}
afterEvaluate {
dependencies {
compileOnly(intellij { include("openapi.jar", "util.jar") })
testCompile(intellij { include("openapi.jar", "util.jar") })
}
}
projectTest()
runtimeJar()