Bumped max supported gradle version to 8.0 in tests

#KT-56636 Fixed

Merge-request: KT-MR-10723
Merged-by: Dmitrii Krasnov <Dmitrii.Krasnov@jetbrains.com>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildFusStatisticsIT.kt

@@ -24,8 +24,14 @@ class BuildFusStatisticsIT : KGPDaemonsBaseTest() {
                 //register build service for buildSrc.
                 assertOutputContains("Instantiated class org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService: new instance")
                 assertOutputContains("Instantiated class org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService_v2: new instance")
-                //kotlin 1.4 in kotlinDsl does not create jmx service yet
+                // Since gradle 8 kotlinDsl was updated to 1.8 version
-                assertOutputContains("Register JMX service for backward compatibility")
+                // https://docs.gradle.org/8.0/release-notes.html#kotlin-dsl-updated-to-kotlin-api-level-1.8 ,
+                // and it registers old service, so we don't need check with re-registering old version service.
+                if (gradleVersion < GradleVersion.version(TestVersions.Gradle.G_8_0)) {
+                    // TODO(Dmitrii Krasnov): you can remove this check, when min gradle version becomes 8 or greater
+                    //kotlin 1.4 in kotlinDsl does not create jmx service yet
+                    assertOutputContains("Register JMX service for backward compatibility")
+                }
                 assertOutputDoesNotContain("[org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatHandler] Could not execute")
             }
         }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt

