diff --git a/libraries/tools/kotlin-gradle-plugin/functionalTest.gradle.kts b/libraries/tools/kotlin-gradle-plugin/functionalTest.gradle.kts index 6808ed514d2..7fc4ae72b11 100644 --- a/libraries/tools/kotlin-gradle-plugin/functionalTest.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/functionalTest.gradle.kts @@ -10,6 +10,7 @@ project.extensions.getByType().target.compilations { testClassesDirs = output.classesDirs classpath = sourceSets["functionalTest"].runtimeClasspath workingDir = projectDir + dependsOnKotlinGradlePluginInstall() } tasks.named("check") { dependsOn(functionalTest) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/AbstractLightweightIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/AbstractLightweightIdeaDependencyResolutionTest.kt index 06b08777f5c..e16c7e20ac2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/AbstractLightweightIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/AbstractLightweightIdeaDependencyResolutionTest.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.gradle.api.Project +import org.gradle.api.artifacts.dsl.RepositoryHandler import org.gradle.api.artifacts.verification.DependencyVerificationMode import org.gradle.api.internal.project.ProjectInternal import org.gradle.testfixtures.ProjectBuilder @@ -22,9 +23,11 @@ abstract class AbstractLightweightIdeaDependencyResolutionTest { project.gradle.startParameter.dependencyVerificationMode = DependencyVerificationMode.OFF project.enableDefaultStdlibDependency(false) project.repositories.mavenLocal() - project.repositories.maven { it.setUrl("https://cache-redirector.jetbrains.com/maven-central") } + project.repositories.mavenCentralCacheRedirector() } as ProjectInternal } val Project.konanDistribution get() = KonanDistribution(project.konanHome) } + +fun RepositoryHandler.mavenCentralCacheRedirector() = maven { it.setUrl("https://cache-redirector.jetbrains.com/maven-central") } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelSerializableTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelSerializableTest.kt index 02a7165e7cf..0e89af6cf43 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelSerializableTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelSerializableTest.kt @@ -29,11 +29,14 @@ class IdeaKotlinProjectModelSerializableTest : AbstractKpmExtensionTest() { @Test fun `test - serialize and deserialize - empty project`() { project.evaluate() + project.repositories.mavenLocal() assertSerializeAndDeserializeEquals(kotlin.buildIdeaKotlinProjectModel()) } @Test fun `test - serialize and deserialize - project with variants and fragments`() { + project.evaluate() + project.repositories.mavenLocal() kotlin.mainAndTest { val native = fragments.create("native") val apple = fragments.create("apple")