From 05ce873d2ab8eef9e4452f151650b5c61d239f8f Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Wed, 28 Jun 2023 10:01:45 +0200
Subject: [PATCH] [Gradle] Fix Android tests for Jvm Toolchain

^KT-59587 In Progress
---
 .../kotlin/gradle/KotlinJavaToolchainTest.kt        | 13 ++++++++++---
 .../kotlin-java-toolchain/android/build.gradle      |  1 +
 .../android/src/main/AndroidManifest.xml            |  4 +---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt
index 24f32f81cc7..3079277ff9c 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt
@@ -529,7 +529,6 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
 
     @AndroidGradlePluginTests
     @DisplayName("Toolchain should take into account kotlin options that are set via android extension")
-    @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
     @GradleAndroidTest
     internal fun kotlinOptionsAndroidAndToolchain(
         gradleVersion: GradleVersion,
@@ -729,8 +728,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
     }
 
     @AndroidGradlePluginTests
-    @DisplayName("Toolchain should not override Jvm taget configured via kotlinOptions in android project")
-    @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
+    @DisplayName("Toolchain should not override Jvm target configured via kotlinOptions in android project")
     @GradleAndroidTest
     internal fun kotlinOptionsAndroidAndToolchainNotOverrideJvmTarget(
         gradleVersion: GradleVersion,
@@ -751,6 +749,15 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
                 """.trimMargin()
             )
 
+            // Otherwise jvm target validation on Gradle 8+ will fail
+            //language=properties
+            gradleProperties.append(
+                """
+                # suppress inspection "UnusedProperty"
+                kotlin.jvm.target.validation.mode = warning
+                """.trimIndent()
+            )
+
             build(":compileDebugKotlin") {
                 assertTasksExecuted(":compileDebugKotlin")
                 assertCompilerArgument(":compileDebugKotlin", "-jvm-target 11")
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/android/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/android/build.gradle
index fac044f0ac2..a5344f41838 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/android/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/android/build.gradle
@@ -11,6 +11,7 @@ repositories {
 
 android {
     compileSdkVersion 30
+    namespace "com.example.myapplication"
     defaultConfig {
         applicationId "com.example.myapplication"
         minSdkVersion 30
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/android/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/android/src/main/AndroidManifest.xml
index 551a58ce9a4..eb23a297d35 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/android/src/main/AndroidManifest.xml
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/android/src/main/AndroidManifest.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.myapplication">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
       android:name="example.App">