erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 16:28:12 -07:00
Code Releases Activity

Fix BuildConfig directory bug.

Browse source
This commit is contained in:
Cedric Beust 2016-03-01 03:15:31 +04:00
parent db90b596d2
commit f718dd6c94
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
View file

@ -171,7 +171,7 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
val result = KFiles.makeDir(KFiles.generatedSourceDir(project, this, "buildConfig")) val result = KFiles.makeDir(KFiles.generatedSourceDir(project, this, "buildConfig"))
// Make sure the generatedSourceDirectory doesn't contain the project.directory since // Make sure the generatedSourceDirectory doesn't contain the project.directory since
// that directory will be added when trying to find recursively all the sources in it // that directory will be added when trying to find recursively all the sources in it
generatedSourceDirectory = File(result.relativeTo(File(project.directory)).absolutePath) generatedSourceDirectory = result.relativeTo(File(project.directory))
val outputGeneratedSourceDirectory = File(result, pkg.replace('.', File.separatorChar)) val outputGeneratedSourceDirectory = File(result, pkg.replace('.', File.separatorChar))
val outputDir = File(outputGeneratedSourceDirectory, "BuildConfig." + contributor.buildConfigSuffix) val outputDir = File(outputGeneratedSourceDirectory, "BuildConfig." + contributor.buildConfigSuffix)
KFiles.saveFile(outputDir, code) KFiles.saveFile(outputDir, code)

9
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
View file

@ -161,13 +161,16 @@ open class JvmCompilerPlugin @Inject constructor(
private fun doTaskCompileTest(project: Project) = doTaskCompile(project, isTest = true) private fun doTaskCompileTest(project: Project) = doTaskCompile(project, isTest = true)
private fun doTaskCompile(project: Project, isTest: Boolean): TaskResult { private fun doTaskCompile(project: Project, isTest: Boolean): TaskResult {
// Set up the source files now that we have the variant // Generate the BuildConfig before invoking sourceDirectories() since that call
sourceDirectories.addAll(context.variant.sourceDirectories(project, context, SourceSet.of(isTest))) // might add the buildConfig source directori
val sourceDirectory = context.variant.maybeGenerateBuildConfig(project, context) val sourceDirectory = context.variant.maybeGenerateBuildConfig(project, context)
if (sourceDirectory != null) { if (sourceDirectory != null) {
sourceDirectories.add(sourceDirectory) sourceDirectories.add(sourceDirectory)
} }
// Set up the source files now that we have the variant
sourceDirectories.addAll(context.variant.sourceDirectories(project, context, SourceSet.of(isTest)))
val results = arrayListOf<TaskResult>() val results = arrayListOf<TaskResult>()
val compilerContributors = ActorUtils.selectAffinityActors(project, context, val compilerContributors = ActorUtils.selectAffinityActors(project, context,