Skip to content

Commit

Permalink
ConfigurationObserver: Avoid using property references to preserve bi…
Browse files Browse the repository at this point in the history
…nary compatibility with Kotlin 1.3
  • Loading branch information
Till Krullmann committed May 5, 2021
1 parent 8620591 commit 47a3295
Showing 1 changed file with 16 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@ import org.unbrokendome.gradle.plugins.testsets.dsl.TestSetObserver


internal class ConfigurationObserver(
private val project: Project)
: TestSetObserver {
private val project: Project
) : TestSetObserver {

private companion object {
val inheritedConfigurationNames: List<(TestSetBase) -> String> = listOf(
TestSetBase::compileClasspathConfigurationName,
TestSetBase::compileOnlyConfigurationName,
TestSetBase::annotationProcessorConfigurationName,
TestSetBase::implementationConfigurationName,
TestSetBase::runtimeClasspathConfigurationName,
TestSetBase::runtimeOnlyConfigurationName)
{ it.compileClasspathConfigurationName },
{ it.compileClasspathConfigurationName },
{ it.compileOnlyConfigurationName },
{ it.annotationProcessorConfigurationName },
{ it.implementationConfigurationName },
{ it.runtimeClasspathConfigurationName },
{ it.runtimeOnlyConfigurationName },
)
}


Expand All @@ -38,7 +40,8 @@ internal class ConfigurationObserver(
implementation.extendsFrom(importedApi)
}
implementation.dependencies.add(
project.dependencies.create(added.sourceSet.output))
project.dependencies.create(added.sourceSet.output)
)
}

val runtimeOnly = project.configurations.findByName(testSet.runtimeOnlyConfigurationName)
Expand All @@ -49,8 +52,10 @@ internal class ConfigurationObserver(
}


private fun addConfigurationExtension(testSet: TestSetBase, superTestSet: TestSetBase,
configurationNameAccessor: (TestSetBase) -> String) {
private fun addConfigurationExtension(
testSet: TestSetBase, superTestSet: TestSetBase,
configurationNameAccessor: (TestSetBase) -> String
) {

val configuration = project.configurations.findByName(configurationNameAccessor(testSet))
val superConfiguration = project.configurations.findByName(configurationNameAccessor(superTestSet))
Expand Down

0 comments on commit 47a3295

Please sign in to comment.