From b00aa7d5d3052daf54d8408e239ff116f3f32fcd Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Fri, 19 Mar 2021 07:32:50 +0300
Subject: [PATCH] Test Gradle plugin with Gradle 7.0

`withJava()` is removed from MPP test, because our tests don't contain Java,
 but the latest stable version of Kotlin fails with exceptions,
 when Gradle 7.0 is used. The issue is fixed in Kotlin's master:
 https://github.com/JetBrains/kotlin/commit/297aa17b6ea7c25f65e05f007ca9fe9909219960
---
 gradle-plugins/compose/build.gradle.kts                          | 1 +
 .../compose/src/test/test-projects/application/mpp/build.gradle  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts
index 3359ceeac35..9909aa42e13 100644
--- a/gradle-plugins/compose/build.gradle.kts
+++ b/gradle-plugins/compose/build.gradle.kts
@@ -61,6 +61,7 @@ val jar = tasks.named<Jar>("jar") {
 // __SUPPORTED_GRADLE_VERSIONS__
 testGradleVersion("6.4")
 testGradleVersion("6.8.3")
+testGradleVersion("7.0-milestone-3")
 
 val javaHomeForTests: String? = when {
     // __COMPOSE_NATIVE_DISTRIBUTIONS_MIN_JAVA_VERSION__
diff --git a/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle
index 102c54677ac..a2532d8502e 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle
+++ b/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle
@@ -16,7 +16,6 @@ repositories {
 
 kotlin {
     jvm {
-        withJava()
     }
     sourceSets {
         named("jvmMain") {