@@ -23,7 +23,8 @@ internal class CompilerOptionsIT : KGPBaseTest() {
     @DisplayName("Allows to set kotlinOptions.freeCompilerArgs on task execution with warning")
     @JvmGradlePluginTests
     @GradleTestVersions(
-        minVersion = TestVersions.Gradle.G_7_3
+        minVersion = TestVersions.Gradle.G_7_3,
+        maxVersion = TestVersions.Gradle.G_7_6 // TODO(Dmitrii Krasnov): we don't use TestVersions.Gradle.G_8_0, because there is some problem in printing warn message
     )
     @GradleTest
     internal fun compatibleWithKotlinDsl(gradleVersion: GradleVersion) {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt

@@ -87,6 +87,7 @@ class ConfigurationAvoidanceIT : KGPBaseTest() {
             buildJdk = providedJdk.location
         ) {
 
+            gradleProperties.appendText("android.defaults.buildfeatures.aidl=true")
             listOf("Android", "Test").forEach { subproject ->
                 subProject(subproject)
                     .buildGradle

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt

@@ -221,8 +221,9 @@ abstract class ExecutionStrategyIT : KGPDaemonsBaseTest() {
                     assertOutputContains("Using fallback strategy: Compile without Kotlin daemon")
                 } else if (executionStrategy == KotlinCompilerExecutionStrategy.DAEMON) {
                     // 256m is the default value for Gradle 5.0+
+                    val defauldJvmSettingsForGivenGradleVersion = if (gradleVersion < GradleVersion.version(TestVersions.Gradle.G_8_0)) "256" else "384"
                     assertKotlinDaemonJvmOptions(
-                        listOf("-XX:MaxMetaspaceSize=256m", "-ea")
+                        listOf("-XX:MaxMetaspaceSize=${defauldJvmSettingsForGivenGradleVersion}m", "-ea")
                     )
                 }
             }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JvmTargetValidationTest.kt

@@ -260,6 +260,7 @@ class JvmTargetValidationTest : KGPBaseTest() {
     }
 
     @DisplayName("Should still do JVM target validation if no java sources are available")
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
     @GradleTest
     internal fun shouldDoJvmTargetValidationOnNoJavaSources(gradleVersion: GradleVersion) {
         project(
@@ -282,6 +283,8 @@ class JvmTargetValidationTest : KGPBaseTest() {
     }
 
     @DisplayName("Should do JVM target validation if java sources are added and configuration cache is reused")
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
+    @AndroidTestVersions(maxVersion = TestVersions.AGP.AGP_74)
     @GradleTest
     internal fun shouldDoJvmTargetValidationOnNewJavaSourcesAndConfigurationCacheReuse(gradleVersion: GradleVersion) {
         project(

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndGradleDaemon.kt

@@ -46,6 +46,7 @@ class Kapt3AndGradleDaemon : KGPDaemonsBaseTest() {
     }
 
     @DisplayName("Annotation processor class should be loaded only once")
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
     @GradleTest
     fun testAnnotationProcessorClassIsLoadedOnce(gradleVersion: GradleVersion) {
         project(

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt

@@ -166,9 +166,8 @@ open class Kapt3IT : Kapt3BaseIT() {
             buildGradle.appendText(
                 """
                 |
-                |java {
+                |kotlin {
-                |    sourceCompatibility = JavaVersion.VERSION_1_8
+                |    jvmToolchain(8)
-                |    targetCompatibility = JavaVersion.VERSION_1_8
                 |}
                 """.trimMargin()
             )
@@ -894,6 +893,8 @@ open class Kapt3IT : Kapt3BaseIT() {
     }
 
     @DisplayName("KT-31127: processor using Filer api does not break 'javaCompile' task")
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
+    @AndroidTestVersions(maxVersion = TestVersions.AGP.AGP_74)
     @GradleTest
     fun testKotlinProcessorUsingFiler(gradleVersion: GradleVersion) {
         project("kotlinProject", gradleVersion) {
@@ -930,10 +931,11 @@ open class Kapt3IT : Kapt3BaseIT() {
 
     @DisplayName("should do annotation processing when 'sourceCompatibility = 8' and JDK is 11+")
     @JdkVersions(versions = [JavaVersion.VERSION_11])
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
     @GradleWithJdkTest
     fun testSimpleWithJdk11AndSourceLevel8(
         gradleVersion: GradleVersion,
-        jdk: JdkVersions.ProvidedJdk
+        jdk: JdkVersions.ProvidedJdk,
     ) {
         project(
             "simple".withPrefix,

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithAggregatingApt.kt

@@ -93,6 +93,7 @@ open class KaptIncrementalWithAggregatingApt : KaptIncrementalIT() {
 
     @DisplayName("Incremental changes in JDK9+")
     @JdkVersions(versions = [JavaVersion.VERSION_1_9])
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
     @GradleWithJdkTest
     fun testIncrementalChangesWithJdk9(gradleVersion: GradleVersion, jdk: JdkVersions.ProvidedJdk) {
         kaptProject(gradleVersion, buildJdk = jdk.location) {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt

@@ -166,6 +166,7 @@ open class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() {
 
     @DisplayName("KT-33617: sources in compile classpath jars")
     @JdkVersions(versions = [JavaVersion.VERSION_11])
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
     @GradleWithJdkTest
     fun testSourcesInCompileClasspathJars(gradleVersion: GradleVersion, jdk: JdkVersions.ProvidedJdk) {
         kaptProject(gradleVersion, buildJdk = jdk.location) {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt

@@ -245,12 +245,13 @@ class KotlinGradleIT : KGPBaseTest() {
             buildOptions = defaultBuildOptions.copy(incremental = true)
         ) {
             build("assemble")
+            val buildOptions = buildOptions.copy(
+                kotlinVersion = TestVersions.Kotlin.STABLE_RELEASE
+            )
             build(
                 "clean",
                 "assemble",
-                buildOptions = buildOptions.copy(
+                buildOptions = buildOptions
-                    kotlinVersion = TestVersions.Kotlin.STABLE_RELEASE
-                )
             )
         }
     }
@@ -508,7 +509,7 @@ class KotlinGradleIT : KGPBaseTest() {
     @GradleTest
     fun symlinkedBuildDir(
         gradleVersion: GradleVersion,
-        @TempDir tempDir: Path
+        @TempDir tempDir: Path,
     ) {
         project("internalTest", gradleVersion) {
             val externalBuildDir = tempDir.resolve("externalBuild")
@@ -659,7 +660,7 @@ class KotlinGradleIT : KGPBaseTest() {
                     }
                     else -> {
                         assertOutputContains(
-                            "No matching variant of project :projA was found. The consumer was configured to find an API of a library " +
+                            "No matching variant of project :projA was found. The consumer was configured to find a library for use during compile-time, " +
                                     "compatible with Java 8, preferably in the form of class files, " +
                                     "preferably optimized for standard JVMs, and its dependencies declared externally, " +
                                     "as well as attribute 'org.jetbrains.kotlin.platform.type' with value 'jvm', " +
@@ -691,7 +692,7 @@ class KotlinGradleIT : KGPBaseTest() {
                     }
                     else -> {
                         assertOutputContains(
-                            "No matching variant of project :projA was found. The consumer was configured to find an API of a library " +
+                            "No matching variant of project :projA was found. The consumer was configured to find a library for use during compile-time, " +
                                     "compatible with Java 8, preferably in the form of class files, preferably optimized for standard JVMs, " +
                                     "and its dependencies declared externally, " +
                                     "as well as attribute 'org.jetbrains.kotlin.platform.type' with value 'jvm', " +
@@ -729,10 +730,12 @@ class KotlinGradleIT : KGPBaseTest() {
 
             buildGradle.modify {
                 val reorderedClasspath = run {
-                    val (kotlinCompilerEmbeddable, others) = classpath.partition { "kotlin-compiler-embeddable" in it ||
+                    val (kotlinCompilerEmbeddable, others) = classpath.partition {
+                        "kotlin-compiler-embeddable" in it ||
                                 // build-common should be loaded prior compiler-embedable, otherwise we could depend on old version of
                                 // serializer classes and fail with NSME
-                                "kotlin-build-common" in it}
+                                "kotlin-build-common" in it
+                    }
                     others + kotlinCompilerEmbeddable
                 }
                 val newClasspathString = "classpath files(\n" + reorderedClasspath.joinToString(",\n") { "'$it'" } + "\n)"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt

@@ -12,7 +12,6 @@ import org.gradle.internal.jvm.Jvm
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.testbase.*
-import org.jetbrains.kotlin.test.TestMetadata
 import org.junit.jupiter.api.DisplayName
 import java.io.File
 import kotlin.io.path.appendText
@@ -564,6 +563,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
     }
 
     @DisplayName("JVM target shouldn't be changed when toolchain is not configured")
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
     @GradleTest
     internal fun shouldNotChangeJvmTargetWithNoToolchain(gradleVersion: GradleVersion) {
         project(
@@ -704,7 +704,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
     }
 
     @DisplayName("Toolchain should not override Jvm target configured in project level DSL")
-    @TestMetadata("kotlin-java-toolchain/simple")
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
     @GradleTest
     fun toolchainNotOverrideProjectJvmTarget(gradleVersion: GradleVersion) {
         project(

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt

@@ -559,7 +559,7 @@ open class NewMultiplatformIT : BaseGradleIT() {
                             maven { url 'https://plugins.gradle.org/m2/' }
                         }
                         dependencies {
-                            classpath 'com.github.jengelman.gradle.plugins:shadow:5.0.0'
+                            classpath 'com.github.johnrengelman:shadow:${TestVersions.ThirdPartyDependencies.SHADOW_PLUGIN_VERSION}'
                         }
                     }
                     

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt

@@ -201,7 +201,10 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
 
     @GradleTest
     @DisplayName("Should be compatible with project isolation")
-    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_1)
+    @GradleTestVersions(
+        minVersion = TestVersions.Gradle.G_7_1,
+        maxVersion = TestVersions.Gradle.G_7_6
+    )
     fun testProjectIsolation(gradleVersion: GradleVersion) {
         project(
             projectName = "instantExecution",
@@ -236,7 +239,12 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
     }
 
     @DisplayName("Validate Gradle plugins inputs")
-    @GradleTestVersions(minVersion = TestVersions.Gradle.MAX_SUPPORTED) // Always should use only latest Gradle version
+    // TODO(Dmitrii Krasnov): validate-external-gradle-plugin has been removed in Gradle 8.0,
+    //  so this test should be removed after correct configuring k-g-p and k-g-p-api tasks
+    @GradleTestVersions(
+        minVersion = TestVersions.Gradle.G_7_6,
+        maxVersion = TestVersions.Gradle.G_7_6
+    ) // Always should use only latest Gradle version
     @GradleTest
     internal fun validatePluginInputs(gradleVersion: GradleVersion) {
         project("kotlinProject", gradleVersion) {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt

@@ -16,6 +16,8 @@ import java.io.File
 @AndroidGradlePluginTests
 class Kapt3AndroidExternalIT : Kapt3BaseIT() {
     @DisplayName("kapt works with butterknife")
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
+    @AndroidTestVersions(maxVersion = TestVersions.AGP.AGP_74)
     @GradleAndroidTest
     fun testButterKnife(
         gradleVersion: GradleVersion,
@@ -127,6 +129,8 @@ class Kapt3AndroidExternalIT : Kapt3BaseIT() {
     }
 
     @DisplayName("kapt works with databinding")
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
+    @AndroidTestVersions(maxVersion = TestVersions.AGP.AGP_74)
     @GradleAndroidTest
     fun testDatabinding(
         gradleVersion: GradleVersion,

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidIT.kt

@@ -36,6 +36,8 @@ class Kapt3AndroidIT : Kapt3BaseIT() {
     }
 
     @DisplayName("KT-25374: kapt doesn't fail with anonymous classes with IC")
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
+    @AndroidTestVersions(maxVersion = TestVersions.AGP.AGP_74)
     @GradleAndroidTest
     fun testICWithAnonymousClasses(
         gradleVersion: GradleVersion,
@@ -119,6 +121,8 @@ class Kapt3AndroidIT : Kapt3BaseIT() {
     }
 
     @DisplayName("KT-31127: kapt doesn't break JavaCompile when using Filer API")
+    @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_6)
+    @AndroidTestVersions(maxVersion = TestVersions.AGP.AGP_74)
     @GradleAndroidTest
     fun testKotlinProcessorUsingFiler(
         gradleVersion: GradleVersion,
@@ -144,7 +148,7 @@ class Kapt3AndroidIT : Kapt3BaseIT() {
                 apply plugin: 'kotlin-kapt'
                 android {
                     libraryVariants.all {
-                        it.generateBuildConfig.enabled = false
+                        it.getGenerateBuildConfigProvider().get().enabled = false
                     }
                 }
     

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt

@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.gradle.internals.KOTLIN_NATIVE_IGNORE_DISABLED_TARGE
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics
 import org.jetbrains.kotlin.gradle.plugin.mpp.NativeOutputKind
 import org.jetbrains.kotlin.gradle.testbase.*
-import org.jetbrains.kotlin.gradle.testbase.TestVersions.Kotlin.NATIVE_STABLE_RELEASE
+import org.jetbrains.kotlin.gradle.testbase.TestVersions.Kotlin.STABLE_RELEASE
 import org.jetbrains.kotlin.gradle.util.modify
 import org.jetbrains.kotlin.gradle.util.runProcess
 import org.jetbrains.kotlin.konan.target.*
@@ -911,8 +911,8 @@ class GeneralNativeIT : BaseGradleIT() {
 
 
             val platform = HostManager.platformName()
-            val version = NATIVE_STABLE_RELEASE
+            val version = STABLE_RELEASE
-            val escapedRegexVersion = Regex.escape(NATIVE_STABLE_RELEASE)
+            val escapedRegexVersion = Regex.escape(STABLE_RELEASE)
             build("tasks", "-Pkotlin.native.version=$version") {
                 assertSuccessful()
                 assertContainsRegex("Kotlin/Native distribution: .*kotlin-native-prebuilt-$platform-$escapedRegexVersion".toRegex())

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt

@@ -27,12 +27,11 @@ interface TestVersions {
         const val G_8_1 = "8.1"
         const val MIN_SUPPORTED = minSupportedGradleVersion
         const val MIN_SUPPORTED_KPM = G_7_0
-        const val MAX_SUPPORTED = G_7_6
+        const val MAX_SUPPORTED = G_8_0
     }
 
     object Kotlin {
-        const val STABLE_RELEASE = "1.6.21"
+        const val STABLE_RELEASE = "1.8.22"
-        const val NATIVE_STABLE_RELEASE = "1.8.20"
 
         // Copied from KOTLIN_VERSION.kt file
         val CURRENT
@@ -46,12 +45,12 @@ interface TestVersions {
         const val AGP_72 = "7.2.2"
         const val AGP_73 = "7.3.1"
         const val AGP_74 = "7.4.0"
-        const val AGP_80 = "8.0.0-beta05"
+        const val AGP_80 = "8.0.2"
         const val AGP_81 = "8.1.0-alpha08"
         const val AGP_82 = "8.2.0-alpha09"
 
         const val MIN_SUPPORTED = AGP_42 // KotlinAndroidPlugin.minimalSupportedAgpVersion
-        const val MAX_SUPPORTED = AGP_74 // Update once Gradle MAX_SUPPORTED version will be bumped
+        const val MAX_SUPPORTED = AGP_80 // Update once Gradle MAX_SUPPORTED version will be bumped
     }
 
     enum class AgpCompatibilityMatrix(
@@ -79,4 +78,8 @@ interface TestVersions {
     object AppleGradlePlugin {
         const val V222_0_21 = "222.4550-0.21"
     }
+
+    object ThirdPartyDependencies {
+        const val SHADOW_PLUGIN_VERSION = "8.1.1"
+    }
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/app/build.gradle

@@ -17,8 +17,15 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-parcelize'
 
 android {
+
+    namespace "com.example.dagger.kotlin"
+
     compileSdkVersion 23
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     defaultConfig {
         applicationId "com.example.dagger.kotlin"
         minSdkVersion 14
@@ -51,4 +58,8 @@ dependencies {
     kapt 'com.google.dagger:dagger-compiler:2.9'
     kapt 'javax.annotation:javax.annotation-api:1.3.2'
     compileOnly 'org.glassfish:javax.annotation:10.0-b28'
+}
+
+kotlin {
+    jvmToolchain(8)
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.dagger.kotlin">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/gradle.properties

@@ -1,2 +1 @@
-org.gradle.jvmargs=-XX:MaxPermSize=512m
 kapt.info.as.warnings=true

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickProject/app/build.gradle

@@ -13,6 +13,8 @@ dependencies {
 }
 
 android {
+    namespace "com.github.frankiesardo.icepick"
+
     compileSdkVersion 23
 
     defaultConfig {
@@ -23,10 +25,8 @@ android {
         versionName "1.0"
     }
 
-    // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
+    kotlin {
-    compileOptions {
+        jvmToolchain(8)
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
     }
 
     lintOptions {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIcepickProject/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.frankiesardo.icepick"
     android:versionCode="1"
     android:versionName="1.0">
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalMultiModule/app/build.gradle

@@ -2,6 +2,9 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
+
+    namespace "com.example"
+
     compileSdkVersion 23
 
     defaultConfig {
@@ -12,11 +15,10 @@ android {
         versionName "1.0"
     }
 
-    // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
+    kotlin {
-    compileOptions {
+        jvmToolchain(8)
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
     }
+
     buildTypes.release.minifyEnabled = false
     lintOptions.abortOnError = false
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalMultiModule/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <activity android:name=".KotlinActivity"/>
     </application>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalMultiModule/libAndroid/build.gradle

@@ -2,6 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace "com.example.lib"
+
     compileSdkVersion 23
 
     defaultConfig {
@@ -10,12 +12,10 @@ android {
         versionCode 1
         versionName "1.0"
     }
-
+    kotlin {
-    // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
+        jvmToolchain(8)
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
     }
+
     buildTypes.release.minifyEnabled = false
     lintOptions.abortOnError = false
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalMultiModule/libAndroid/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.lib" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalMultiModule/libAndroidClassesOnly/build.gradle

@@ -2,6 +2,9 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+
+    namespace "com.example.lib2"
+
     compileSdkVersion 23
 
     defaultConfig {
@@ -11,11 +14,10 @@ android {
         versionName "1.0"
     }
 
-    // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
+    kotlin {
-    compileOptions {
+        jvmToolchain(8)
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
     }
+
     buildTypes.release.minifyEnabled = false
     lintOptions.abortOnError = false
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalMultiModule/libAndroidClassesOnly/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.lib2" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalMultiModule/libJvmClassesOnly/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
-java {
+kotlin {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    jvmToolchain(8)
-    targetCompatibility = JavaVersion.VERSION_1_8
 }
+

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle

@@ -14,6 +14,9 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
+
+    namespace 'com.example'
+
     compileSdkVersion 23
 
     defaultConfig {
@@ -49,4 +52,8 @@ repositories {
 dependencies {
     implementation 'com.android.support:appcompat-v7:23.1.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+kotlin {
+    jvmToolchain(8)
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity android:name=".JavaActivity">

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/gradle.properties

@@ -1 +0,0 @@
-org.gradle.jvmargs=-XX:MaxPermSize=512M

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidLibraryKotlinProject/build.gradle

@@ -20,6 +20,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace "org.jetbrains.kotlin.gradle.test.android.libalfa"
     compileSdkVersion 23
 }
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidLibraryKotlinProject/gradle.properties

@@ -1 +0,0 @@
-org.gradle.jvmargs=-XX:MaxPermSize=512m

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidLibraryKotlinProject/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.jetbrains.kotlin.gradle.test.android.libalfa"
           android:versionCode="1"
           android:versionName="1.0" >
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/app/build.gradle

@@ -3,6 +3,8 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 
 android {
+    namespace "com.example.parcelize"
+
     compileSdkVersion 23
 
     defaultConfig {
@@ -13,11 +15,10 @@ android {
         versionName "1.0"
     }
 
-    // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
+    kotlin {
-    compileOptions {
+        jvmToolchain(8)
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
     }
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.parcelize">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:label="app_name">
         <activity

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/gradle.properties

@@ -1 +0,0 @@
-org.gradle.jvmargs=-XX:MaxPermSize=512m

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidSimpleApp/build.gradle

@@ -10,8 +10,14 @@ repositories {
 }
 
 android {
+    namespace "com.example"
+
     compileSdkVersion 33
 
+    kotlin {
+        jvmToolchain(8)
+    }
+
     defaultConfig {
         applicationId "com.example"
         minSdkVersion 24
@@ -19,12 +25,6 @@ android {
         versionCode 1
         versionName "1.0"
     }
-
-    // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
 }
 
 dependencies {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidSimpleApp/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <activity android:name=".KotlinActivity"/>
     </application>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-custom-build-src-plugin/build.gradle.kts

@@ -18,7 +18,7 @@ kotlin {
     js {
         tasks.register("checkConfigurationsResolve") {
             doLast {
-                configurations.named(compilations["main"].npmAggregatedConfigurationName).resolve()
+                configurations.named(compilations["main"].npmAggregatedConfigurationName).get().resolve()
             }
         }
     }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/jvmAndJsProject/jvmLib/build.gradle

@@ -2,7 +2,6 @@ plugins {
     id "org.jetbrains.kotlin.jvm"
 }
 
-java {
+kotlin {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    jvmToolchain(8)
-    targetCompatibility = JavaVersion.VERSION_1_8
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-butterknife/app/build.gradle

@@ -3,6 +3,8 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
+    namespace "org.example.kotlin.butterknife"
+
     compileSdkVersion 23
 
     defaultConfig {
@@ -20,9 +22,8 @@ android {
         }
     }
 
-    compileOptions {
+    kotlin {
-        sourceCompatibility 1.8
+        jvmToolchain(8)
-        targetCompatibility 1.8
     }
 
     sourceSets {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-butterknife/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="org.example.kotlin.butterknife">
 
   <application
       android:label="@string/app_name"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dagger/app/build.gradle

@@ -3,8 +3,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
+    namespace "com.example.dagger.kotlin"
     compileSdkVersion 23
 
+    kotlin {
+        jvmToolchain(8)
+    }
+
     defaultConfig {
         applicationId "com.example.dagger.kotlin"
         minSdkVersion 14
@@ -13,11 +18,6 @@ android {
         versionName "1.0"
     }
 
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
-
     buildTypes {
         release {
             minifyEnabled false

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dagger/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.dagger.kotlin">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding/app/build.gradle

@@ -3,6 +3,8 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
+    namespace "com.example.databinding"
+
     compileSdkVersion 32
 
     defaultConfig {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-          package="com.example.databinding">
 
    <application
       android:allowBackup="true"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding/library/build.gradle

@@ -3,6 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
+    namespace "org.maw.library"
     compileSdkVersion 32
 
     defaultConfig {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding/library/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.maw.library"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle

@@ -3,6 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
+    namespace "mobi.porquenao.poc.kotlin"
     compileSdkVersion 23
 
     defaultConfig {
@@ -15,9 +16,8 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    compileOptions {
+    kotlin {
-        sourceCompatibility 1.8
+        jvmToolchain(8)
-        targetCompatibility 1.8
     }
 }
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    package="mobi.porquenao.poc.kotlin"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-inter-project-ic/app/build.gradle

@@ -3,6 +3,8 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
+    namespace "org.example.inter.project.ic"
+
     compileSdkVersion 23
 
     defaultConfig {
@@ -13,10 +15,8 @@ android {
         versionName "1.0"
     }
 
-    // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
+    kotlin {
-    compileOptions {
+        jvmToolchain(8)
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
     }
 }
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-inter-project-ic/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="org.example.inter.project.ic">
 
   <application android:name=".App">
   </application>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-inter-project-ic/lib-android/build.gradle

@@ -2,6 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace "org.example.inter.project.ic.androidLib"
+
     compileSdkVersion 23
 
     defaultConfig {
@@ -11,10 +13,8 @@ android {
         versionName "1.0"
     }
 
-    // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
+    kotlin {
-    compileOptions {
+        jvmToolchain(8)
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
     }
 }
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-inter-project-ic/lib-android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.example.inter.project.ic.androidLib"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-inter-project-ic/lib-jvm/build.gradle

@@ -4,7 +4,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
-java {
+kotlin {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    jvmToolchain(8)
-    targetCompatibility = JavaVersion.VERSION_1_8
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle

@@ -17,6 +17,7 @@ plugins {
 apply plugin: 'realm-android'
 
 android {
+    namespace "io.realm.examples.kotlin"
     compileSdkVersion 23
     defaultConfig {
         applicationId 'io.realm.examples.kotlin'
@@ -32,9 +33,8 @@ android {
         }
     }
 
-    compileOptions {
+    kotlin {
-        sourceCompatibility 1.8
+        jvmToolchain(8)
-        targetCompatibility 1.8
     }
 }
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest package="io.realm.examples.kotlin"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/androidx-navigation-safe-args/build.gradle

@@ -17,6 +17,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'androidx.navigation.safeargs'
 
 android {
+    namespace "test.androidx.navigation"
     compileSdkVersion 28
     defaultConfig {
         applicationId 'test.androidx.navigation'
@@ -32,9 +33,8 @@ android {
         }
     }
 
-    compileOptions {
+    kotlin {
-        sourceCompatibility 1.8
+        jvmToolchain(8)
-        targetCompatibility 1.8
     }
 
     dexOptions {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/androidx-navigation-safe-args/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-          package="test.androidx.navigation">
 
     <application
             android:allowBackup="true"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/icAnonymousTypes/build.gradle

@@ -16,27 +16,30 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 27
+    namespace "com.example.databinding"
 
-  defaultConfig {
+    compileSdkVersion 27
-    applicationId "org.kotlinlang.test"
 
-    minSdkVersion 16
+    defaultConfig {
-    targetSdkVersion 27
+        applicationId "org.kotlinlang.test"
 
-    versionCode 1
+        minSdkVersion 16
-    versionName "1.0"
+        targetSdkVersion 27
-  }
 
-  // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
+        versionCode 1
-  compileOptions {
+        versionName "1.0"
-    sourceCompatibility 1.8
+    }
-    targetCompatibility 1.8
-  }
 
-  dataBinding {
+
-    enabled true
+    // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
-  }
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
+    dataBinding {
+        enabled true
+    }
 }
 
 repositories {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/icAnonymousTypes/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"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-          package="com.example.databinding">
-
    <application android:label="test">
       <activity android:name=".MainActivity">
          <intent-filter>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt15001/app/build.gradle

@@ -3,8 +3,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
+    namespace "com.example.kt15001"
+
     compileSdkVersion 23
 
+    kotlin {
+        jvmToolchain(8)
+    }
+
     defaultConfig {
         applicationId "com.example.kt15001"
         minSdkVersion 23
@@ -12,12 +18,6 @@ android {
         versionCode 1
         versionName "1.0"
     }
-
-    // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
     
     buildTypes {
         release {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt15001/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="com.example.kt15001">
 
   <application
       android:allowBackup="true"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalAggregatingProcessorProject/build.gradle

@@ -12,9 +12,8 @@ repositories {
     }
 }
 
-java {
+kotlin {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    jvmToolchain(8)
-    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 dependencies {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kgp-with-icerock-mobile-multiplatform/build.gradle.kts

@@ -8,6 +8,9 @@ plugins {
 android {
     namespace = "com.example"
     compileSdk = 24
+    kotlin {
+        jvmToolchain(8)
+    }
 }
 
 repositories {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinProject/gradle.properties

@@ -1 +1 @@
-org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=512m
+org.gradle.jvmargs=-Xmx1024m

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-50161-androidBuildCacheWithVariantFilter/app/build.gradle

@@ -10,6 +10,9 @@ repositories {
 }
 
 android {
+
+    namespace "com.revolut.cmdemo"
+
     compileSdkVersion 31
     buildTypes {
         release {
@@ -18,9 +21,8 @@ android {
         }
     }
 
-    compileOptions {
+    kotlin {
-        sourceCompatibility 1.8
+        jvmToolchain(8)
-        targetCompatibility 1.8
     }
 }
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-50161-androidBuildCacheWithVariantFilter/app/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
+<manifest>
-    package="com.revolut.cmdemo">
 </manifest>