azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ide dependencies in gradle-plugin module

Browse Source
This commit is contained in:
Ilya Chernikov
2017-10-04 12:12:43 +02:00
parent f48d0f4b15
commit f00fcddc76
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-annotation-processing/build.gradle.kts
-5
View File
@@ -31,11 +31,6 @@ projectTest {
workingDir = projectDir
}
val jar by tasks
jar.apply {
enabled = false
}
runtimeJar(task<ShadowJar>("shadowJar")) {
from(packedJars)
from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
libraries/tools/kotlin-gradle-plugin/build.gradle
+12 -3
View File
@@ -28,26 +28,35 @@ configurations {
dependencies {
compile project(':kotlin-gradle-plugin-api')
compile project(path: ':kotlin-compiler-embeddable', configuration: "runtimeJar")
compileOnly project(':compiler')
compileOnly project(':compiler:incremental-compilation-impl')
compile project(':kotlin-stdlib')
compile project(':kotlin-android-extensions')
compile project(':kotlin-build-common')
compile project(':kotlin-compiler-runner')
// compileOnly project(":compiler:daemon")
compile project(path: ':kotlin-annotation-processing-gradle', configuration: "runtimeJar")
compileOnly project(':kotlin-annotation-processing')
compileOnly project(':kotlin-annotation-processing-gradle')
compileOnly 'com.android.tools.build:gradle:2.0.0'
compileOnly 'org.codehaus.groovy:groovy-all:2.3.9'
compileOnly 'org.jetbrains.kotlin:gradle-api:2.2'
runtime project(path: ':kotlin-compiler-embeddable', configuration: "runtimeJar")
runtime project(path: ':kotlin-annotation-processing-gradle', configuration: "runtimeJar")
agp25CompileOnly 'com.android.tools.build:gradle:3.0.0-alpha1'
agp25CompileOnly 'org.codehaus.groovy:groovy-all:2.3.9'
agp25CompileOnly gradleApi()
agp25CompileOnly project(':kotlin-annotation-processing')
agp25CompileOnly project(':kotlin-annotation-processing-gradle')
testCompileOnly project(':compiler')
testCompile project (path: ':kotlin-build-common', configuration: 'tests-jar')
testCompile project(':kotlin-test::kotlin-test-junit')
testCompile "junit:junit:4.12"
testCompileOnly project(':kotlin-annotation-processing')
testCompileOnly project(':kotlin-annotation-processing-gradle')
}
tasks.withType(project.compileKotlin.class) {