From 8848d7a0438a1de4c9ed6afde7d63bd27ff2c234 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 28 Jun 2018 00:33:57 +0300 Subject: [PATCH] Remove groovy plugin from kotlin-gradle-plugin build script --- libraries/tools/kotlin-gradle-plugin/build.gradle | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/build.gradle index 267c0951b42..f6ff5131274 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'java' apply plugin: 'java-gradle-plugin' apply plugin: 'kotlin' -apply plugin: 'groovy' apply plugin: 'org.jetbrains.dokka' apply plugin: 'jps-compatible' @@ -87,24 +86,14 @@ tasks.withType(project.compileKotlin.class) { kotlinOptions.jdkHome = JDK_18 } -compileKotlin.dependsOn compileGroovy -compileGroovy.dependsOn.remove("compileJava") - -def groovyClassesDir = file("${buildDir}/mainGroovyClasses") -compileGroovy.destinationDir = groovyClassesDir -sourceSets.main.compileClasspath += files(groovyClassesDir) -compileGroovy.classpath = sourceSets.main.compileClasspath - files(groovyClassesDir) sourceSets.main.java.srcDirs += sourceSets.main.kotlin.srcDirs sourceSets { agp25 { compileClasspath += configurations.compile + configurations.agp25CompileOnly + sourceSets.main.output - compileClasspath += files(groovyClassesDir) } } -compileAgp25Kotlin.dependsOn compileGroovy - processResources { def props = ["projectVersion" : project.version] inputs.properties(props) @@ -114,7 +103,6 @@ processResources { jar.dependsOn agp25Classes jar { - from compileGroovy.destinationDir from sourceSets.agp25.output.classesDirs manifestAttributes(manifest, project) }