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

Fix Gradle plugin build with Gradle 5.0

Browse Source 
* Due to 'improved POM support' introduced in 5.0, runtime dependencies
of the `compileOnly 'com.android.tools.build:gradle:...'` dependency
were no more transitively available. Add them manually;

* Add `!!` to usages of `resourcesDir`, which became nullable;

* Replace the dropped `classesDir` method usages with reflection;
This commit is contained in:
Sergey Igushkin
2018-12-06 17:38:05 +03:00
committed by Vyacheslav Gerasimov
parent e8f1e2d022
commit 2a14301c75
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+4 -2
View File
@@ -1,5 +1,4 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.gradle.publish.PluginConfig
import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.pill.PillExtension import org.jetbrains.kotlin.pill.PillExtension
@@ -46,6 +45,9 @@ dependencies {
compileOnly(project(":kotlin-scripting-compiler")) compileOnly(project(":kotlin-scripting-compiler"))
compileOnly("com.android.tools.build:gradle:2.0.0") compileOnly("com.android.tools.build:gradle:2.0.0")
compileOnly("com.android.tools.build:gradle-core:2.0.0")
compileOnly("com.android.tools.build:builder:2.0.0")
compileOnly("com.android.tools.build:builder-model:2.0.0")
compileOnly("org.codehaus.groovy:groovy-all:2.4.12") compileOnly("org.codehaus.groovy:groovy-all:2.4.12")
compileOnly(gradleApi()) compileOnly(gradleApi())
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/builder/KotlinModelBuilder.kt
+1 -1
View File
@@ -95,7 +95,7 @@ class KotlinModelBuilder(private val kotlinPluginVersion: String, private val an
kotlinSourceSet.kotlin.srcDirs, kotlinSourceSet.kotlin.srcDirs,
javaSourceSet.resources.srcDirs, javaSourceSet.resources.srcDirs,
destinationDir, destinationDir,
javaSourceSet.output.resourcesDir, javaSourceSet.output.resourcesDir!!,
createCompilerArguments() createCompilerArguments()
) )
} else null } else null
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilationOutputs.kt
+2 -2
View File
@@ -38,10 +38,10 @@ class KotlinWithJavaCompilationOutput(
get() = compilation.javaSourceSet.output get() = compilation.javaSourceSet.output
override val resourcesDir: File override val resourcesDir: File
get() = javaSourceSetOutput.resourcesDir get() = javaSourceSetOutput.resourcesDir!!
override var resourcesDirProvider: Any override var resourcesDirProvider: Any
get() = javaSourceSetOutput.resourcesDir get() = javaSourceSetOutput.resourcesDir!!
set(value) { set(value) {
javaSourceSetOutput.setResourcesDir(value) javaSourceSetOutput.setResourcesDir(value)
} }