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

IBuildConfigContributor.

Browse source 
Step toward removing javaProject/kotlinProject.
This commit is contained in:
Cedric Beust 2016-02-04 22:21:47 +04:00
parent 08f5fcd04b
commit 691e59f0cb
10 changed files with 63 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -139,18 +139,23 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
?: throw KobaltException(
"packageName needs to be defined on the project in order to generate BuildConfig")
val code = project.projectInfo.generateBuildConfig(project, context, pkg, this, buildConfigs)
val result = KFiles.makeDir(KFiles.generatedSourceDir(project, this, "buildConfig"))
// 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
generatedSourceDirectory = File(result.relativeTo(File(project.directory)))
val outputGeneratedSourceDirectory = File(result, pkg.replace('.', File.separatorChar))
val compilers = ActorUtils.selectAffinityActors(project, context, context.pluginInfo.compilerContributors)
val outputDir = File(outputGeneratedSourceDirectory,
"BuildConfig" + compilers[0].sourceSuffixes[0])
KFiles.saveFile(outputDir, code)
log(2, "Generated ${outputDir.path}")
return result
val contributor = ActorUtils.selectAffinityActor(context.pluginInfo.buildConfigContributors, project)
if (contributor != null) {
val code = contributor.generateBuildConfig(project, context, pkg, this, buildConfigs)
val result = KFiles.makeDir(KFiles.generatedSourceDir(project, this, "buildConfig"))
// 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
generatedSourceDirectory = File(result.relativeTo(File(project.directory)))
val outputGeneratedSourceDirectory = File(result, pkg.replace('.', File.separatorChar))
val compilers = ActorUtils.selectAffinityActors(project, context, context.pluginInfo.compilerContributors)
val outputDir = File(outputGeneratedSourceDirectory,
"BuildConfig" + compilers[0].sourceSuffixes[0])
KFiles.saveFile(outputDir, code)
log(2, "Generated ${outputDir.path}")
return result
} else {
throw KobaltException("Couldn't find a contributor to generate BuildConfig")
}
} else {
return null
}

11
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IBuildConfigContributor.kt Normal file
View file

@ -0,0 +1,11 @@
package com.beust.kobalt.api
import com.beust.kobalt.Variant
/**
* Plug-ins that can generate a BuildConfig file.
*/
interface IBuildConfigContributor : ISimpleAffinity<Project> {
fun generateBuildConfig(project: Project, context: KobaltContext, packageName: String, variant: Variant,
buildConfigs: List<BuildConfig>) : String
}

4
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt
View file

