Remove groovy plugin from kotlin-gradle-plugin build script

This commit is contained in:
Alexey Tsvetkov
2018-06-28 00:33:57 +03:00
parent 22c1907167
commit 8848d7a043
@@ -1,7 +1,6 @@
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'java-gradle-plugin' apply plugin: 'java-gradle-plugin'
apply plugin: 'kotlin' apply plugin: 'kotlin'
apply plugin: 'groovy'
apply plugin: 'org.jetbrains.dokka' apply plugin: 'org.jetbrains.dokka'
apply plugin: 'jps-compatible' apply plugin: 'jps-compatible'
@@ -87,24 +86,14 @@ tasks.withType(project.compileKotlin.class) {
kotlinOptions.jdkHome = JDK_18 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.main.java.srcDirs += sourceSets.main.kotlin.srcDirs
sourceSets { sourceSets {
agp25 { agp25 {
compileClasspath += configurations.compile + configurations.agp25CompileOnly + sourceSets.main.output compileClasspath += configurations.compile + configurations.agp25CompileOnly + sourceSets.main.output
compileClasspath += files(groovyClassesDir)
} }
} }
compileAgp25Kotlin.dependsOn compileGroovy
processResources { processResources {
def props = ["projectVersion" : project.version] def props = ["projectVersion" : project.version]
inputs.properties(props) inputs.properties(props)
@@ -114,7 +103,6 @@ processResources {
jar.dependsOn agp25Classes jar.dependsOn agp25Classes
jar { jar {
from compileGroovy.destinationDir
from sourceSets.agp25.output.classesDirs from sourceSets.agp25.output.classesDirs
manifestAttributes(manifest, project) manifestAttributes(manifest, project)
} }