azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update android annotations. Do not add jdk annotations for android sdk

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-01-15 12:19:30 +04:00
parent 786e59bbfa
commit 14f4b6e4b4
344 changed files with 47371 additions and 26982 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+1 -2
View File
@@ -170,8 +170,7 @@ open class KotlinAndroidPlugin: Plugin<Project> {
})
val version = project.getProperties()!!.get("kotlin.gradle.plugin.version") as String
project.getExtensions().add(DEFAULT_ANNOTATIONS, GradleUtils.resolveDependencies(project, "org.jetbrains.kotlin:kotlin-jdk-annotations:$version",
"org.jetbrains.kotlin:kotlin-android-sdk-annotations:$version"));
project.getExtensions().add(DEFAULT_ANNOTATIONS, GradleUtils.resolveDependencies(project, "org.jetbrains.kotlin:kotlin-android-sdk-annotations:$version"));
}
private fun processVariants(variants: DefaultDomainObjectSet<out BaseVariant>, project: Project, androidExt: BaseExtension): Unit {