@ -2,7 +2,6 @@ package com.beust.kobalt.api
import com.beust.kobalt.TestConfig
import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.internal.IProjectInfo
import com.beust.kobalt.maven.dependency.MavenDependency
import com.beust.kobalt.misc.KFiles
import java.io.File
@ -21,8 +20,7 @@ open class Project(
@Directive open var scm : Scm? = null,
@Directive open var url: String? = null,
@Directive open var licenses: List<License> = arrayListOf<License>(),
@Directive open var packageName: String? = group,
val projectInfo: IProjectInfo) : IBuildConfig {
@Directive open var packageName: String? = group) : IBuildConfig {
class ProjectExtra(project: Project) {
val suffixesFound : Set<String> by lazy {

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

@ -75,6 +75,8 @@ class PluginInfo(val xml: KobaltPluginXml, val classLoader: ClassLoader?) {
val buildConfigFieldContributors = arrayListOf<IBuildConfigFieldContributor>()
val taskContributors = arrayListOf<ITaskContributor>()
// Not documented yet
val buildConfigContributors = arrayListOf<IBuildConfigContributor>()
val mavenIdInterceptors = arrayListOf<IMavenIdInterceptor>()
companion object {
@ -158,6 +160,7 @@ class PluginInfo(val xml: KobaltPluginXml, val classLoader: ClassLoader?) {
// Not documented yet
if (this is IMavenIdInterceptor) mavenIdInterceptors.add(this)
if (this is ITestSourceDirectoryContributor) testSourceDirContributors.add(this)
if (this is IBuildConfigContributor) buildConfigContributors.add(this)
}
}
}
@ -187,6 +190,7 @@ class PluginInfo(val xml: KobaltPluginXml, val classLoader: ClassLoader?) {
taskContributors.addAll(pluginInfo.taskContributors)
testSourceDirContributors.addAll(pluginInfo.testSourceDirContributors)
mavenIdInterceptors.addAll(pluginInfo.mavenIdInterceptors)
buildConfigContributors.addAll(pluginInfo.buildConfigContributors)
}
}

4
src/main/kotlin/com/beust/kobalt/app/java/JavaBuildGenerator.kt
View file

@ -1,10 +1,8 @@
package com.beust.kobalt.app.java
import com.beust.kobalt.app.BuildGenerator
import com.beust.kobalt.plugin.java.JavaProjectInfo
import com.google.inject.Inject
public class JavaBuildGenerator @Inject constructor (val projectInfo: JavaProjectInfo) : BuildGenerator() {
public class JavaBuildGenerator: BuildGenerator() {
override val defaultSourceDirectories = hashSetOf("src/main/java")
override val defaultTestDirectories = hashSetOf("src/test/java")
override val directive = "javaProject"

4
src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinBuildGenerator.kt
View file

@ -1,10 +1,8 @@
package com.beust.kobalt.app.kotlin
import com.beust.kobalt.app.BuildGenerator
import com.beust.kobalt.plugin.kotlin.KotlinProjectInfo
import com.google.inject.Inject
public class KotlinBuildGenerator @Inject constructor (val projectInfo: KotlinProjectInfo) : BuildGenerator() {
public class KotlinBuildGenerator : BuildGenerator() {
override val defaultSourceDirectories = hashSetOf("src/main/kotlin")
override val defaultTestDirectories = hashSetOf("src/test/kotlin")
override val directive = "kotlinProject"

15
src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
View file

@ -1,6 +1,7 @@
package com.beust.kobalt.plugin.java
import com.beust.kobalt.TaskResult
import com.beust.kobalt.Variant
import com.beust.kobalt.api.*
import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.internal.BaseJvmPlugin
@ -11,7 +12,8 @@ import javax.inject.Singleton
@Singleton
class JavaPlugin @Inject constructor(val javaCompiler: JavaCompiler)
: BaseJvmPlugin<JavaConfig>(), IDocContributor, ICompilerContributor, ITestSourceDirectoryContributor {
: BaseJvmPlugin<JavaConfig>(), IDocContributor, ICompilerContributor, ITestSourceDirectoryContributor,
IBuildConfigContributor {
companion object {
const val PLUGIN_NAME = "Java"
}
@ -57,6 +59,17 @@ class JavaPlugin @Inject constructor(val javaCompiler: JavaCompiler)
override fun testSourceDirectoriesFor(project: Project, context: KobaltContext)
= project.sourceDirectoriesTest.map { File(it) }.toList()
// IBuildConfigContributor
override fun affinity(project: Project): Int {
return if (project.projectExtra.suffixesFound.contains("java")) 1 else 0
}
override fun generateBuildConfig(project: Project, context: KobaltContext, packageName: String,
variant: Variant, buildConfigs: List<BuildConfig>): String {
return JavaProjectInfo().generateBuildConfig(project, context, packageName, variant, buildConfigs)
}
}
@Directive

3
src/main/kotlin/com/beust/kobalt/plugin/java/JavaProject.kt
View file

@ -24,8 +24,7 @@ public class JavaProject(
override var dependencies: Dependencies? = null,
@Directive
override var packaging: String? = null)
: Project(name, version, directory, buildDirectory, group, artifactId, packaging, dependencies,
".java", projectInfo = JavaProjectInfo()) {
: Project(name, version, directory, buildDirectory, group, artifactId, packaging, dependencies, ".java") {
override public fun toString() = toString("JavaProject", "name", name)
}

13
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
View file

@ -1,6 +1,7 @@
package com.beust.kobalt.plugin.kotlin
import com.beust.kobalt.TaskResult
import com.beust.kobalt.Variant
import com.beust.kobalt.api.*
import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.internal.BaseJvmPlugin
@ -15,7 +16,8 @@ import javax.inject.Singleton
@Singleton
class KotlinPlugin @Inject constructor(val executors: KobaltExecutors)
: BaseJvmPlugin<KotlinConfig>(), IDocContributor, IClasspathContributor, ICompilerContributor {
: BaseJvmPlugin<KotlinConfig>(), IDocContributor, IClasspathContributor, ICompilerContributor,
IBuildConfigContributor {
companion object {
const val PLUGIN_NAME = "Kotlin"
@ -122,6 +124,15 @@ class KotlinPlugin @Inject constructor(val executors: KobaltExecutors)
log(2, "${project.name}: $s")
}
// IBuildConfigContributor
override fun affinity(project: Project): Int {
return if (project.projectExtra.suffixesFound.contains("kotlin")) 2 else 0
}
override fun generateBuildConfig(project: Project, context: KobaltContext, packageName: String,
variant: Variant, buildConfigs: List<BuildConfig>): String {
return KotlinProjectInfo().generateBuildConfig(project, context, packageName, variant, buildConfigs)
}
}
/**

3
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProject.kt
View file

@ -24,8 +24,7 @@ public class KotlinProject(
override var dependencies: Dependencies? = null,
@Directive
override var packaging: String? = null)
: Project(name, version, directory, buildDirectory, group, artifactId, packaging, dependencies, ".kt",
projectInfo = KotlinProjectInfo()) {
: Project(name, version, directory, buildDirectory, group, artifactId, packaging, dependencies, ".kt") {
override public fun toString() = toString("KotlinProject", "name", name)
}