Rename android-annotations -> kotlin-annotations-android

also rewrite it's buildscript in kts and add to compiler tests dependencies

compiler.tests-common/build.gradle.kts

@@ -24,7 +24,6 @@ dependencies {
     compileOnly(project(":plugins:android-extensions-compiler"))
     compile(project(":kotlin-test:kotlin-test-jvm"))
     compile(project(":compiler:tests-common-jvm6"))
-    compile(project(":android-annotations"))
     compile(commonDep("junit:junit"))
     compile(ideaSdkCoreDeps("intellij-core"))
     compile(ideaSdkDeps("openapi", "idea", "idea_rt"))

compiler/build.gradle.kts

@@ -33,7 +33,8 @@ val testDistProjects = listOf(
         ":kotlin-preloader",
         ":plugins:android-extensions-compiler",
         ":kotlin-ant",
-        ":kotlin-annotations-jvm")
+        ":kotlin-annotations-jvm",
+        ":kotlin-annotations-android")
 
 dependencies {
     depDistProjects.forEach {

compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java

@@ -78,7 +78,7 @@ public class ForTestCompileRuntime {
 
     @NotNull
     public static File androidAnnotationsForTests() {
-        return assertExists(new File("dist/kotlinc/lib/android-annotations.jar"));
+        return assertExists(new File("dist/kotlinc/lib/kotlin-annotations-android.jar"));
     }
 
     // TODO: Do not use these classes, remove them after stdlib tests are merged in the same build as the compiler

libraries/tools/android-annotations/build.gradle

@@ -1,36 +0,0 @@
-description = 'Kotlin annotations for Android'
-
-apply plugin: 'kotlin'
-
-configureJvm6Project(project)
-configurePublishing(project)
-
-sourceSets {
-    main {
-        kotlin {
-            srcDir 'src'
-        }
-    }
-}
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
-}
-
-dist {
-    from (jar, sourcesJar)
-}
-
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-    kotlinOptions.jdkHome = JDK_16
-    kotlinOptions.jvmTarget = 1.6
-}
-
-compileKotlin {
-    kotlinOptions.freeCompilerArgs = [
-            "-Xallow-kotlin-package",
-            "-module-name", project.name
-    ]
-}
-

libraries/tools/kotlin-annotations-android/build.gradle.kts

@@ -0,0 +1,24 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+description = "Kotlin annotations for Android"
+
+apply { plugin("kotlin") }
+
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
+tasks.withType<KotlinCompile> {
+    kotlinOptions.freeCompilerArgs += listOf(
+            "-Xallow-kotlin-package",
+            "-module-name", project.name
+    )
+}
+
+sourceSets {
+    "main" {
+        projectDefault()
+    }
+}
+
+runtimeJar()
+dist()

settings.gradle

@@ -134,7 +134,7 @@ include ":kotlin-build-common",
         ":ultimate",
         ":ultimate:ultimate-runner",
         ":kotlin-annotations-jvm",
-        ":android-annotations",
+        ":kotlin-annotations-android",
 
         // plugin markers:
         ':kotlin-gradle-plugin:plugin-marker',
@@ -206,7 +206,7 @@ project(':kotlin-annotation-processing').projectDir = "$rootDir/plugins/kapt3" a
 project(':examples:kotlin-jsr223-local-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-local-example" as File
 project(':examples:kotlin-jsr223-daemon-local-eval-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-daemon-local-eval-example" as File
 project(':kotlin-annotations-jvm').projectDir = "$rootDir/libraries/tools/kotlin-annotations-jvm" as File
-project(':android-annotations').projectDir = "$rootDir/libraries/tools/android-annotations" as File
+project(':kotlin-annotations-android').projectDir = "$rootDir/libraries/tools/kotlin-annotations-android" as File
 
 // plugin markers:
 project(':kotlin-gradle-plugin:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-gradle-plugin/plugin-marker")