From 818368efa0e9ab8c7d6cd8285e24c9da19a9177b Mon Sep 17 00:00:00 2001 From: Timofey Solonin Date: Thu, 29 Feb 2024 17:14:29 +0100 Subject: [PATCH] Assert Android compilations run ^KT-65540 --- .../mpp/resources/MultiplatformResourcesDependencyIT.kt | 6 +++++- .../multiplatformResources/dependency/build.gradle.kts | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesDependencyIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesDependencyIT.kt index ae2bf01efb5..bda4c18d0b0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesDependencyIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesDependencyIT.kt @@ -50,11 +50,15 @@ class MultiplatformResourcesDependencyIT : KGPBaseTest() { ":compileKotlinWasmJs", ":compileKotlinWasmWasi", ":compileKotlinJs", + ":compileDebugKotlinAndroid", + ":compileReleaseKotlinAndroid", ":project:compileKotlinJvm", ":project:compileKotlinLinuxX64", ":project:compileKotlinWasmJs", ":project:compileKotlinWasmWasi", ":project:compileKotlinJs", + ":project:compileDebugKotlinAndroid", + ":project:compileReleaseKotlinAndroid", ) if (HostManager.host.family.isAppleFamily) { assertTasksExecuted( @@ -89,4 +93,4 @@ class MultiplatformResourcesDependencyIT : KGPBaseTest() { } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/dependency/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/dependency/build.gradle.kts index ca308694d3c..69bcd398282 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/dependency/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/dependency/build.gradle.kts @@ -23,7 +23,6 @@ repositories { kotlin { androidTarget { - publishAllLibraryVariants() compilations.all { kotlinOptions.jvmTarget = "1.8" }