From 6e913e16adb7b489f9016de78df1b8dd7963c02e Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <sergey.igushkin@jetbrains.com>
Date: Wed, 13 Jan 2021 15:44:15 +0400
Subject: [PATCH] Add integration tests for Kapt + Android Gradle plugin 7.0

---
 .../jetbrains/kotlin/gradle/Kapt3AndroidIT.kt | 37 +++++++++++++++++--
 .../kapt2/kt15001/app/build.gradle            |  1 +
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt
index 63317eb13e5..5427d326480 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt
@@ -1,8 +1,11 @@
 package org.jetbrains.kotlin.gradle
 
+import org.gradle.api.logging.configuration.WarningMode
 import org.jetbrains.kotlin.gradle.util.*
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import org.junit.Assert
+import org.junit.Assume
+import org.junit.Ignore
 import org.junit.Test
 import java.io.File
 
@@ -90,6 +93,32 @@ class Kapt3Android34IT : Kapt3AndroidIT() {
         get() = GradleVersionRequired.Until("5.4.1")
 }
 
+class Kapt3Android70IT : Kapt3AndroidIT() {
+    override val androidGradlePluginVersion: AGPVersion
+        get() = AGPVersion.v7_0_0
+
+    override val defaultGradleVersion: GradleVersionRequired
+        get() = GradleVersionRequired.AtLeast("6.8")
+
+    override fun defaultBuildOptions(): BuildOptions {
+        val javaHome = File(System.getProperty("jdk11Home")!!)
+        Assume.assumeTrue("JDK 11 should be available", javaHome.isDirectory)
+        return super.defaultBuildOptions().copy(javaHome = javaHome, warningMode = WarningMode.Summary)
+    }
+
+    @Ignore("KT-44350")
+    override fun testRealm() = Unit
+
+    @Ignore("KT-44350")
+    override fun testDatabinding() = Unit
+
+    @Ignore("KT-44350")
+    override fun testDagger() = Unit
+
+    @Ignore("KT-44350")
+    override fun testButterKnife() = Unit
+}
+
 class Kapt3Android42IT : Kapt3BaseIT() {
     override val defaultGradleVersion: GradleVersionRequired
         get() = GradleVersionRequired.AtLeast("6.7")
@@ -119,7 +148,7 @@ abstract class Kapt3AndroidIT : Kapt3BaseIT() {
         )
 
     @Test
-    fun testButterKnife() {
+    open fun testButterKnife() {
         val project = Project("android-butterknife", directoryPrefix = "kapt2")
 
         project.build("assembleDebug") {
@@ -141,7 +170,7 @@ abstract class Kapt3AndroidIT : Kapt3BaseIT() {
     }
 
     @Test
-    fun testDagger() {
+    open fun testDagger() {
         val project = Project("android-dagger", directoryPrefix = "kapt2")
 
         project.build("assembleDebug") {
@@ -184,7 +213,7 @@ abstract class Kapt3AndroidIT : Kapt3BaseIT() {
     }
 
     @Test
-    fun testRealm() {
+    open fun testRealm() {
         val project = Project("android-realm", directoryPrefix = "kapt2")
 
         project.build("assembleDebug") {
@@ -247,7 +276,7 @@ abstract class Kapt3AndroidIT : Kapt3BaseIT() {
     }
 
     @Test
-    fun testDatabinding() {
+    open fun testDatabinding() {
         val project = Project("android-databinding", directoryPrefix = "kapt2")
         setupDataBinding(project)
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt15001/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt15001/app/build.gradle
index 4fb7e01dbe0..c720c5be65f 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt15001/app/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kt15001/app/build.gradle
@@ -28,6 +28,7 @@ dependencies {
 
     implementation 'com.google.dagger:dagger:2.8'
     kapt 'com.google.dagger:dagger-compiler:2.8'
+    kapt 'javax.annotation:javax.annotation-api:1.3.2'
 
     implementation 'com.android.support:appcompat-v7:23.3.0'
 }
\ No newline at end of file