From 1273ac9647532498966b21b9202adda5d4230919 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 2 Jun 2017 15:23:11 +0300
Subject: [PATCH] Remove dependency of module 'descriptors' on
 'deserialization'

---
 compiler/frontend/frontend.iml                         | 1 +
 compiler/serialization/serialization.iml               | 1 +
 compiler/util/util.iml                                 | 1 +
 core/descriptor.loader.java/descriptor.loader.java.iml | 1 +
 core/descriptors.runtime/descriptors.runtime.iml       | 1 +
 core/descriptors/descriptors.iml                       | 1 -
 6 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
index 5d2710bd1a0..ec58b90098b 100644
--- a/compiler/frontend/frontend.iml
+++ b/compiler/frontend/frontend.iml
@@ -10,6 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="descriptors" exported="" />
+    <orderEntry type="module" module-name="deserialization" exported="" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="plugin-api" exported="" />
     <orderEntry type="module" module-name="container" exported="" />
diff --git a/compiler/serialization/serialization.iml b/compiler/serialization/serialization.iml
index 892e47a6964..27fd7317375 100644
--- a/compiler/serialization/serialization.iml
+++ b/compiler/serialization/serialization.iml
@@ -10,6 +10,7 @@
     <orderEntry type="library" name="protobuf-java" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="descriptors" exported="" />
+    <orderEntry type="module" module-name="deserialization" exported="" />
     <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/util/util.iml b/compiler/util/util.iml
index 583f37f69eb..e04b9022082 100644
--- a/compiler/util/util.iml
+++ b/compiler/util/util.iml
@@ -12,5 +12,6 @@
     <orderEntry type="module" module-name="Kotlin" exported="" />
     <orderEntry type="library" name="jps-model" level="project" />
     <orderEntry type="module" module-name="descriptors" />
+    <orderEntry type="module" module-name="deserialization" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/descriptor.loader.java/descriptor.loader.java.iml b/core/descriptor.loader.java/descriptor.loader.java.iml
index 94131c24920..5f6c93cc2ea 100644
--- a/core/descriptor.loader.java/descriptor.loader.java.iml
+++ b/core/descriptor.loader.java/descriptor.loader.java.iml
@@ -10,5 +10,6 @@
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="util.runtime" />
     <orderEntry type="module" module-name="descriptors" exported="" />
+    <orderEntry type="module" module-name="deserialization" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/descriptors.runtime/descriptors.runtime.iml b/core/descriptors.runtime/descriptors.runtime.iml
index 5db6af1d4aa..c0f49a871d9 100644
--- a/core/descriptors.runtime/descriptors.runtime.iml
+++ b/core/descriptors.runtime/descriptors.runtime.iml
@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
     <orderEntry type="module" module-name="descriptors" exported="" />
+    <orderEntry type="module" module-name="deserialization" exported="" />
     <orderEntry type="module" module-name="util.runtime" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/descriptors/descriptors.iml b/core/descriptors/descriptors.iml
index 267079fc9dd..a462d9b405f 100644
--- a/core/descriptors/descriptors.iml
+++ b/core/descriptors/descriptors.iml
@@ -8,7 +8,6 @@
     <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" scope="RUNTIME" name="builtins" level="project" />
-    <orderEntry type="module" module-name="deserialization" exported="" />
     <orderEntry type="module" module-name="util.runtime" />
     <orderEntry type="library" name="javax.inject" level="project" />
   </component>