diff --git a/libraries/ReadMe.md b/libraries/ReadMe.md index 4ad403c825d..68979c4252d 100644 --- a/libraries/ReadMe.md +++ b/libraries/ReadMe.md @@ -7,8 +7,6 @@ This part of the project contains the sources of the following libraries: - [kotlin-test](kotlin.test), the library for multiplatform unit testing - [kotlin-annotations-jvm](tools/kotlin-annotations-jvm), the annotations to improve types in the Java code to look better when being consumed in the Kotlin code. - - These libraries are built as a part of the [root](../) Gradle project. diff --git a/libraries/tools/kotlin-annotations-android/build.gradle.kts b/libraries/tools/kotlin-annotations-android/build.gradle.kts deleted file mode 100644 index 297e3f9c1fb..00000000000 --- a/libraries/tools/kotlin-annotations-android/build.gradle.kts +++ /dev/null @@ -1,37 +0,0 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import org.jetbrains.kotlin.pill.PillExtension - -description = "Kotlin annotations for Android" - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -pill { - variant = PillExtension.Variant.FULL -} - -jvmTarget = "1.6" -javaHome = rootProject.extra["JDK_16"] as String - -tasks.withType { - kotlinOptions.freeCompilerArgs += listOf("-Xallow-kotlin-package") - kotlinOptions.moduleName = project.name -} - -sourceSets { - "main" { - projectDefault() - } -} - -dependencies { - compileOnly(kotlinBuiltins()) -} - -publish() - -sourcesJar() -javadocJar() -runtimeJar() diff --git a/libraries/tools/kotlin-annotations-android/src/kotlin/Annotations.kt b/libraries/tools/kotlin-annotations-android/src/kotlin/Annotations.kt deleted file mode 100644 index 641e675fe5c..00000000000 --- a/libraries/tools/kotlin-annotations-android/src/kotlin/Annotations.kt +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package kotlin.annotations.jvm.internal - -/** - * Defines parameter name. - */ -@Target(AnnotationTarget.VALUE_PARAMETER) -@Retention(AnnotationRetention.BINARY) -public annotation class ParameterName(val value: String) - -/** - * Default value for java method parameter. - */ -@Target(AnnotationTarget.VALUE_PARAMETER) -@Retention(AnnotationRetention.BINARY) -public annotation class DefaultValue(val value: String) - -/** - * Define that null is default value for method parameter. - */ -@Target(AnnotationTarget.VALUE_PARAMETER) -@Retention(AnnotationRetention.BINARY) -public annotation class DefaultNull diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index d7d5ffab1ba..7c8c6eb99ab 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -80,7 +80,6 @@ val distLibraryProjects = listOfNotNull( ":kotlin-annotation-processing", ":kotlin-annotation-processing-cli", ":kotlin-annotation-processing-runtime", - ":kotlin-annotations-android", ":kotlin-annotations-jvm", ":kotlin-ant", ":kotlin-daemon", diff --git a/settings.gradle b/settings.gradle index aea202ba2eb..9ae697f5a7e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -263,7 +263,6 @@ include ":benchmarks", ":examples:kotlin-jsr223-local-example", ":examples:kotlin-jsr223-daemon-local-eval-example", ":kotlin-annotations-jvm", - ":kotlin-annotations-android", ":kotlin-scripting-common", ':kotlin-scripting-js', ':kotlin-scripting-js-test', @@ -532,7 +531,6 @@ project(':plugins:kapt3-idea').projectDir = "$rootDir/plugins/kapt3/kapt3-idea" 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(':kotlin-annotations-android').projectDir = "$rootDir/libraries/tools/kotlin-annotations-android" as File project(':kotlin-scripting-common').projectDir = "$rootDir/libraries/scripting/common" as File project(':kotlin-scripting-js').projectDir = "$rootDir/libraries/scripting/js" as File project(':kotlin-scripting-js-test').projectDir = "$rootDir/libraries/scripting/js-test" as File