Fix warnings after KT-48899

All API ToolingModelBuilder is marked as NonNullApi
https://github.com/gradle/gradle/commit/f93bf949486e73655810ab49ad316100b1c2804c#diff-76e89b92025ccef4e2763c5ee8d30bde939c4a9db26bfc913eac88069cbf5d36
This commit is contained in:
Denis.Zharkov
2021-09-27 15:59:02 +03:00
committed by TeamCityServer
parent f7ef551f99
commit 7c3383bb39
13 changed files with 59 additions and 73 deletions
@@ -76,7 +76,7 @@ class SamWithReceiverGradleSubplugin @Inject internal constructor(private val re
//region Stub implementation for legacy API, KT-39809
internal constructor(): this(object : ToolingModelBuilderRegistry {
override fun register(p0: ToolingModelBuilder) = Unit
override fun getBuilder(p0: String): ToolingModelBuilder? = null
override fun getBuilder(p0: String): ToolingModelBuilder = error("Method should not be called")
})
override fun isApplicable(project: Project, task: AbstractCompile): Boolean = true
@@ -89,4 +89,4 @@ class SamWithReceiverGradleSubplugin @Inject internal constructor(private val re
"Please use an older version of kotlin-sam-with-receiver or upgrade the Kotlin Gradle plugin version to make them match."
)
//endregion
}
}
@@ -21,11 +21,9 @@ class SamWithReceiverModelBuilder : ToolingModelBuilder {
return modelName == SamWithReceiver::class.java.name
}
override fun buildAll(modelName: String, project: Project): Any? {
if (modelName == SamWithReceiver::class.java.name) {
val extension = project.extensions.getByType(SamWithReceiverExtension::class.java)
return SamWithReceiverImpl(project.name, extension.myAnnotations, extension.myPresets)
}
return null
override fun buildAll(modelName: String, project: Project): Any {
require(canBuild(modelName)) { "buildAll(\"$modelName\") has been called while canBeBuild is false" }
val extension = project.extensions.getByType(SamWithReceiverExtension::class.java)
return SamWithReceiverImpl(project.name, extension.myAnnotations, extension.myPresets)
}
}
}