From d3554b264e420ab9e7e9e6fb51c149a885e40d98 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sun, 6 Dec 2015 07:20:22 -0800 Subject: [PATCH] Only add the retrolambda jar if retrolambda is enabled. --- kobalt/src/Build.kt | 4 ++++ .../com/beust/kobalt/plugin/retrolambda/RetrolambdaPlugin.kt | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 9070708e..c06c3c40 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -8,6 +8,7 @@ import com.beust.kobalt.plugin.kotlin.* import com.beust.kobalt.plugin.packaging.assemble import com.beust.kobalt.plugin.publish.github import com.beust.kobalt.plugin.publish.jcenter +import com.beust.kobalt.plugin.retrolambda.* import com.beust.kobalt.test import java.io.File import java.nio.file.Files @@ -34,6 +35,9 @@ val wrapper = javaProject { } } +// retrolambda { +// } + productFlavor("dev") { } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/retrolambda/RetrolambdaPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/retrolambda/RetrolambdaPlugin.kt index de8d33fb..dbf84952 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/retrolambda/RetrolambdaPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/retrolambda/RetrolambdaPlugin.kt @@ -32,7 +32,9 @@ class RetrolambdaPlugin @Inject constructor(val dependencyManager: DependencyMan } // IClasspathContributor - override fun entriesFor(project: Project?) = listOf(JAR) + override fun entriesFor(project: Project?) = + if (project != null && configurationFor(project) != null) listOf(JAR) + else emptyList() @Task(name = "retrolambda", description = "Run Retrolambda", alwaysRunAfter = arrayOf(JvmCompilerPlugin.TASK_COMPILE))