Fix compilation of :kotlin-gradle-plugin:functionalTest
This commit is contained in:
+17
-12
@@ -9,6 +9,7 @@
|
|||||||
package org.jetbrains.kotlin.gradle
|
package org.jetbrains.kotlin.gradle
|
||||||
|
|
||||||
import com.android.build.gradle.LibraryExtension
|
import com.android.build.gradle.LibraryExtension
|
||||||
|
import org.gradle.api.Action
|
||||||
import org.gradle.api.internal.project.ProjectInternal
|
import org.gradle.api.internal.project.ProjectInternal
|
||||||
import org.gradle.testfixtures.ProjectBuilder
|
import org.gradle.testfixtures.ProjectBuilder
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
||||||
@@ -91,12 +92,14 @@ class SyncKotlinAndAndroidSourceSetsTest {
|
|||||||
@Test
|
@Test
|
||||||
fun `two product flavor dimensions`() {
|
fun `two product flavor dimensions`() {
|
||||||
android.flavorDimensions("pricing", "releaseType")
|
android.flavorDimensions("pricing", "releaseType")
|
||||||
android.productFlavors {
|
android.productFlavors(
|
||||||
it.create("beta").dimension = "releaseType"
|
Action {
|
||||||
it.create("production").dimension = "releaseType"
|
it.create("beta").dimension = "releaseType"
|
||||||
it.create("free").dimension = "pricing"
|
it.create("production").dimension = "releaseType"
|
||||||
it.create("paid").dimension = "pricing"
|
it.create("free").dimension = "pricing"
|
||||||
}
|
it.create("paid").dimension = "pricing"
|
||||||
|
}
|
||||||
|
)
|
||||||
kotlin.android()
|
kotlin.android()
|
||||||
project.evaluate()
|
project.evaluate()
|
||||||
|
|
||||||
@@ -123,12 +126,14 @@ class SyncKotlinAndAndroidSourceSetsTest {
|
|||||||
@Test
|
@Test
|
||||||
fun `all source directories are disjoint in source sets`() {
|
fun `all source directories are disjoint in source sets`() {
|
||||||
android.flavorDimensions("pricing", "releaseType")
|
android.flavorDimensions("pricing", "releaseType")
|
||||||
android.productFlavors {
|
android.productFlavors(
|
||||||
it.create("beta").dimension = "releaseType"
|
Action {
|
||||||
it.create("production").dimension = "releaseType"
|
it.create("beta").dimension = "releaseType"
|
||||||
it.create("free").dimension = "pricing"
|
it.create("production").dimension = "releaseType"
|
||||||
it.create("paid").dimension = "pricing"
|
it.create("free").dimension = "pricing"
|
||||||
}
|
it.create("paid").dimension = "pricing"
|
||||||
|
}
|
||||||
|
)
|
||||||
kotlin.android()
|
kotlin.android()
|
||||||
project.evaluate()
|
project.evaluate()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user