Migrate only Kapt tests to new test dsl.

^KT-45745 In Progress

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

@@ -134,16 +134,29 @@ class Kapt3Android70IT : Kapt3AndroidIT() {
     }
 }
 
-class Kapt3Android42IT : Kapt3BaseIT() {
+class Kapt3Android42IT : BaseGradleIT() {
+    companion object {
+        private val KAPT_SUCCESSFUL_REGEX = "Annotation processing complete, errors: 0".toRegex()
+    }
+
+    private fun kaptOptions(): KaptOptions =
+        KaptOptions(verbose = true, useWorkers = false)
+
+    private fun CompiledProject.assertKaptSuccessful() {
+        KAPT_SUCCESSFUL_REGEX.findAll(this.output).count() > 0
+    }
+
     override val defaultGradleVersion: GradleVersionRequired
         get() = GradleVersionRequired.AtLeast("6.7.1")
 
     override fun defaultBuildOptions(): BuildOptions =
         super.defaultBuildOptions().copy(
+            kaptOptions = kaptOptions(),
+            warningMode = WarningMode.Summary,
             androidHome = KtTestUtil.findAndroidSdk(),
             androidGradlePluginVersion = AGPVersion.v4_2_0
         )
-
+    
     /** Regression test for https://youtrack.jetbrains.com/issue/KT-44020. */
     @Test
     fun testDatabindingWithAndroidX() {
@@ -156,11 +169,24 @@ class Kapt3Android42IT : Kapt3BaseIT() {
     }
 }
 
-abstract class Kapt3AndroidIT : Kapt3BaseIT() {
+abstract class Kapt3AndroidIT : BaseGradleIT() {
+    companion object {
+        private val KAPT_SUCCESSFUL_REGEX = "Annotation processing complete, errors: 0".toRegex()
+    }
+
+    protected open fun kaptOptions(): KaptOptions =
+        KaptOptions(verbose = true, useWorkers = false)
+
+    fun CompiledProject.assertKaptSuccessful() {
+        KAPT_SUCCESSFUL_REGEX.findAll(this.output).count() > 0
+    }
+
     protected abstract val androidGradlePluginVersion: AGPVersion
 
     override fun defaultBuildOptions() =
         super.defaultBuildOptions().copy(
+            kaptOptions = kaptOptions(),
+            warningMode = WarningMode.Summary,
             androidHome = KtTestUtil.findAndroidSdk(),
             androidGradlePluginVersion = androidGradlePluginVersion
         )

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

@@ -1,17 +1,9 @@
-buildscript {
+plugins {
-    repositories {
+    id "java"
-        mavenLocal()
+    id "org.jetbrains.kotlin.jvm"
-        mavenCentral()
+    id "org.jetbrains.kotlin.kapt"
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
 }
 
-apply plugin: "java"
-apply plugin: "kotlin"
-apply plugin: "kotlin-kapt"
-
 repositories {
     mavenLocal()
     mavenCentral()
@@ -24,5 +16,6 @@ kapt {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     kapt "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+//    kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
     implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
 }

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

@@ -1 +0,0 @@
-kapt.verbose=true

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

@@ -1,16 +1,8 @@
-buildscript {
+plugins {
-    repositories {
+    id "org.jetbrains.kotlin.jvm"
-        mavenLocal()
+    id "org.jetbrains.kotlin.kapt"
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
 }
 
-apply plugin: "kotlin"
-apply plugin: "kotlin-kapt"
-
 repositories {
     mavenLocal()
     mavenCentral()

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

@@ -1 +0,0 @@
-kapt.verbose=true

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

@@ -1,25 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin'
-
-allprojects {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation project(":processor")
-    kapt project(":processor")
-}

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

@@ -1,9 +0,0 @@
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin'
-
-dependencies {
-    ext.autoServiceVersion = '1.0-rc2'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "com.google.auto.service:auto-service:$autoServiceVersion"
-    kapt "com.google.auto.service:auto-service:$autoServiceVersion"
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/autoService/processor/src/main/kotlin/processor/MyProcessor.kt

@@ -1,28 +0,0 @@
-package processor
-
-import com.google.auto.service.AutoService
-import javax.annotation.processing.*
-import javax.lang.model.SourceVersion
-import javax.lang.model.element.TypeElement
-import javax.tools.Diagnostic
-
-@AutoService(Processor::class)
-@SupportedAnnotationTypes("annotation.ProcessThis")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
-class MyProcessor() : AbstractProcessor() {
-
-    private var fileCreated = false
-
-    override fun process(annotations: Set<TypeElement>,
-            roundEnv: RoundEnvironment): Boolean {
-        processingEnv.messager.printMessage(Diagnostic.Kind.NOTE, "Working!")
-        if (fileCreated) return true
-        fileCreated = true
-        val file = processingEnv.filer.createSourceFile("Check")
-        file.openWriter().use {
-            it.appendLine("// $annotations")
-            it.appendLine("public class Check {}")
-        }
-        return true
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/autoService/settings.gradle

@@ -1 +0,0 @@
-rootProject.name = 'kaptbug'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/autoService/src/main/kotlin/annotation/ProcessThis.kt

@@ -1,3 +0,0 @@
-package annotation
-
-annotation class ProcessThis

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/autoService/src/main/kotlin/model/Model.kt

@@ -1,17 +0,0 @@
-package model
-
-import annotation.ProcessThis
-
-@ProcessThis
-interface Model {
-
-    var a: Int
-
-    var b: Int
-}
-
-@ProcessThis
-class Class {
-
-    var a = 0
-}

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

@@ -1,17 +1,9 @@
-buildscript {
+plugins {
-    repositories {
+    id "java"
-        mavenLocal()
+    id "org.jetbrains.kotlin.jvm"
-        mavenCentral()
+    id "org.jetbrains.kotlin.kapt"
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
 }
 
-apply plugin: "java"
-apply plugin: "kotlin"
-apply plugin: "kotlin-kapt"
-
 repositories {
     mavenLocal()
     mavenCentral()
@@ -21,4 +13,4 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
     kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
-}
+}

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

@@ -1 +0,0 @@
-kapt.verbose=true

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

@@ -1,17 +1,9 @@
-buildscript {
+plugins {
-    repositories {
+    id "java"
-        mavenLocal()
+    id "org.jetbrains.kotlin.jvm"
-        mavenCentral()
+    id "org.jetbrains.kotlin.kapt"
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
 }
 
-apply plugin: "java"
-apply plugin: "kotlin"
-apply plugin: "kotlin-kapt"
-
 repositories {
     mavenLocal()
     mavenCentral()

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

@@ -1,17 +1,8 @@
-buildscript {
+plugins {
-    repositories {
+    id "org.jetbrains.kotlin.jvm"
-        mavenLocal()
+    id "org.jetbrains.kotlin.kapt"
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
 }
 
-apply plugin: "java"
-apply plugin: "kotlin"
-apply plugin: "kotlin-kapt"
-
 repositories {
     mavenLocal()
     mavenCentral()

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

@@ -1 +0,0 @@
-kapt.verbose=true

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

@@ -1,13 +1,3 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 subprojects {
     repositories {
         mavenLocal()

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

@@ -1,3 +1,2 @@
-kapt.verbose=true
 kapt.workers.log.classloading=true
 kapt.workers.isolation=process

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

@@ -1,5 +1,7 @@
-apply plugin: "kotlin"
+plugins {
-apply plugin: "kotlin-kapt"
+    id "org.jetbrains.kotlin.jvm"
+    id "org.jetbrains.kotlin.kapt"
+}
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

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

@@ -1,5 +1,7 @@
-apply plugin: "kotlin"
+plugins {
-apply plugin: "kotlin-kapt"
+    id "org.jetbrains.kotlin.jvm"
+    id "org.jetbrains.kotlin.kapt"
+}
 
 dependencies {
     implementation project(":module1")

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

@@ -1,18 +1,9 @@
-buildscript {
+plugins {
-    repositories {
+    id "java"
-        mavenLocal()
+    id "org.jetbrains.kotlin.jvm"
-        mavenCentral()
+    id "org.jetbrains.kotlin.kapt"
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
 }
 
-apply plugin: "java"
-apply plugin: "kotlin"
-apply plugin: "kotlin-kapt"
-
 repositories {
     mavenLocal()
     mavenCentral()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/jpms-module/gradle.properties

@@ -1 +0,0 @@
-kapt.verbose=true

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/kaptAvoidance/settings.gradle

@@ -1,13 +1 @@
-pluginManagement {
+include ':app', ':lib'
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    plugins {
-        id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
-        id "org.jetbrains.kotlin.kapt" version "$kotlin_version"
-    }
-}
-
-include ':app', ':lib'

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

@@ -1,16 +1,8 @@
-buildscript {
+plugins {
-    repositories {
+    id 'org.jetbrains.kotlin.jvm'
-        mavenLocal()
+    id 'org.jetbrains.kotlin.kapt'
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
 }
 
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-kapt'
-
 repositories {
     mavenLocal()
     mavenCentral()

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

@@ -1,17 +1,9 @@
-buildscript {
+plugins {
-    repositories {
+    id "java"
-        mavenLocal()
+    id "org.jetbrains.kotlin.jvm"
-        mavenCentral()
+    id "org.jetbrains.kotlin.kapt"
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
 }
 
-apply plugin: "java"
-apply plugin: "kotlin"
-apply plugin: "kotlin-kapt"
-
 repositories {
     mavenLocal()
     mavenCentral()

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

@@ -1,5 +1,7 @@
-apply plugin: 'kotlin'
+plugins {
-apply plugin: 'kotlin-kapt'
+    id 'org.jetbrains.kotlin.jvm'
+    id 'org.jetbrains.kotlin.kapt'
+}
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

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

@@ -1,13 +1,3 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         mavenCentral()

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

@@ -1,5 +1,6 @@
-apply plugin: 'kotlin'
+plugins {
-apply plugin: 'java-library'
+    id 'org.jetbrains.kotlin.jvm'
+}
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

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

@@ -1,5 +1,7 @@
-apply plugin: 'kotlin'
+plugins {
-apply plugin: 'kotlin-kapt'
+    id 'org.jetbrains.kotlin.jvm'
+    id 'org.jetbrains.kotlin.kapt'
+}
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

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

@@ -1,14 +1,3 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 subprojects {
     repositories {
         mavenLocal()

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

@@ -1,5 +1,7 @@
-apply plugin: 'kotlin'
+plugins {
-apply plugin: 'kotlin-kapt'
+    id 'org.jetbrains.kotlin.jvm'
+    id 'org.jetbrains.kotlin.kapt'
+}
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

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

@@ -1,4 +1,6 @@
-apply plugin: 'kotlin'
+plugins {
+    id 'org.jetbrains.kotlin.jvm'
+}
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

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

@@ -1,13 +1,3 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         mavenLocal()

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

@@ -1,5 +1,8 @@
-apply plugin: 'kotlin'
+plugins {
-apply plugin: 'kotlin-kapt'
+    id 'org.jetbrains.kotlin.jvm'
+    id 'org.jetbrains.kotlin.kapt'
+    id 'idea'
+}
 
 dependencies {
 	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
@@ -12,8 +15,6 @@ dependencies {
     testImplementation'junit:junit:4.12'
 }
 
-apply plugin: 'idea'
-
 idea {
     module {
         sourceDirs += files('build/generated/source/kapt/main', 'build/generated/source/kaptKotlin/main')

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

@@ -1 +0,0 @@
-kapt.verbose=true

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

@@ -1,17 +1,9 @@
-buildscript {
+plugins {
-    repositories {
+    id "java"
-        mavenLocal()
+    id "org.jetbrains.kotlin.jvm"
-        mavenCentral()
+    id "org.jetbrains.kotlin.kapt"
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
 }
 
-apply plugin: "java"
-apply plugin: "kotlin"
-apply plugin: "kotlin-kapt"
-
 repositories {
     mavenLocal()
     mavenCentral()

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

@@ -1,16 +1,8 @@
-buildscript {
+plugins {
-    repositories {
+    id "java"
-        mavenLocal()
+    id "org.jetbrains.kotlin.jvm"
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
 }
 
-apply plugin: "java"
-apply plugin: "kotlin"
-
 repositories {
     mavenLocal()
     mavenCentral()

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

@@ -1,17 +1,9 @@
-buildscript {
+plugins {
-    repositories {
+    id "java"
-        mavenLocal()
+    id "org.jetbrains.kotlin.jvm"
-        mavenCentral()
+    id "org.jetbrains.kotlin.kapt"
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
 }
 
-apply plugin: "java"
-apply plugin: "kotlin"
-apply plugin: "kotlin-kapt"
-
 repositories {
     mavenLocal()
     mavenCentral()

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

@@ -1 +0,0 @@
-kapt.verbose=true

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/simple/settings.gradle

@@ -1,10 +1,12 @@
 pluginManagement {
+    // Required for KaptModeIT. Remove it once these tests will be migrated.
     repositories {
         mavenLocal()
-        mavenCentral()
+        gradlePluginPortal()
     }
 
     plugins {
         id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
+        id "org.jetbrains.kotlin.kapt" version "$kotlin_version"
     }
 }

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

@@ -10,5 +10,6 @@ pluginManagement {
     plugins {
         id "org.jetbrains.kotlin.jvm" version "$kotlin_version"
         id "org.jetbrains.kotlin.plugin.allopen" version "$kotlin_version"
+        id "org.jetbrains.kotlin.kapt" version "$kotlin_version"
     }
 }