From fe45214d23b4548957ac4857c9700c520c6dbab7 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Sat, 5 Mar 2022 11:04:26 +0100
Subject: [PATCH] Create new `kotlin-tooling-core` module

---
 buildSrc/src/main/kotlin/tasks.kt                  |  3 ++-
 gradle/verification-metadata.xml                   |  1 +
 .../tools/kotlin-gradle-plugin/build.gradle.kts    |  1 +
 .../tools/kotlin-tooling-core/build.gradle.kts     | 14 ++++++++++++++
 settings.gradle                                    |  2 ++
 5 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 libraries/tools/kotlin-tooling-core/build.gradle.kts

diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt
index e90104317b3..6df7050f19d 100644
--- a/buildSrc/src/main/kotlin/tasks.kt
+++ b/buildSrc/src/main/kotlin/tasks.kt
@@ -45,6 +45,7 @@ val kotlinGradlePluginAndItsRequired = arrayOf(
     ":kotlin-gradle-plugin",
     ":kotlin-gradle-plugin-model",
     ":kotlin-tooling-metadata",
+    ":kotlin-tooling-core",
     ":kotlin-reflect",
     ":kotlin-annotation-processing-gradle",
     ":kotlin-test",
@@ -284,4 +285,4 @@ fun Task.useAndroidSdk() {
 
 fun Task.useAndroidJar() {
     TaskUtils.useAndroidJar(this)
-}
\ No newline at end of file
+}
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 90328d46be1..79206254707 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -23,6 +23,7 @@
          <trust group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-embeddable"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-tooling-metadata"/>
+         <trust group="org.jetbrains.kotlin" name="kotlin-tooling-core"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-native-utils"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-reflect"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-sam-with-receiver"/>
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
index bdb9c273902..b65e99f918b 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
@@ -37,6 +37,7 @@ dependencies {
 
     implementation(project(":kotlin-util-klib"))
     implementation(project(":native:kotlin-klib-commonizer-api"))
+    implementation(project(":kotlin-tooling-core"))
     implementation(project(":kotlin-tooling-metadata"))
     implementation(project(":kotlin-project-model"))
     compileOnly(project(":native:kotlin-native-utils"))
diff --git a/libraries/tools/kotlin-tooling-core/build.gradle.kts b/libraries/tools/kotlin-tooling-core/build.gradle.kts
new file mode 100644
index 00000000000..f0332952cf4
--- /dev/null
+++ b/libraries/tools/kotlin-tooling-core/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+publish()
+sourcesJar()
+javadocJar()
+configureKotlinCompileTasksGradleCompatibility()
+
+dependencies {
+    implementation(kotlinStdlib())
+    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+}
diff --git a/settings.gradle b/settings.gradle
index 4bd09cd1958..37c8115ebbe 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -236,6 +236,7 @@ include ":benchmarks",
         ":gradle:regression-benchmark-templates",
         ":gradle:regression-benchmarks",
         ":kotlin-tooling-metadata",
+        ":kotlin-tooling-core",
         ":kotlin-allopen",
         ":kotlin-noarg",
         ":kotlin-sam-with-receiver",
@@ -680,6 +681,7 @@ project(':gradle:android-test-fixes').projectDir = "$rootDir/libraries/tools/gra
 project(":gradle:regression-benchmark-templates").projectDir = "$rootDir/libraries/tools/gradle/regression-benchmark-templates" as File
 project(":gradle:regression-benchmarks").projectDir = "$rootDir/libraries/tools/gradle/regression-benchmarks" as File
 project(':kotlin-tooling-metadata').projectDir = "$rootDir/libraries/tools/kotlin-tooling-metadata" as File
+project(':kotlin-tooling-core').projectDir = "$rootDir/libraries/tools/kotlin-tooling-core" as File
 project(':kotlin-allopen').projectDir = "$rootDir/libraries/tools/kotlin-allopen" as File
 project(':kotlin-noarg').projectDir = "$rootDir/libraries/tools/kotlin-noarg" as File
 project(':kotlin-sam-with-receiver').projectDir = "$rootDir/libraries/tools/kotlin-sam-with-receiver" as File