[Gradle] Fixed Mac and Windows integration tests

These tests were failed because of `dependencyManagement` in testDsl.

^KT-64903


Merge-request: KT-MR-14201
Merged-by: Dmitrii Krasnov <Dmitrii.Krasnov@jetbrains.com>
This commit is contained in:
Dmitrii Krasnov
2024-02-06 09:09:34 +00:00
committed by Space Team
parent 1cc138431d
commit be6ab943f4
10 changed files with 9 additions and 44 deletions
@@ -221,18 +221,7 @@ class BuildCacheRelocationIT : KGPBaseTest() {
gradleVersion, gradleVersion,
buildOptions = buildOptionsBeforeCaching, buildOptions = buildOptionsBeforeCaching,
localRepoDir = localRepoDir localRepoDir = localRepoDir
) { )
it.subProject("build-cache-app").buildGradleKts.append(
"""
repositories {
maven {
setUrl("$localRepoDir")
}
}
""".trimIndent()
)
}
checkBuildCacheRelocation( checkBuildCacheRelocation(
firstProject, firstProject,
@@ -58,7 +58,11 @@ class CommonNativeIT : KGPBaseTest() {
appTargets: List<String>, appTargets: List<String>,
gradleVersion: GradleVersion, gradleVersion: GradleVersion,
) { ) {
nativeProject(projectName.withPrefix, gradleVersion) { nativeProject(
projectName.withPrefix,
gradleVersion,
localRepoDir = defaultLocalRepo(gradleVersion)
) {
configureJvmMemory() configureJvmMemory()
@@ -2,12 +2,6 @@ plugins {
id("org.jetbrains.kotlin.multiplatform") id("org.jetbrains.kotlin.multiplatform")
} }
repositories {
mavenLocal()
mavenCentral()
maven { setUrl(rootProject.projectDir.resolve("repo")) }
}
kotlin { kotlin {
ios() ios()
@@ -1,8 +1,3 @@
plugins { plugins {
kotlin("multiplatform").apply(false) kotlin("multiplatform").apply(false)
}
repositories {
mavenLocal()
mavenCentral()
} }
@@ -20,6 +20,6 @@ kotlin {
publishing { publishing {
repositories { repositories {
maven { setUrl(rootProject.projectDir.resolve("repo")) } maven { setUrl("<localRepo>") }
} }
} }
@@ -2,12 +2,6 @@ plugins {
id("org.jetbrains.kotlin.multiplatform") id("org.jetbrains.kotlin.multiplatform")
} }
repositories {
mavenLocal()
mavenCentral()
maven { setUrl(rootProject.projectDir.resolve("repo")) }
}
kotlin { kotlin {
tvos() tvos()
@@ -20,6 +20,6 @@ kotlin {
publishing { publishing {
repositories { repositories {
maven { setUrl(rootProject.projectDir.resolve("repo")) } maven { setUrl("<localRepo>") }
} }
} }
@@ -2,12 +2,6 @@ plugins {
id("org.jetbrains.kotlin.multiplatform") id("org.jetbrains.kotlin.multiplatform")
} }
repositories {
mavenLocal()
mavenCentral()
maven { setUrl(rootProject.projectDir.resolve("repo")) }
}
kotlin { kotlin {
watchos() watchos()
@@ -1,8 +1,3 @@
plugins { plugins {
kotlin("multiplatform").apply(false) kotlin("multiplatform").apply(false)
}
repositories {
mavenLocal()
mavenCentral()
} }
@@ -20,6 +20,6 @@ kotlin {
publishing { publishing {
repositories { repositories {
maven { setUrl(rootProject.projectDir.resolve("repo")) } maven { setUrl("<localRepo>") }
} }
} }