From 4925ca2c9abb2a018c23f94ab36fe0d1d75d04b4 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Wed, 29 Apr 2020 19:46:06 +0300
Subject: [PATCH] Build: Fix receiver for configure* helpers in
 commonConfiguration.gradle

---
 libraries/commonConfiguration.gradle | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index 7584c2a58e6..72f0ef6a7c6 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -115,8 +115,11 @@ ext.signPom = { Project project, MavenDeployer deployer ->
     }
 }
 
-ext.configurePublishing = { Project project ->
-    ArtifactsKt.publish(project, false)
+ext.configurePublishing = { Project project, configure = { } ->
+    ArtifactsKt.publish(project, false) { publication ->
+        configure.delegate = publication
+        configure()
+    }
 }
 
 ext.configureLegacyPublishing = { Project project ->
@@ -186,11 +189,24 @@ ext.configureLegacyPublishing = { Project project ->
 
 allprojects { project ->
     project.ext.configureSourcesJar = { lambda = {} ->
-        ArtifactsKt.sourcesJar(project, lambda)
+        ArtifactsKt.sourcesJar(project) { task ->
+            lambda.delegate = task
+            lambda()
+        }
     }
 
     project.ext.configureJavadocJar = { lambda = {} ->
-        ArtifactsKt.javadocJar(project, lambda)
+        ArtifactsKt.javadocJar(project) { task ->
+            lambda.delegate = task
+            lambda()
+        }
+    }
+
+    project.ext.configureModularJar = { lambda = {} ->
+        ArtifactsKt.modularJar(project) { task ->
+            lambda.delegate = task
+            lambda()
+        }
     }
 
     dependencies.ext.kotlinStdlib = { suffix ->