Rename android-annotations -> kotlin-annotations-android

also rewrite it's buildscript in kts and add to compiler tests dependencies
2017-10-10 12:08:05 +03:00
parent 781ca6d2b5
commit 13880b18ea
7 changed files with 29 additions and 41 deletions
@@ -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
-    ]
-}
-
@@ -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()