From 13880b18ea6e98fb9d900b57af9e716fbb532de1 Mon Sep 17 00:00:00 2001 From: Leonid Stashevsky Date: Tue, 10 Oct 2017 12:08:05 +0300 Subject: [PATCH] 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 | 1 - compiler/build.gradle.kts | 3 +- .../forTestCompile/ForTestCompileRuntime.java | 2 +- .../tools/android-annotations/build.gradle | 36 ------------------- .../build.gradle.kts | 24 +++++++++++++ .../src/kotlin/Annotations.kt | 0 settings.gradle | 4 +-- 7 files changed, 29 insertions(+), 41 deletions(-) delete mode 100644 libraries/tools/android-annotations/build.gradle create mode 100644 libraries/tools/kotlin-annotations-android/build.gradle.kts rename libraries/tools/{android-annotations => kotlin-annotations-android}/src/kotlin/Annotations.kt (100%) diff --git a/compiler.tests-common/build.gradle.kts b/compiler.tests-common/build.gradle.kts index 1602295b908..41b9d7e94db 100644 --- a/compiler.tests-common/build.gradle.kts +++ b/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")) diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 668cf867fa6..0c998878e19 100644 --- a/compiler/build.gradle.kts +++ b/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 { diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java index da1b9f9af2b..9f79b736a6f 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java +++ b/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 diff --git a/libraries/tools/android-annotations/build.gradle b/libraries/tools/android-annotations/build.gradle deleted file mode 100644 index 17588afa83b..00000000000 --- a/libraries/tools/android-annotations/build.gradle +++ /dev/null @@ -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 - ] -} - diff --git a/libraries/tools/kotlin-annotations-android/build.gradle.kts b/libraries/tools/kotlin-annotations-android/build.gradle.kts new file mode 100644 index 00000000000..2c8debe44bc --- /dev/null +++ b/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 { + kotlinOptions.freeCompilerArgs += listOf( + "-Xallow-kotlin-package", + "-module-name", project.name + ) +} + +sourceSets { + "main" { + projectDefault() + } +} + +runtimeJar() +dist() diff --git a/libraries/tools/android-annotations/src/kotlin/Annotations.kt b/libraries/tools/kotlin-annotations-android/src/kotlin/Annotations.kt similarity index 100% rename from libraries/tools/android-annotations/src/kotlin/Annotations.kt rename to libraries/tools/kotlin-annotations-android/src/kotlin/Annotations.kt diff --git a/settings.gradle b/settings.gradle index 23680da4d26..b065bbd608b 100644 --- a/settings.gradle +++ b/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")