From 94b4f4a91a8a7e48a8d1ce8ebe02f42054d2c09a Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Sun, 26 Apr 2020 15:14:14 +0300
Subject: [PATCH] Build: Remove configureJvmProject helper for groovy script

It duplicates allprojects configuration done in root project
---
 libraries/commonConfiguration.gradle          | 30 +++----------------
 libraries/tools/kotlin-allopen/build.gradle   |  7 +----
 libraries/tools/kotlin-noarg/build.gradle     |  7 +----
 .../kotlin-sam-with-receiver/build.gradle     |  7 +----
 .../build.gradle                              |  7 +----
 .../tools/kotlin-serialization/build.gradle   |  7 +----
 6 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index 8cce8e82110..971e10f176d 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -1,29 +1,3 @@
-ext.configureJvmProject = { Project project ->
-    project.configure(project) {
-        configurations {
-            sources
-        }
-
-        task sourcesJar(type: Jar, dependsOn: classes) {
-            classifier = 'sources'
-            from sourceSets.main.kotlin
-        }
-
-        tasks.withType(JavaCompile) {
-            options.fork = true
-            options.forkOptions.javaHome = file(JDK_18)
-        }
-
-        tasks.withType(project.compileKotlin.class) {
-            kotlinOptions.jdkHome = JDK_18
-        }
-
-        test {
-            executable = "$JDK_16/bin/java"
-        }
-    }
-}
-
 ext.configureJavaOnlyJvm6Project = { Project project ->
     project.tasks.withType(JavaCompile) {
         sourceCompatibility = 1.6
@@ -207,6 +181,10 @@ ext.configurePublishing = { Project project ->
 }
 
 allprojects { project ->
+    project.ext.configureSourcesJar = { lambda = {} ->
+        ArtifactsKt.sourcesJar(project, lambda)
+    }
+
     project.ext.configureJavadocJar = { lambda = {} ->
         ArtifactsKt.javadocJar(project, lambda)
     }
diff --git a/libraries/tools/kotlin-allopen/build.gradle b/libraries/tools/kotlin-allopen/build.gradle
index 5f88e5f521f..27a0660d2c6 100644
--- a/libraries/tools/kotlin-allopen/build.gradle
+++ b/libraries/tools/kotlin-allopen/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'kotlin'
 apply plugin: 'jps-compatible'
 
-configureJvmProject(project)
 configurePublishing(project)
 
 pill {
@@ -35,11 +34,7 @@ jar {
 }
 
 ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
-
-artifacts {
-    archives sourcesJar
-}
-
+configureSourcesJar()
 configureJavadocJar()
 
 pluginBundle {
diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle
index fabd16ff283..dac5ac4baed 100644
--- a/libraries/tools/kotlin-noarg/build.gradle
+++ b/libraries/tools/kotlin-noarg/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'kotlin'
 apply plugin: 'jps-compatible'
 
-configureJvmProject(project)
 configurePublishing(project)
 
 compileJava {
@@ -41,11 +40,7 @@ jar {
 }
 
 ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
-
-artifacts {
-    archives sourcesJar
-}
-
+configureSourcesJar()
 configureJavadocJar()
 
 pluginBundle {
diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle
index 57d684cbeb3..55772318c14 100644
--- a/libraries/tools/kotlin-sam-with-receiver/build.gradle
+++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'kotlin'
 apply plugin: 'jps-compatible'
 
-configureJvmProject(project)
 configurePublishing(project)
 
 compileJava {
@@ -41,11 +40,7 @@ jar {
 }
 
 ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
-
-artifacts {
-    archives sourcesJar
-}
-
+configureSourcesJar()
 configureJavadocJar()
 
 test.executable = "${JDK_18}/bin/java"
\ No newline at end of file
diff --git a/libraries/tools/kotlin-serialization-unshaded/build.gradle b/libraries/tools/kotlin-serialization-unshaded/build.gradle
index 8fb557571f0..cec31ae6461 100644
--- a/libraries/tools/kotlin-serialization-unshaded/build.gradle
+++ b/libraries/tools/kotlin-serialization-unshaded/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'kotlin'
 
-configureJvmProject(project)
 configurePublishing(project)
 
 dependencies {
@@ -19,9 +18,5 @@ jar.configure {
 }
 
 ArtifactsKt.runtimeJar(project, jar, {})
-
-artifacts {
-    archives sourcesJar
-}
-
+configureSourcesJar()
 configureJavadocJar()
diff --git a/libraries/tools/kotlin-serialization/build.gradle b/libraries/tools/kotlin-serialization/build.gradle
index 73c4739141e..462db1a83f0 100644
--- a/libraries/tools/kotlin-serialization/build.gradle
+++ b/libraries/tools/kotlin-serialization/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'kotlin'
 apply plugin: 'jps-compatible'
 
-configureJvmProject(project)
 configurePublishing(project)
 
 pill {
@@ -29,11 +28,7 @@ jar {
 }
 
 ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
-
-artifacts {
-    archives sourcesJar
-}
-
+configureSourcesJar()
 configureJavadocJar()
 
 pluginBundle {