Fix Gradle task input annotations for Gradle 5.5 checks

* Interface and abstract properties are now checked, too.
  For them, copy the @Input/@Internal annotations from the
  implementations (luckily, they were all consistent).

* Annotating a private property without a public accessor is not not
  allowed. Remove one such annotation.
This commit is contained in:
Sergey Igushkin
2019-07-10 21:06:13 +03:00
parent e804b58f5f
commit 26a8c16166
4 changed files with 7 additions and 1 deletions
@@ -18,6 +18,8 @@ package org.jetbrains.kotlin.gradle.dsl
import groovy.lang.Closure import groovy.lang.Closure
import org.gradle.api.Task import org.gradle.api.Task
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal
interface KotlinJsCompile : KotlinCompile<KotlinJsOptions> interface KotlinJsCompile : KotlinCompile<KotlinJsOptions>
@@ -26,8 +28,10 @@ interface KotlinJvmCompile : KotlinCompile<KotlinJvmOptions>
interface KotlinCommonCompile : KotlinCompile<KotlinMultiplatformCommonOptions> interface KotlinCommonCompile : KotlinCompile<KotlinMultiplatformCommonOptions>
interface KotlinJsDce : Task { interface KotlinJsDce : Task {
@get:Internal
val dceOptions: KotlinJsDceOptions val dceOptions: KotlinJsDceOptions
@get:Input
val keep: MutableList<String> val keep: MutableList<String>
fun dceOptions(fn: KotlinJsDceOptions.() -> Unit) { fun dceOptions(fn: KotlinJsDceOptions.() -> Unit) {
@@ -37,6 +37,7 @@ abstract class AbstractDukatTask : AbstractTask(), RequiresNpmDependencies {
/** /**
* Collection of d.ts files * Collection of d.ts files
*/ */
@get:Internal
abstract val dTsFiles: List<File> abstract val dTsFiles: List<File>
/** /**
@@ -92,6 +92,7 @@ abstract class AbstractKotlinNativeCompile : AbstractCompile(), KotlinCompile<Ko
targetCompatibility = "1.6" targetCompatibility = "1.6"
} }
@get:Internal
abstract val compilation: KotlinNativeCompilation abstract val compilation: KotlinNativeCompilation
// region inputs/outputs // region inputs/outputs
@@ -104,6 +105,7 @@ abstract class AbstractKotlinNativeCompile : AbstractCompile(), KotlinCompile<Ko
@get:Input @get:Input
abstract val debuggable: Boolean abstract val debuggable: Boolean
@get:Internal
abstract val baseName: String abstract val baseName: String
// Inputs and outputs // Inputs and outputs
@@ -41,7 +41,6 @@ open class KotlinTestReport : TestReport() {
@Internal @Internal
val testTasks = mutableListOf<AbstractTestTask>() val testTasks = mutableListOf<AbstractTestTask>()
@Internal
private var parent: KotlinTestReport? = null private var parent: KotlinTestReport? = null
@Internal @Internal