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

Gradle: update annotation syntax

Browse Source
This commit is contained in:
Yan Zhulanow
2015-06-10 20:08:40 +03:00
parent e3c6f32b50
commit 08fa9b639e
2 changed files with 6 additions and 6 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/tasks/Tasks.kt
+2 -2
View File
@@ -55,7 +55,7 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractCo
private val logger = Logging.getLogger(this.javaClass) private val logger = Logging.getLogger(this.javaClass)
override fun getLogger() = logger override fun getLogger() = logger
[TaskAction] @TaskAction
override fun compile() { override fun compile() {
getLogger().debug("Starting ${javaClass} task") getLogger().debug("Starting ${javaClass} task")
val args = createBlankArgs() val args = createBlankArgs()
@@ -350,7 +350,7 @@ private fun <T: Any> ExtraPropertiesExtension.getOrNull(id: String): T? {
} }
fun getAnnotations(project: Project, logger: Logger): Collection<File> { fun getAnnotations(project: Project, logger: Logger): Collection<File> {
[suppress("UNCHECKED_CAST")] @suppress("UNCHECKED_CAST")
val annotations = project.getExtensions().getByName(DEFAULT_ANNOTATIONS) as Collection<File> val annotations = project.getExtensions().getByName(DEFAULT_ANNOTATIONS) as Collection<File>
if (!annotations.isEmpty()) { if (!annotations.isEmpty()) {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+4 -4
View File
@@ -228,7 +228,7 @@ class Kotlin2JsSourceSetProcessor(
} }
abstract class AbstractKotlinPlugin [Inject] (val scriptHandler: ScriptHandler, val tasksProvider: KotlinTasksProvider) : Plugin<Project> { abstract class AbstractKotlinPlugin @Inject constructor(val scriptHandler: ScriptHandler, val tasksProvider: KotlinTasksProvider) : Plugin<Project> {
abstract fun buildSourceSetProcessor(project: ProjectInternal, javaBasePlugin: JavaBasePlugin, sourceSet: SourceSet): KotlinSourceSetProcessor<*> abstract fun buildSourceSetProcessor(project: ProjectInternal, javaBasePlugin: JavaBasePlugin, sourceSet: SourceSet): KotlinSourceSetProcessor<*>
public override fun apply(project: Project) { public override fun apply(project: Project) {
@@ -273,7 +273,7 @@ abstract class AbstractKotlinPlugin [Inject] (val scriptHandler: ScriptHandler,
} }
open class KotlinPlugin [Inject] (scriptHandler: ScriptHandler, tasksProvider: KotlinTasksProvider) : AbstractKotlinPlugin(scriptHandler, tasksProvider) { open class KotlinPlugin @Inject constructor(scriptHandler: ScriptHandler, tasksProvider: KotlinTasksProvider) : AbstractKotlinPlugin(scriptHandler, tasksProvider) {
override fun buildSourceSetProcessor(project: ProjectInternal, javaBasePlugin: JavaBasePlugin, sourceSet: SourceSet) = override fun buildSourceSetProcessor(project: ProjectInternal, javaBasePlugin: JavaBasePlugin, sourceSet: SourceSet) =
Kotlin2JvmSourceSetProcessor(project, javaBasePlugin, sourceSet, scriptHandler, tasksProvider) Kotlin2JvmSourceSetProcessor(project, javaBasePlugin, sourceSet, scriptHandler, tasksProvider)
@@ -284,13 +284,13 @@ open class KotlinPlugin [Inject] (scriptHandler: ScriptHandler, tasksProvider: K
} }
open class Kotlin2JsPlugin [Inject] (scriptHandler: ScriptHandler, tasksProvider: KotlinTasksProvider) : AbstractKotlinPlugin(scriptHandler, tasksProvider) { open class Kotlin2JsPlugin @Inject constructor(scriptHandler: ScriptHandler, tasksProvider: KotlinTasksProvider) : AbstractKotlinPlugin(scriptHandler, tasksProvider) {
override fun buildSourceSetProcessor(project: ProjectInternal, javaBasePlugin: JavaBasePlugin, sourceSet: SourceSet) = override fun buildSourceSetProcessor(project: ProjectInternal, javaBasePlugin: JavaBasePlugin, sourceSet: SourceSet) =
Kotlin2JsSourceSetProcessor(project, javaBasePlugin, sourceSet, scriptHandler, tasksProvider) Kotlin2JsSourceSetProcessor(project, javaBasePlugin, sourceSet, scriptHandler, tasksProvider)
} }
open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val tasksProvider: KotlinTasksProvider) : Plugin<Project> { open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHandler, val tasksProvider: KotlinTasksProvider) : Plugin<Project> {
val log = Logging.getLogger(this.javaClass) val log = Logging.getLogger(this.javaClass)