diff --git a/buildSrc/src/main/kotlin/repoArtifacts.kt b/buildSrc/src/main/kotlin/repoArtifacts.kt
index 103549b4608..d590db05966 100644
--- a/buildSrc/src/main/kotlin/repoArtifacts.kt
+++ b/buildSrc/src/main/kotlin/repoArtifacts.kt
@@ -159,6 +159,7 @@ private fun Project.mainKotlinSourceSet() =
     (extensions.findByName("kotlin") as? KotlinSourceSetContainer)?.sourceSets?.findByName("main")
 private fun Project.sources() = mainJavaPluginSourceSet()?.allSource ?: mainKotlinSourceSet()?.kotlin
 
+@JvmOverloads
 fun Project.sourcesJar(body: Jar.() -> Unit = {}): TaskProvider<Jar> {
     configure<JavaPluginExtension> {
         withSourcesJar()
diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index 05356de760a..41b5903f772 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -71,12 +71,3 @@ ext.configureFrontendIr = { Project project ->
         }
     }
 }
-
-allprojects { project ->
-    project.ext.configureSourcesJar = { lambda = {} ->
-        RepoArtifacts.sourcesJar(project) { task ->
-            lambda.delegate = task
-            lambda()
-        }
-    }
-}
diff --git a/libraries/kotlin.test/annotations-common/build.gradle b/libraries/kotlin.test/annotations-common/build.gradle
index ffd9a52383d..f3da41a094b 100644
--- a/libraries/kotlin.test/annotations-common/build.gradle
+++ b/libraries/kotlin.test/annotations-common/build.gradle
@@ -17,5 +17,5 @@ jar {
     manifestAttributes(manifest, project, 'Test')
 }
 
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle
index dc5871b3a21..da7ad432c00 100644
--- a/libraries/kotlin.test/common/build.gradle
+++ b/libraries/kotlin.test/common/build.gradle
@@ -13,7 +13,7 @@ jar {
     manifestAttributes(manifest, project, 'Test')
 }
 
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
 
 tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {
diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle
index 4feac57b625..a4d65b5e517 100644
--- a/libraries/kotlin.test/js/build.gradle
+++ b/libraries/kotlin.test/js/build.gradle
@@ -86,6 +86,5 @@ artifacts {
     }
 }
 
-configureSourcesJar()
-
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle
index c5072ca1438..e514f0e20cd 100644
--- a/libraries/kotlin.test/junit/build.gradle
+++ b/libraries/kotlin.test/junit/build.gradle
@@ -26,7 +26,7 @@ jar {
     }
 }
 
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
 
 compileKotlin {
diff --git a/libraries/kotlin.test/junit5/build.gradle b/libraries/kotlin.test/junit5/build.gradle
index 43f72e7600f..ec42dc35f82 100644
--- a/libraries/kotlin.test/junit5/build.gradle
+++ b/libraries/kotlin.test/junit5/build.gradle
@@ -27,7 +27,7 @@ jar {
     }
 }
 
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
 
 compileKotlin {
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index 59c725d154d..4db1e3277ee 100644
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -28,8 +28,7 @@ jar {
     }
 }
 
-configureSourcesJar()
-
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
 
 compileKotlin {
diff --git a/libraries/kotlin.test/testng/build.gradle b/libraries/kotlin.test/testng/build.gradle
index caa81e3018a..11db11eb6ee 100644
--- a/libraries/kotlin.test/testng/build.gradle
+++ b/libraries/kotlin.test/testng/build.gradle
@@ -28,7 +28,7 @@ jar {
     }
 }
 
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
 
 compileKotlin {
diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index d154845a4ef..37eecf36bc6 100644
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -66,7 +66,7 @@ jar {
     manifestAttributes(manifest, project, 'Main')
 }
 
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
 
 sourcesJar.dependsOn(":prepare:build.version:writeStdlibVersion")
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index e0dcdbd3837..fa3501bf15b 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'kotlin'
 JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
 
 configurePublishing(project)
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
 
 sourceSets {
diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle
index a3da8b3a211..7d804a1fdb4 100644
--- a/libraries/stdlib/jdk8/build.gradle
+++ b/libraries/stdlib/jdk8/build.gradle
@@ -3,7 +3,7 @@ description = 'Kotlin Standard Library JDK 8 extension'
 apply plugin: 'kotlin'
 
 configurePublishing(project)
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
 
 dependencies {
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index d294ceb6f04..150cd79e5d4 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -10,7 +10,7 @@ JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
 
 configurePublishing(project)
 RepoArtifacts.javadocJar(project)
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 
 configurations {
     distSources
diff --git a/libraries/tools/kotlin-annotations-jvm/build.gradle b/libraries/tools/kotlin-annotations-jvm/build.gradle
index 4e203bf939f..aa4afcd4af3 100644
--- a/libraries/tools/kotlin-annotations-jvm/build.gradle
+++ b/libraries/tools/kotlin-annotations-jvm/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     compileOnly RepoDependencies.kotlinBuiltins(project)
 }
 
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
 
 compileKotlin {
diff --git a/libraries/tools/kotlin-serialization-unshaded/build.gradle b/libraries/tools/kotlin-serialization-unshaded/build.gradle
index 9c9ce3509d9..0a0992f8194 100644
--- a/libraries/tools/kotlin-serialization-unshaded/build.gradle
+++ b/libraries/tools/kotlin-serialization-unshaded/build.gradle
@@ -7,5 +7,5 @@ dependencies {
 }
 
 RepoArtifacts.runtimeJar(project, {})
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle
index a0b1ea3ee49..49ff4793bb9 100644
--- a/libraries/tools/script-runtime/build.gradle
+++ b/libraries/tools/script-runtime/build.gradle
@@ -22,7 +22,7 @@ jar {
     manifestAttributes(manifest, project, 'Main')
 }
 
-configureSourcesJar()
+RepoArtifacts.sourcesJar(project)
 RepoArtifacts.javadocJar(project)
 
 compileKotlin {