[KPM] Ensure local stdlib is resolvable in gradle functionalTest
KT-51386
This commit is contained in:
committed by
Space
parent
1a5fc84080
commit
555db121fa
@@ -10,6 +10,7 @@ project.extensions.getByType<KotlinJvmProjectExtension>().target.compilations {
|
|||||||
testClassesDirs = output.classesDirs
|
testClassesDirs = output.classesDirs
|
||||||
classpath = sourceSets["functionalTest"].runtimeClasspath
|
classpath = sourceSets["functionalTest"].runtimeClasspath
|
||||||
workingDir = projectDir
|
workingDir = projectDir
|
||||||
|
dependsOnKotlinGradlePluginInstall()
|
||||||
}
|
}
|
||||||
tasks.named("check") {
|
tasks.named("check") {
|
||||||
dependsOn(functionalTest)
|
dependsOn(functionalTest)
|
||||||
|
|||||||
+4
-1
@@ -8,6 +8,7 @@
|
|||||||
package org.jetbrains.kotlin.gradle.kpm.idea
|
package org.jetbrains.kotlin.gradle.kpm.idea
|
||||||
|
|
||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
|
import org.gradle.api.artifacts.dsl.RepositoryHandler
|
||||||
import org.gradle.api.artifacts.verification.DependencyVerificationMode
|
import org.gradle.api.artifacts.verification.DependencyVerificationMode
|
||||||
import org.gradle.api.internal.project.ProjectInternal
|
import org.gradle.api.internal.project.ProjectInternal
|
||||||
import org.gradle.testfixtures.ProjectBuilder
|
import org.gradle.testfixtures.ProjectBuilder
|
||||||
@@ -22,9 +23,11 @@ abstract class AbstractLightweightIdeaDependencyResolutionTest {
|
|||||||
project.gradle.startParameter.dependencyVerificationMode = DependencyVerificationMode.OFF
|
project.gradle.startParameter.dependencyVerificationMode = DependencyVerificationMode.OFF
|
||||||
project.enableDefaultStdlibDependency(false)
|
project.enableDefaultStdlibDependency(false)
|
||||||
project.repositories.mavenLocal()
|
project.repositories.mavenLocal()
|
||||||
project.repositories.maven { it.setUrl("https://cache-redirector.jetbrains.com/maven-central") }
|
project.repositories.mavenCentralCacheRedirector()
|
||||||
} as ProjectInternal
|
} as ProjectInternal
|
||||||
}
|
}
|
||||||
|
|
||||||
val Project.konanDistribution get() = KonanDistribution(project.konanHome)
|
val Project.konanDistribution get() = KonanDistribution(project.konanHome)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun RepositoryHandler.mavenCentralCacheRedirector() = maven { it.setUrl("https://cache-redirector.jetbrains.com/maven-central") }
|
||||||
|
|||||||
+3
@@ -29,11 +29,14 @@ class IdeaKotlinProjectModelSerializableTest : AbstractKpmExtensionTest() {
|
|||||||
@Test
|
@Test
|
||||||
fun `test - serialize and deserialize - empty project`() {
|
fun `test - serialize and deserialize - empty project`() {
|
||||||
project.evaluate()
|
project.evaluate()
|
||||||
|
project.repositories.mavenLocal()
|
||||||
assertSerializeAndDeserializeEquals(kotlin.buildIdeaKotlinProjectModel())
|
assertSerializeAndDeserializeEquals(kotlin.buildIdeaKotlinProjectModel())
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `test - serialize and deserialize - project with variants and fragments`() {
|
fun `test - serialize and deserialize - project with variants and fragments`() {
|
||||||
|
project.evaluate()
|
||||||
|
project.repositories.mavenLocal()
|
||||||
kotlin.mainAndTest {
|
kotlin.mainAndTest {
|
||||||
val native = fragments.create("native")
|
val native = fragments.create("native")
|
||||||
val apple = fragments.create("apple")
|
val apple = fragments.create("apple")
|
||||||
|
|||||||
Reference in New Issue
Block a user