Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Kotlin DSL accessor for
android.kotlinOptions
And introduce a stricter accessor type precedence order.
The accessor type is the first public Kotlin type found in the given extension
type hierarchy considering all the types in the following order:
* the extension type itsef
* its superclasses excluding `java.lang.Object`
* all supported interfaces ordered by:
- subtyping first:
subtypes before supertypes
- where it's found in the class hierarchy:
subclass interfaces before superclass interfaces
Fixes #11083- Loading branch information
Showing
4 changed files
with
241 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
...t/kotlin/org/gradle/kotlin/dsl/provider/plugins/precompiled/AccessorTypePrecedenceTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * Copyright 2019 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.gradle.kotlin.dsl.provider.plugins.precompiled | ||
|
|
||
| import org.gradle.api.plugins.ExtensionAware | ||
| import org.gradle.kotlin.dsl.provider.plugins.accessorTypePrecedenceSequence | ||
| import org.gradle.kotlin.dsl.provider.plugins.ancestorClassesIncludingSelf | ||
| import org.hamcrest.CoreMatchers.equalTo | ||
| import org.hamcrest.MatcherAssert.assertThat | ||
| import org.junit.Test | ||
| import kotlin.reflect.KClass | ||
|
|
||
|
|
||
| class AccessorTypePrecedenceTest { | ||
|
|
||
| @Test | ||
| fun `classes before interfaces`() { | ||
| assertAccessorTypePrecedenceOf<ChooseA>( | ||
| ChooseA::class, | ||
| Base::class, | ||
| Core::class, | ||
| A::class, // because it appears first than B when walking up the tree starting at ChooseA | ||
| B::class, | ||
| ExtensionAware::class | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| fun `classes before interfaces, subtypes before supertypes`() { | ||
| assertAccessorTypePrecedenceOf<ChooseB>( | ||
| ChooseB::class, | ||
| Base::class, | ||
| Core::class, | ||
| B::class, // because B extends ExtensionAware, even though ExtensionAware appears first | ||
| ExtensionAware::class | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| fun `ancestorClassesIncludingSelf does not include Any`() { | ||
| assertTypeSequence( | ||
| ChooseA::class.java.ancestorClassesIncludingSelf, | ||
| ChooseA::class, | ||
| Base::class, | ||
| Core::class | ||
| ) | ||
| } | ||
|
|
||
| private | ||
| inline fun <reified T> assertAccessorTypePrecedenceOf(vararg types: KClass<*>) { | ||
| assertTypeSequence( | ||
| T::class.java.accessorTypePrecedenceSequence(), | ||
| *types | ||
| ) | ||
| } | ||
|
|
||
| private | ||
| fun assertTypeSequence(sequence: Sequence<Class<*>>, vararg types: KClass<*>) { | ||
| assertThat( | ||
| sequence.mapTo(mutableListOf()) { it.simpleName }, | ||
| equalTo(types.map { it.simpleName }) | ||
| ) | ||
| } | ||
|
|
||
| abstract class ChooseA : Base(), ExtensionAware, A | ||
|
|
||
| abstract class ChooseB : Base(), ExtensionAware | ||
|
|
||
| abstract class Base : Core(), B | ||
|
|
||
| open class Core | ||
|
|
||
| interface A : ExtensionAware | ||
|
|
||
| interface B : ExtensionAware | ||
| } |
89 changes: 89 additions & 0 deletions
89
...in/org/gradle/kotlin/dsl/provider/plugins/precompiled/DefaultProjectSchemaProviderTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * Copyright 2019 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.gradle.kotlin.dsl.provider.plugins.precompiled | ||
|
|
||
| import com.nhaarman.mockitokotlin2.doReturn | ||
| import com.nhaarman.mockitokotlin2.mock | ||
| import org.gradle.api.internal.plugins.ExtensionContainerInternal | ||
| import org.gradle.api.plugins.ExtensionAware | ||
| import org.gradle.api.plugins.ExtensionsSchema | ||
| import org.gradle.api.reflect.TypeOf | ||
| import org.gradle.internal.extensibility.DefaultExtensionsSchema | ||
| import org.gradle.kotlin.dsl.accessors.ProjectSchemaEntry | ||
| import org.gradle.kotlin.dsl.provider.plugins.targetSchemaFor | ||
| import org.gradle.kotlin.dsl.provider.plugins.typeOf | ||
| import org.hamcrest.CoreMatchers.equalTo | ||
| import org.hamcrest.MatcherAssert.assertThat | ||
| import org.junit.Test | ||
|
|
||
|
|
||
| class DefaultProjectSchemaProviderTest { | ||
|
|
||
| @Test | ||
| fun `chooses first public interface in type hierarchy`() { | ||
|
|
||
| val androidExtensionsSchema = DefaultExtensionsSchema.create( | ||
| listOf( | ||
| extensionSchema( | ||
| "kotlinOptions", | ||
| typeOf<KotlinJvmOptionsImpl>() | ||
| ) | ||
| ) | ||
| ) | ||
|
|
||
| val androidExtensions = mock<ExtensionContainerInternal> { | ||
| on { extensionsSchema } doReturn androidExtensionsSchema | ||
| on { getByName("kotlinOptions") } doReturn KotlinJvmOptionsImpl() | ||
| } | ||
|
|
||
| val androidExtension = mock<AndroidExtension> { | ||
| on { extensions } doReturn androidExtensions | ||
| } | ||
|
|
||
| assertThat( | ||
| targetSchemaFor( | ||
| androidExtension, | ||
| typeOf<AndroidExtension>() | ||
| ).extensions, | ||
| equalTo( | ||
| listOf( | ||
| ProjectSchemaEntry( | ||
| typeOf<AndroidExtension>(), | ||
| "kotlinOptions", | ||
| typeOf<KotlinJvmOptions>() | ||
| ) | ||
| ) | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| interface AndroidExtension : ExtensionAware | ||
|
|
||
| internal | ||
| class KotlinJvmOptionsImpl : KotlinJvmOptionsBase() | ||
|
|
||
| internal | ||
| open class KotlinJvmOptionsBase : KotlinJvmOptions | ||
|
|
||
| interface KotlinJvmOptions | ||
|
|
||
| private | ||
| fun <T> extensionSchema(name: String, publicType: TypeOf<T>): ExtensionsSchema.ExtensionSchema = mock { | ||
| on { getName() } doReturn name | ||
| on { getPublicType() } doReturn publicType | ||
| } | ||
| } |