[MPP] Remove explicit compilation config names from tests
KT-49877
This commit is contained in:
committed by
Space
parent
23151a5295
commit
2a43247a8f
+16
-5
@@ -163,15 +163,26 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() {
|
||||
gradleBuildScript().appendText(
|
||||
"\n" + """
|
||||
dependencies {
|
||||
jvm6CompilationImplementation project(':${innerJvmProject.projectName}')
|
||||
jvm6TestCompilationRuntimeOnly project(':${innerJvmProject.projectName}')
|
||||
nodeJsCompilationImplementation project(':${innerJsProject.projectName}')
|
||||
nodeJsTestCompilationRuntimeOnly project(':${innerJsProject.projectName}')
|
||||
def jvmCompilations = kotlin.getTargets().getByName("jvm6").getCompilations()
|
||||
def jsCompilations = kotlin.getTargets().getByName("nodeJs").getCompilations()
|
||||
|
||||
def jvmMainImplConfigName = jvmCompilations.getByName("main").getImplementationConfigurationName()
|
||||
def jvmTestImplConfigName = jvmCompilations.getByName("test").getImplementationConfigurationName()
|
||||
def jsMainImplConfigName = jsCompilations.getByName("main").getImplementationConfigurationName()
|
||||
def jsTestImplConfigName = jsCompilations.getByName("test").getImplementationConfigurationName()
|
||||
|
||||
add(jvmMainImplConfigName, project(':${innerJvmProject.projectName}'))
|
||||
add(jvmTestImplConfigName, project(':${innerJvmProject.projectName}'))
|
||||
add(jsMainImplConfigName, project(':${innerJsProject.projectName}'))
|
||||
add(jsTestImplConfigName, project(':${innerJsProject.projectName}'))
|
||||
}
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
testResolveAllConfigurations(innerJvmProject.projectName, options = defaultBuildOptions().copy(warningMode = WarningMode.Summary))
|
||||
testResolveAllConfigurations(
|
||||
innerJvmProject.projectName,
|
||||
options = defaultBuildOptions().copy(warningMode = WarningMode.Summary),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+6
-3
@@ -20,9 +20,12 @@ kotlin.targets.fromPreset(kotlin.presets.js, 'browser') {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
browserCompilationImplementation project(":libraryProject")
|
||||
browserCompilationImplementation "org.jetbrains.kotlin:kotlin-stdlib-js"
|
||||
browserCompilationImplementation "org.mozilla:rhino:1.7.7.1"
|
||||
def browserMainImplConfigName =
|
||||
kotlin.getTargets().getByName("browser").getCompilations().getByName("main").getImplementationConfigurationName()
|
||||
|
||||
add(browserMainImplConfigName, project(":libraryProject"))
|
||||
add(browserMainImplConfigName, "org.jetbrains.kotlin:kotlin-stdlib-js")
|
||||
add(browserMainImplConfigName, "org.mozilla:rhino:1.7.7.1")
|
||||
}
|
||||
|
||||
tasks.named('compileKotlinBrowser') {
|
||||
|
||||
Reference in New Issue
Block a user