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

Add extension operators plus and minus for FileCollection to make them resolve into gradle api, rather than collection api.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-09-26 00:12:31 +03:00
parent 3915cfcea6
commit 0a24ba77b5
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
+2 -2
View File
@@ -46,7 +46,7 @@ fun Project.initKapt(
val stubsDir = File(getBuildDir(), "tmp/kapt/$variantName/classFileStubs") val stubsDir = File(getBuildDir(), "tmp/kapt/$variantName/classFileStubs")
kotlinTask.extensions.extraProperties.set("kaptStubsDir", stubsDir) kotlinTask.extensions.extraProperties.set("kaptStubsDir", stubsDir)
javaTask.classpath = javaTask.classpath + files(stubsDir) javaTask.classpath += files(stubsDir)
kotlinTask.doFirst { kotlinTask.doFirst {
kotlinAfterJavaTask.source(kotlinTask.source) kotlinAfterJavaTask.source(kotlinTask.source)
@@ -226,7 +226,7 @@ public class AnnotationProcessingManager(
} }
private fun JavaCompile.appendClasspath(file: File) { private fun JavaCompile.appendClasspath(file: File) {
setClasspath(getClasspath() + project.files(file)) classpath += project.files(file)
} }
private fun addWrappersToCompilerArgs(javaTask: JavaCompile, wrapperFqNames: String) { private fun addWrappersToCompilerArgs(javaTask: JavaCompile, wrapperFqNames: String) {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+4
View File
@@ -25,6 +25,7 @@ import kotlin.properties.Delegates
import org.gradle.api.tasks.Delete import org.gradle.api.tasks.Delete
import groovy.lang.Closure import groovy.lang.Closure
import org.gradle.api.artifacts.Configuration import org.gradle.api.artifacts.Configuration
import org.gradle.api.file.FileCollection
import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider
import java.util.ServiceLoader import java.util.ServiceLoader
import org.gradle.api.logging.* import org.gradle.api.logging.*
@@ -538,6 +539,9 @@ open class GradleUtils(val scriptHandler: ScriptHandler, val project: ProjectInt
public fun resolveJsLibrary(): File = resolveDependencies(kotlinJsLibraryCoordinates()).first() public fun resolveJsLibrary(): File = resolveDependencies(kotlinJsLibraryCoordinates()).first()
} }
internal operator fun FileCollection.plus(other: FileCollection) = this.plus(other)
internal operator fun FileCollection.minus(other: FileCollection) = this.minus(other)
fun AbstractCompile.storeKaptAnnotationsFile(kapt: AnnotationProcessingManager) { fun AbstractCompile.storeKaptAnnotationsFile(kapt: AnnotationProcessingManager) {
extensions.extraProperties.set("kaptAnnotationsFile", kapt.getAnnotationFile()) extensions.extraProperties.set("kaptAnnotationsFile", kapt.getAnnotationFile())
} }