From be6ab943f45a059cc91cb7c21ab71d63d7b14945 Mon Sep 17 00:00:00 2001 From: Dmitrii Krasnov Date: Tue, 6 Feb 2024 09:09:34 +0000 Subject: [PATCH] [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 --- .../kotlin/gradle/BuildCacheRelocationIT.kt | 13 +------------ .../kotlin/gradle/native/CommonNativeIT.kt | 6 +++++- .../common-ios/app/build.gradle.kts | 6 ------ .../common-ios/build.gradle.kts | 5 ----- .../common-ios/lib/build.gradle.kts | 2 +- .../common-tvos/app/build.gradle.kts | 6 ------ .../common-tvos/lib/build.gradle.kts | 2 +- .../common-watchos/app/build.gradle.kts | 6 ------ .../common-watchos/build.gradle.kts | 5 ----- .../common-watchos/lib/build.gradle.kts | 2 +- 10 files changed, 9 insertions(+), 44 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt index b6907e04cb1..39fc35e3036 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt @@ -221,18 +221,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { gradleVersion, buildOptions = buildOptionsBeforeCaching, localRepoDir = localRepoDir - ) { - it.subProject("build-cache-app").buildGradleKts.append( - """ - - repositories { - maven { - setUrl("$localRepoDir") - } - } - """.trimIndent() - ) - } + ) checkBuildCacheRelocation( firstProject, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt index 3a90ac0c5cd..7fad28996bd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt @@ -58,7 +58,11 @@ class CommonNativeIT : KGPBaseTest() { appTargets: List, gradleVersion: GradleVersion, ) { - nativeProject(projectName.withPrefix, gradleVersion) { + nativeProject( + projectName.withPrefix, + gradleVersion, + localRepoDir = defaultLocalRepo(gradleVersion) + ) { configureJvmMemory() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/build.gradle.kts index dd91ce7ddc7..d8b04f4468e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/build.gradle.kts @@ -2,12 +2,6 @@ plugins { id("org.jetbrains.kotlin.multiplatform") } -repositories { - mavenLocal() - mavenCentral() - maven { setUrl(rootProject.projectDir.resolve("repo")) } -} - kotlin { ios() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/build.gradle.kts index 389729f15ae..466f70b1602 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/build.gradle.kts @@ -1,8 +1,3 @@ plugins { kotlin("multiplatform").apply(false) -} - -repositories { - mavenLocal() - mavenCentral() } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/build.gradle.kts index d6f7f97b427..82b82258a0c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/build.gradle.kts @@ -20,6 +20,6 @@ kotlin { publishing { repositories { - maven { setUrl(rootProject.projectDir.resolve("repo")) } + maven { setUrl("") } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/build.gradle.kts index 877cabb22a6..59dce513b3b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/build.gradle.kts @@ -2,12 +2,6 @@ plugins { id("org.jetbrains.kotlin.multiplatform") } -repositories { - mavenLocal() - mavenCentral() - maven { setUrl(rootProject.projectDir.resolve("repo")) } -} - kotlin { tvos() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/build.gradle.kts index 51afaf55387..4be9c4711b4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/build.gradle.kts @@ -20,6 +20,6 @@ kotlin { publishing { repositories { - maven { setUrl(rootProject.projectDir.resolve("repo")) } + maven { setUrl("") } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/build.gradle.kts index 9269b4e3e92..0d70f383eac 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/build.gradle.kts @@ -2,12 +2,6 @@ plugins { id("org.jetbrains.kotlin.multiplatform") } -repositories { - mavenLocal() - mavenCentral() - maven { setUrl(rootProject.projectDir.resolve("repo")) } -} - kotlin { watchos() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/build.gradle.kts index 389729f15ae..466f70b1602 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/build.gradle.kts @@ -1,8 +1,3 @@ plugins { kotlin("multiplatform").apply(false) -} - -repositories { - mavenLocal() - mavenCentral() } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/build.gradle.kts index ed6a6e34ec0..3c0defc4f76 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/build.gradle.kts @@ -20,6 +20,6 @@ kotlin { publishing { repositories { - maven { setUrl(rootProject.projectDir.resolve("repo")) } + maven { setUrl("") } } }