From 96f8bcdf43f238929848da861f1917a9669b47af Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Tue, 25 Apr 2023 18:04:00 +0200 Subject: [PATCH] [Gradle/MPP] Added IT for android -> androidTarget rename #KT-57903 In Progress --- .../gradle/android/KotlinAndroidMppIT.kt | 35 +++++++++++++++++++ .../mppAndroidRenameGroovy/build.gradle | 27 ++++++++++++++ .../mppAndroidRenameKts/build.gradle.kts | 20 +++++++++++ 3 files changed, 82 insertions(+) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppAndroidRenameGroovy/build.gradle create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppAndroidRenameKts/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt index 18404cd0cad..16d5f5746fd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt @@ -952,4 +952,39 @@ class KotlinAndroidMppIT : KGPBaseTest() { } } } + + @GradleAndroidTest + fun mppAndroidRenameDiagnosticReportedOnKts( + gradleVersion: GradleVersion, + agpVersion: String, + jdkVersion: JdkVersions.ProvidedJdk, + ) = testAndroidRenameReported(gradleVersion, agpVersion, jdkVersion, "mppAndroidRenameKts") + + @GradleAndroidTest + fun mppAndroidRenameDiagnosticReportedOnGroovy( + gradleVersion: GradleVersion, + agpVersion: String, + jdkVersion: JdkVersions.ProvidedJdk, + ) = testAndroidRenameReported(gradleVersion, agpVersion, jdkVersion, "mppAndroidRenameGroovy") + + private fun testAndroidRenameReported( + gradleVersion: GradleVersion, + agpVersion: String, + jdkVersion: JdkVersions.ProvidedJdk, + projectName: String + ) { + project( + projectName, + gradleVersion, + buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion), + buildJdk = jdkVersion.location + ) { + build("tasks") { + val warnings = output.lines().filter { it.startsWith("w:") }.toSet() + assert( + warnings.any { warning -> warning.contains("androidTarget") } + ) + } + } + } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppAndroidRenameGroovy/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppAndroidRenameGroovy/build.gradle new file mode 100644 index 00000000000..9b455985113 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppAndroidRenameGroovy/build.gradle @@ -0,0 +1,27 @@ +buildscript { + repositories { + mavenLocal() + google() + mavenCentral() + } + dependencies { + classpath "com.android.tools.build:gradle:$android_tools_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-multiplatform' + +android { + compileSdkVersion 31 + namespace 'app.example.com.lib' +} + + +kotlin { + android { + + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppAndroidRenameKts/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppAndroidRenameKts/build.gradle.kts new file mode 100644 index 00000000000..011fba50050 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/mppAndroidRenameKts/build.gradle.kts @@ -0,0 +1,20 @@ +plugins { + id("com.android.library") + kotlin("multiplatform") +} + + +android { + compileSdk = 31 + namespace = "org.jetbrains.kotlin.sample" +} + +repositories { + mavenLocal() + mavenCentral() + google() +} + +kotlin { + android() +}