From d1390365de6534a431e33c8a3fa0f5e90c1eee2a Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Fri, 31 May 2019 16:50:01 +0300
Subject: [PATCH] Moved basic classes from konan/utils to util-io

---
 compiler/util-io/build.gradle.kts             | 20 +++++++++++++++++++
 .../jetbrains/kotlin/konan/KonanVersion.kt    |  0
 .../org/jetbrains/kotlin/konan/MetaVersion.kt |  0
 .../org/jetbrains/kotlin/konan/file/File.kt   |  0
 .../jetbrains/kotlin/konan/file/ZipUtil.kt    |  0
 .../kotlin/konan/properties/Properties.kt     |  0
 .../org/jetbrains/kotlin/konan/util/Util.kt   |  0
 konan/utils/build.gradle.kts                  |  1 +
 settings.gradle                               |  4 ++++
 9 files changed, 25 insertions(+)
 create mode 100644 compiler/util-io/build.gradle.kts
 rename {konan/utils => compiler/util-io}/src/org/jetbrains/kotlin/konan/KonanVersion.kt (100%)
 rename {konan/utils => compiler/util-io}/src/org/jetbrains/kotlin/konan/MetaVersion.kt (100%)
 rename {konan/utils => compiler/util-io}/src/org/jetbrains/kotlin/konan/file/File.kt (100%)
 rename {konan/utils => compiler/util-io}/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt (100%)
 rename {konan/utils => compiler/util-io}/src/org/jetbrains/kotlin/konan/properties/Properties.kt (100%)
 rename {konan/utils => compiler/util-io}/src/org/jetbrains/kotlin/konan/util/Util.kt (100%)

diff --git a/compiler/util-io/build.gradle.kts b/compiler/util-io/build.gradle.kts
new file mode 100644
index 00000000000..1389a367926
--- /dev/null
+++ b/compiler/util-io/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+description = "Kotlin/Native utils"
+
+dependencies {
+    compile(kotlinStdlib())
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { none() }
+}
+
+publish()
+
+standardPublicJars()
+
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/KonanVersion.kt b/compiler/util-io/src/org/jetbrains/kotlin/konan/KonanVersion.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/KonanVersion.kt
rename to compiler/util-io/src/org/jetbrains/kotlin/konan/KonanVersion.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/MetaVersion.kt b/compiler/util-io/src/org/jetbrains/kotlin/konan/MetaVersion.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/MetaVersion.kt
rename to compiler/util-io/src/org/jetbrains/kotlin/konan/MetaVersion.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/file/File.kt b/compiler/util-io/src/org/jetbrains/kotlin/konan/file/File.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/file/File.kt
rename to compiler/util-io/src/org/jetbrains/kotlin/konan/file/File.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt b/compiler/util-io/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt
rename to compiler/util-io/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/properties/Properties.kt b/compiler/util-io/src/org/jetbrains/kotlin/konan/properties/Properties.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/properties/Properties.kt
rename to compiler/util-io/src/org/jetbrains/kotlin/konan/properties/Properties.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/util/Util.kt b/compiler/util-io/src/org/jetbrains/kotlin/konan/util/Util.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/util/Util.kt
rename to compiler/util-io/src/org/jetbrains/kotlin/konan/util/Util.kt
diff --git a/konan/utils/build.gradle.kts b/konan/utils/build.gradle.kts
index 1389a367926..8ce7f9dd92c 100644
--- a/konan/utils/build.gradle.kts
+++ b/konan/utils/build.gradle.kts
@@ -7,6 +7,7 @@ description = "Kotlin/Native utils"
 
 dependencies {
     compile(kotlinStdlib())
+    compile(project(":kotlin-util-io"))
 }
 
 sourceSets {
diff --git a/settings.gradle b/settings.gradle
index 95d17a2b43e..31b89a6a775 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,6 +22,8 @@ pluginManagement {
 include ":kotlin-build-common",
         ":compiler",
         ":compiler:util",
+        ":kotlin-util-io",
+        ":kotlin-util-klib",
         ":daemon-common",
         ":daemon-common-new",
         ":kotlin-daemon",
@@ -323,6 +325,8 @@ project(':compiler:backend.js').projectDir = "$rootDir/compiler/ir/backend.js" a
 project(':compiler:backend.jvm').projectDir = "$rootDir/compiler/ir/backend.jvm" as File
 project(':compiler:ir.serialization.common').projectDir = "$rootDir/compiler/ir/serialization.common" as File
 project(':compiler:ir.serialization.js').projectDir = "$rootDir/compiler/ir/serialization.js" as File
+project(':kotlin-util-io').projectDir = "$rootDir/compiler/util-io" as File
+project(':kotlin-util-klib').projectDir = "$rootDir/compiler/util-klib" as File
 project(':kotlin-native:kotlin-native-utils').projectDir = "$rootDir/konan/utils" as File
 project(':kotlin-native:kotlin-native-library-reader').projectDir = "$rootDir/konan/library-reader" as File
 project(':kotlin-jps-plugin').projectDir = "$rootDir/prepare/jps-plugin" as File