diff --git a/buildSrc/src/main/kotlin/common-configuration.gradle.kts b/buildSrc/src/main/kotlin/common-configuration.gradle.kts index b04270c8bda..06d76d45adc 100644 --- a/buildSrc/src/main/kotlin/common-configuration.gradle.kts +++ b/buildSrc/src/main/kotlin/common-configuration.gradle.kts @@ -30,6 +30,7 @@ dependencies { project.configureJvmDefaultToolchain() project.addEmbeddedConfigurations() +project.addImplicitDependenciesConfiguration() project.configureJavaCompile() project.configureJavaBasePlugin() project.configureKotlinCompilationOptions() @@ -54,6 +55,13 @@ afterEvaluate { } } +fun Project.addImplicitDependenciesConfiguration() { + configurations.maybeCreate("implicitDependencies").apply { + isCanBeConsumed = false + isCanBeResolved = false + } +} + fun Project.addEmbeddedConfigurations() { configurations.maybeCreate("embedded").apply { isCanBeConsumed = false diff --git a/buildSrc/src/main/kotlin/configurations.kt b/buildSrc/src/main/kotlin/configurations.kt index 0749be2d34f..a7eefe51a3f 100644 --- a/buildSrc/src/main/kotlin/configurations.kt +++ b/buildSrc/src/main/kotlin/configurations.kt @@ -15,30 +15,14 @@ import org.gradle.kotlin.dsl.accessors.runtime.addDependencyTo import org.gradle.kotlin.dsl.accessors.runtime.addExternalModuleDependencyTo import org.gradle.kotlin.dsl.add -val NamedDomainObjectContainer.embedded: NamedDomainObjectProvider get() = named("embedded") +val NamedDomainObjectContainer.embedded: NamedDomainObjectProvider + get() = named("embedded") fun DependencyHandler.embedded(dependencyNotation: Any): Dependency? = add("embedded", dependencyNotation) -fun DependencyHandler.embedded( - dependencyNotation: String, - dependencyConfiguration: Action -): ExternalModuleDependency = - addDependencyTo(this, "embedded", dependencyNotation, dependencyConfiguration) +val NamedDomainObjectContainer.implicitDependencies: NamedDomainObjectProvider + get() = named("implicitDependencies") -fun DependencyHandler.embedded( - group: String, - name: String, - version: String? = null, - configuration: String? = null, - classifier: String? = null, - ext: String? = null, - dependencyConfiguration: Action? = null -): ExternalModuleDependency = addExternalModuleDependencyTo( - this, "embedded", group, name, version, configuration, classifier, ext, dependencyConfiguration -) - -fun DependencyHandler.embedded( - dependency: T, - dependencyConfiguration: T.() -> Unit -): T = add("embedded", dependency, dependencyConfiguration) +fun DependencyHandler.implicitDependencies(dependencyNotation: Any): Dependency? = + add("implicitDependencies", dependencyNotation)