diff --git a/subprojects/distributions/src/changes/accepted-public-api-changes.json b/subprojects/distributions/src/changes/accepted-public-api-changes.json index 17ffdc044d92..14de31c163ed 100644 --- a/subprojects/distributions/src/changes/accepted-public-api-changes.json +++ b/subprojects/distributions/src/changes/accepted-public-api-changes.json @@ -25,26 +25,12 @@ "org.gradle.api.internal.AbstractTask.requiresResource(java.lang.String,int)" ] }, - { - "type": "org.gradle.kotlin.dsl.ProjectExtensionsKt", - "member": "Method org.gradle.kotlin.dsl.ProjectExtensionsKt.repositories(org.gradle.api.initialization.dsl.ScriptHandler,kotlin.jvm.functions.Function1)", - "acceptation": "Extension method moved to org.gradle.kotlin.dsl.ScriptHandlerExtensions", - "changes": [ - "Method has been removed" - ] - }, { "type": "org.gradle.kotlin.dsl.ScriptHandlerExtensionsKt", "member": "Class org.gradle.kotlin.dsl.ScriptHandlerExtensionsKt", "acceptation": "Dedicated type for ScriptHandler extensions", "changes": [] }, - { - "type": "org.gradle.kotlin.dsl.ScriptHandlerExtensionsKt", - "member": "Method org.gradle.kotlin.dsl.ScriptHandlerExtensionsKt.repositories(org.gradle.api.initialization.dsl.ScriptHandler,kotlin.jvm.functions.Function1)", - "acceptation": "Extension method moved from org.gradle.kotlin.dsl.ProjectExtensions", - "changes": [] - }, { "type": "org.gradle.api.tasks.AbstractExecTask", "member": "Method org.gradle.api.tasks.AbstractExecTask.getExecResult()", diff --git a/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt b/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt index 387b6dd4244a..b596f009ce94 100644 --- a/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt +++ b/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt @@ -25,6 +25,8 @@ import org.gradle.api.Task import org.gradle.api.artifacts.Dependency import org.gradle.api.artifacts.dsl.RepositoryHandler +import org.gradle.api.initialization.dsl.ScriptHandler + import org.gradle.api.internal.artifacts.dependencies.DefaultSelfResolvingDependency import org.gradle.api.internal.file.FileCollectionInternal @@ -145,6 +147,13 @@ fun Project.repositories(configuration: RepositoryHandler.() -> Unit) = repositories.configuration() +/** + * Configures the repositories for the script dependencies. + */ +fun ScriptHandler.repositories(configuration: RepositoryHandler.() -> Unit) = + repositories.configuration() + + /** * Configures the dependencies for this project. * diff --git a/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/ScriptHandlerExtensions.kt b/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/ScriptHandlerExtensions.kt index 06737fe8d4c9..78fbe653b040 100644 --- a/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/ScriptHandlerExtensions.kt +++ b/subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/ScriptHandlerExtensions.kt @@ -18,17 +18,9 @@ package org.gradle.kotlin.dsl import org.gradle.api.Incubating import org.gradle.api.artifacts.dsl.DependencyLockingHandler -import org.gradle.api.artifacts.dsl.RepositoryHandler import org.gradle.api.initialization.dsl.ScriptHandler -/** - * Configures the repositories for the script dependencies. - */ -fun ScriptHandler.repositories(configuration: RepositoryHandler.() -> Unit) = - repositories.configuration() - - /** * Configures the dependency locking for the script dependency configurations. *