Extract IAffinity in its own interface.

src/main/kotlin/com/beust/kobalt/api/IRunnerContributor.kt

@@ -6,25 +6,9 @@ import com.beust.kobalt.maven.dependency.IClasspathDependency
 /**
  * Plugins that can run a project (task "run" or "test") should implement this interface.
  */
-interface IRunnerContributor : IContributor {
+interface IRunnerContributor : IContributor, IAffinity {
-    companion object {
-        /**
-         * The recommended default affinity if your plug-in can run this project. Use a higher
-         * number if you expect to compete against other runners and you'd like to win over them.
-         */
-        const val DEFAULT_POSITIVE_AFFINITY = 100
-    }
-
-    /**
-     * @return an integer indicating your affinity for running the current project. The runner with
-     * the highest affinity is selected to run it.
-     */
-    fun runAffinity(project: Project, context: KobaltContext) : Int
-
     /**
      * Run the project.
      */
     fun run(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>) : TaskResult
 }
-
-

src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt

@@ -9,7 +9,7 @@ public class JUnitRunner() : GenericTestRunner() {
 
     override val mainClass = "org.junit.runner.JUnitCore"
 
-    override fun runAffinity(project: Project, context: KobaltContext) =
+    override fun affinity(project: Project, context: KobaltContext) =
             if (project.testDependencies.any { it.id.contains("junit")}) IRunnerContributor.DEFAULT_POSITIVE_AFFINITY
             else 0
 

src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt

@@ -61,8 +61,8 @@ abstract class JvmCompilerPlugin @Inject constructor(
     fun taskTest(project: Project) : TaskResult {
         lp(project, "Running tests")
 
-        val runContributor = context.pluginInfo.testRunnerContributors.maxBy { it.runAffinity(project, context)}
+        val runContributor = context.pluginInfo.testRunnerContributors.maxBy { it.affinity(project, context)}
-        if (runContributor != null && runContributor.runAffinity(project, context) > 0) {
+        if (runContributor != null && runContributor.affinity(project, context) > 0) {
             return runContributor.run(project, context, dependencyManager.testDependencies(project, context,
                     projects()))
         } else {

src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt

@@ -11,7 +11,7 @@ public class TestNgRunner() : GenericTestRunner() {
 
     override val mainClass = "org.testng.TestNG"
 
-    override fun runAffinity(project: Project, context: KobaltContext) =
+    override fun affinity(project: Project, context: KobaltContext) =
         if (project.testDependencies.any { it.id.contains("testng")}) IRunnerContributor.DEFAULT_POSITIVE_AFFINITY
         else 0
 

src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt

@@ -390,7 +390,7 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, v
     }
 
     // IRunContributor
-    override fun runAffinity(project: Project, context: KobaltContext): Int {
+    override fun affinity(project: Project, context: KobaltContext): Int {
         val manifest = AndroidFiles.manifest(project, context)
         return if (File(manifest).exists()) IRunnerContributor.DEFAULT_POSITIVE_AFFINITY else 0
     }

src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt

@@ -49,8 +49,8 @@ class ApplicationPlugin @Inject constructor(val executors: KobaltExecutors,
 
     @Task(name = "run", description = "Run the main class", runAfter = arrayOf("install"))
     fun taskRun(project: Project): TaskResult {
-        val runContributor = context.pluginInfo.runnerContributors.maxBy { it.runAffinity(project, context)}
+        val runContributor = context.pluginInfo.runnerContributors.maxBy { it.affinity(project, context)}
-        if (runContributor != null && runContributor.runAffinity(project, context) > 0) {
+        if (runContributor != null && runContributor.affinity(project, context) > 0) {
             return runContributor.run(project, context, dependencyManager.dependencies(project, context, projects()))
         } else {
             warn("Couldn't find a runner for project ${project.name}")
@@ -73,7 +73,7 @@ class ApplicationPlugin @Inject constructor(val executors: KobaltExecutors,
 
     // IRunContributor
 
-    override fun runAffinity(project: Project, context: KobaltContext): Int {
+    override fun affinity(project: Project, context: KobaltContext): Int {
         return if (configurationFor(project) != null) IRunnerContributor.DEFAULT_POSITIVE_AFFINITY else 0
     }