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

Support Android source sets in annotation processing

Browse Source
This commit is contained in:
Yan Zhulanow
2015-05-15 17:39:24 +03:00
parent 905eb01044
commit c6e11949b8
1 changed files with 12 additions and 23 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/plugin/KotlinPlugin.kt
+12 -23
View File
@@ -278,6 +278,8 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
}
}
val aptConfigurations = hashMapOf<String, Configuration>()
ext.getSourceSets().all(Action<AndroidSourceSet> { sourceSet ->
if (sourceSet is HasConvention) {
val sourceSetName = sourceSet.getName()
@@ -286,6 +288,11 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
val kotlinDirSet = kotlinSourceSet.getKotlin()
kotlinDirSet.srcDir(project.file("src/${sourceSetName}/kotlin"))
val aptConfigurationName = if (sourceSet.getName() != "main") {
"kotlinApt${sourceSet.getName().capitalize()}"
} else "kotlinApt"
aptConfigurations.put(sourceSet.getName(), project.getConfigurations().create(aptConfigurationName))
/*TODO: before 0.11 gradle android plugin there was:
sourceSet.getAllJava().source(kotlinDirSet)
@@ -301,18 +308,6 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
(ext as ExtensionAware).getExtensions().add("kotlinOptions", tasksProvider.kotlinJVMOptionsClass)
fun addConfiguration(name: String): Configuration =
project.getConfigurations().create(name)
val kotlinAptConfiguration = addConfiguration("kotlinApt")
val kotlinAptAndroidTestConfiguration = addConfiguration("kotlinAptAndroidTest")
val kotlinAptTestConfiguration = addConfiguration("kotlinAptTest")
val aptConfigurations = mapOf(
"base" to kotlinAptConfiguration,
"androidTest" to kotlinAptAndroidTestConfiguration,
"unitTest" to kotlinAptTestConfiguration)
project afterEvaluate { project ->
if (project != null) {
val plugin = (project.getPlugins().findPlugin("android")
@@ -320,7 +315,8 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
val aptConfigurationDependencyFiles = aptConfigurations.mapValues { it.getValue().resolve() }
processVariantData(plugin.getVariantManager().getVariantDataList(), project, ext, plugin, aptConfigurationDependencyFiles)
processVariantData(plugin.getVariantManager().getVariantDataList(), project,
ext, plugin, aptConfigurationDependencyFiles)
}
}
@@ -379,6 +375,8 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
configureDefaultSourceSet()
val aptFiles = arrayListOf<File>()
// getSortedSourceProviders should return only actual java sources, generated sources should be collected earlier
val providers = variantData.getVariantConfiguration().getSortedSourceProviders()
for (provider in providers) {
@@ -388,20 +386,11 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
kotlinTask.source(kotlinSourceDirectorySet)
kotlinSourceDirectorySet.addSourceDirectories(javaSrcDirs)
aptFiles.addAll(aptConfigurations[(provider as AndroidSourceSet).getName()])
}
subpluginEnvironment.addSubpluginArguments(project, kotlinTask)
fun filesForConfigurations(configurationIds: Array<String>): Set<File> {
return configurationIds.flatMap { aptConfigurations[it]?.toList() ?: listOf() }.distinct()
}
val aptFiles = filesForConfigurations(when (variantData.getType()) {
VariantType.UNIT_TEST -> arrayOf("base", "unitTest")
VariantType.ANDROID_TEST -> arrayOf("base", "androidTest")
else -> arrayOf("base")
})
kotlinTask.setProperty("aptFiles", aptFiles)
val aptOutputDir = project.file(File(project.getBuildDir(), "generated/source/kotlinApt"))