From 46dbeafdadf4e4b1cde3e13982c9908a36552058 Mon Sep 17 00:00:00 2001
From: Pavel Fatin <pavel.fatin@jetbrains.com>
Date: Wed, 28 Jun 2017 18:35:19 +0200
Subject: [PATCH] "annotations-internal" module is merged with the "util" one

---
 .idea/modules.xml                                     |  1 -
 .../annotations/internal/annotations-internal.iml     | 11 -----------
 .../org/jetbrains/annotations/SystemDependent.java    |  0
 .../org/jetbrains/annotations/SystemIndependent.java  |  0
 platform/util/util.iml                                |  1 -
 5 files changed, 13 deletions(-)
 delete mode 100644 platform/annotations/internal/annotations-internal.iml
 rename platform/{annotations/internal => util}/src/org/jetbrains/annotations/SystemDependent.java (100%)
 rename platform/{annotations/internal => util}/src/org/jetbrains/annotations/SystemIndependent.java (100%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8baef1d3adc6..a20d716756d7 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -26,7 +26,6 @@
       <module fileurl="file://$PROJECT_DIR$/android/rt/android-rt.iml" filepath="$PROJECT_DIR$/android/rt/android-rt.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/platform/annotations/annotations.iml" filepath="$PROJECT_DIR$/platform/annotations/annotations.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/annotations/common/annotations-common.iml" filepath="$PROJECT_DIR$/platform/annotations/common/annotations-common.iml" group="platform" />
-      <module fileurl="file://$PROJECT_DIR$/platform/annotations/internal/annotations-internal.iml" filepath="$PROJECT_DIR$/platform/annotations/internal/annotations-internal.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/annotations/java8/annotations-java8.iml" filepath="$PROJECT_DIR$/platform/annotations/java8/annotations-java8.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ant/ant.iml" filepath="$PROJECT_DIR$/plugins/ant/ant.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" group="plugins" />
diff --git a/platform/annotations/internal/annotations-internal.iml b/platform/annotations/internal/annotations-internal.iml
deleted file mode 100644
index c90834f2d607..000000000000
--- a/platform/annotations/internal/annotations-internal.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/platform/annotations/internal/src/org/jetbrains/annotations/SystemDependent.java b/platform/util/src/org/jetbrains/annotations/SystemDependent.java
similarity index 100%
rename from platform/annotations/internal/src/org/jetbrains/annotations/SystemDependent.java
rename to platform/util/src/org/jetbrains/annotations/SystemDependent.java
diff --git a/platform/annotations/internal/src/org/jetbrains/annotations/SystemIndependent.java b/platform/util/src/org/jetbrains/annotations/SystemIndependent.java
similarity index 100%
rename from platform/annotations/internal/src/org/jetbrains/annotations/SystemIndependent.java
rename to platform/util/src/org/jetbrains/annotations/SystemIndependent.java
diff --git a/platform/util/util.iml b/platform/util/util.iml
index 4dc58a08b7fa..2bdfa029d932 100644
--- a/platform/util/util.iml
+++ b/platform/util/util.iml
@@ -17,7 +17,6 @@
     <orderEntry type="library" exported="" name="Trove4j" level="project" />
     <orderEntry type="module" module-name="platform-resources-en" />
     <orderEntry type="module" module-name="annotations" exported="" />
-    <orderEntry type="module" module-name="annotations-internal" exported="" />
     <orderEntry type="module" module-name="util-rt" exported="" />
     <orderEntry type="library" name="jna" level="project" />
     <orderEntry type="library" name="OroMatcher" level="project" />