Fix deprecated ConfigureUtil usages in KGP
Required for Gradle 7+ #KTI-559
This commit is contained in:
+1
-1
@@ -23,7 +23,7 @@ import java.io.File
|
||||
|
||||
class DefaultKotlinDependencyHandler(
|
||||
val parent: HasKotlinDependencies,
|
||||
val project: Project
|
||||
override val project: Project
|
||||
) : KotlinDependencyHandler {
|
||||
override fun api(dependencyNotation: Any): Dependency? =
|
||||
addDependencyByAnyNotation(parent.apiConfigurationName, dependencyNotation)
|
||||
|
||||
+3
@@ -5,6 +5,7 @@
|
||||
|
||||
package org.jetbrains.kotlin.gradle.targets.js
|
||||
|
||||
import groovy.lang.Closure
|
||||
import org.jetbrains.kotlin.gradle.execution.KotlinAggregateExecutionSource
|
||||
import org.jetbrains.kotlin.gradle.plugin.CompilationExecutionSource
|
||||
import org.jetbrains.kotlin.gradle.plugin.CompilationExecutionSourceSupport
|
||||
@@ -82,4 +83,6 @@ open class KotlinJsReportAggregatingTestRun(
|
||||
target.whenBrowserConfigured { doConfigureInChildren(this) }
|
||||
target.whenNodejsConfigured { doConfigureInChildren(this) }
|
||||
}
|
||||
|
||||
override fun filter(configureFilter: Closure<*>) = filter { target.project.configure(this, configureFilter) }
|
||||
}
|
||||
+2
@@ -40,6 +40,8 @@ abstract class KotlinTaskTestRun<S : ExecutionSource, T : AbstractTestTask>(
|
||||
override fun filter(configureFilter: TestFilter.() -> Unit) {
|
||||
executionTask.configure { task -> configureFilter(task.filter) }
|
||||
}
|
||||
|
||||
override fun filter(configureFilter: Closure<*>) = filter { target.project.configure(this, configureFilter) }
|
||||
}
|
||||
|
||||
internal val KotlinTargetTestRun<*>.testTaskName: String
|
||||
|
||||
Reference in New Issue
Block a user