diff options
30 files changed, 327 insertions, 329 deletions
diff --git a/adt-branding/intellij.android.adt.branding.iml b/adt-branding/intellij.android.adt.branding.iml index fdf0e75e429..f15c7716b22 100644 --- a/adt-branding/intellij.android.adt.branding.iml +++ b/adt-branding/intellij.android.adt.branding.iml @@ -7,11 +7,10 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="util" /> - <orderEntry type="module" module-name="platform-api" /> - <orderEntry type="module" module-name="lang-impl" /> - <orderEntry type="module" module-name="idea-ui" /> - <orderEntry type="module" module-name="xml" /> + <orderEntry type="module" module-name="intellij.platform.util" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> + <orderEntry type="module" module-name="intellij.platform.lang.impl" /> + <orderEntry type="module" module-name="intellij.java.ui" /> + <orderEntry type="module" module-name="intellij.xml.impl" /> </component> -</module> - +</module>
\ No newline at end of file diff --git a/adt-ui-model/intellij.android.adt.ui.model.iml b/adt-ui-model/intellij.android.adt.ui.model.iml index af829ee11cc..e9527ebed89 100644 --- a/adt-ui-model/intellij.android.adt.ui.model.iml +++ b/adt-ui-model/intellij.android.adt.ui.model.iml @@ -8,9 +8,9 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="annotations" /> + <orderEntry type="module" module-name="intellij.platform.annotations.java5" /> <orderEntry type="library" name="Trove4j" level="project" /> - <orderEntry type="module" module-name="platform-api" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> <orderEntry type="library" name="Guava" level="project" /> <orderEntry type="library" scope="TEST" name="JUnit4" level="project" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> diff --git a/adt-ui/intellij.android.adt.ui.iml b/adt-ui/intellij.android.adt.ui.iml index 03765c698b6..567d45f41ee 100644 --- a/adt-ui/intellij.android.adt.ui.iml +++ b/adt-ui/intellij.android.adt.ui.iml @@ -10,18 +10,18 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="annotations" /> + <orderEntry type="module" module-name="intellij.platform.annotations.java5" /> <orderEntry type="library" name="Trove4j" level="project" /> - <orderEntry type="module" module-name="platform-api" /> - <orderEntry type="module" module-name="platform-impl" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> + <orderEntry type="module" module-name="intellij.platform.ide.impl" /> <orderEntry type="library" scope="TEST" name="JUnit4" level="project" /> - <orderEntry type="module" module-name="common" /> + <orderEntry type="module" module-name="android.sdktools.common" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> - <orderEntry type="module" module-name="adt-ui-model" /> - <orderEntry type="module" module-name="testFramework" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.adt.ui.model" /> + <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" /> <orderEntry type="library" name="jcip" level="project" /> - <orderEntry type="module" module-name="observable" /> + <orderEntry type="module" module-name="intellij.android.observable" /> <orderEntry type="library" scope="TEST" name="mockito-2" level="project" /> </component> </module>
\ No newline at end of file diff --git a/android-common/intellij.android.common.iml b/android-common/intellij.android.common.iml index 5a00ac99843..04bff0a3a76 100644 --- a/android-common/intellij.android.common.iml +++ b/android-common/intellij.android.common.iml @@ -7,9 +7,9 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" /> - <orderEntry type="module" module-name="util" /> - <orderEntry type="module" module-name="core-api" /> + <orderEntry type="module" module-name="android.sdktools.common" /> + <orderEntry type="module" module-name="intellij.platform.util" /> + <orderEntry type="module" module-name="intellij.platform.core" /> <orderEntry type="library" name="com.android.tools.analytics-library:shared:26.0.0" level="project" /> </component> </module>
\ No newline at end of file diff --git a/android-gradle-jps/intellij.android.gradle.jps.iml b/android-gradle-jps/intellij.android.gradle.jps.iml index 4682390bdb4..1604493e767 100644 --- a/android-gradle-jps/intellij.android.gradle.jps.iml +++ b/android-gradle-jps/intellij.android.gradle.jps.iml @@ -8,12 +8,12 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="jps-builders" /> - <orderEntry type="module" module-name="jps-model-api" /> - <orderEntry type="module" module-name="jps-model-impl" /> - <orderEntry type="module" module-name="jps-model-serialization" /> - <orderEntry type="module" module-name="android-jps-plugin" /> - <orderEntry type="module" module-name="build-common" /> + <orderEntry type="module" module-name="intellij.platform.jps.build" /> + <orderEntry type="module" module-name="intellij.platform.jps.model" /> + <orderEntry type="module" module-name="intellij.platform.jps.model.impl" /> + <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" /> + <orderEntry type="module" module-name="intellij.android.jps" /> + <orderEntry type="module" module-name="intellij.android.buildCommon" /> <orderEntry type="library" name="Gradle" level="project" /> </component> -</module> +</module>
\ No newline at end of file diff --git a/android-plugin/intellij.android.plugin.iml b/android-plugin/intellij.android.plugin.iml index dad6e1692ac..f7cf9f9e9a0 100644 --- a/android-plugin/intellij.android.plugin.iml +++ b/android-plugin/intellij.android.plugin.iml @@ -7,9 +7,9 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="android" /> - <orderEntry type="module" module-name="sdk-updates" /> - <orderEntry type="module" module-name="designer" /> - <orderEntry type="module" module-name="profilers-android" /> + <orderEntry type="module" module-name="intellij.android" /> + <orderEntry type="module" module-name="intellij.android.sdkUpdates" /> + <orderEntry type="module" module-name="intellij.android.designer" /> + <orderEntry type="module" module-name="intellij.android.profilersAndroid" /> </component> -</module> +</module>
\ No newline at end of file diff --git a/android-test-framework/intellij.android.testFramework.iml b/android-test-framework/intellij.android.testFramework.iml index 213b15c156d..0a46a0dabe5 100644 --- a/android-test-framework/intellij.android.testFramework.iml +++ b/android-test-framework/intellij.android.testFramework.iml @@ -7,16 +7,16 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="testFramework" exported="" scope="TEST" /> - <orderEntry type="module" module-name="xml-psi-api" scope="TEST" /> - <orderEntry type="module" module-name="testFramework-java" scope="TEST" /> - <orderEntry type="module" module-name="android" scope="TEST" /> - <orderEntry type="module" module-name="android-common" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.testFramework" exported="" scope="TEST" /> + <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.common" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> <orderEntry type="library" scope="TEST" name="jsr305" level="project" /> - <orderEntry type="module" module-name="dom-openapi" scope="TEST" /> - <orderEntry type="module" module-name="adt-ui" scope="TEST" /> + <orderEntry type="module" module-name="intellij.xml.dom" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" scope="TEST" /> <orderEntry type="library" scope="TEST" name="mockito-2" level="project" /> </component> </module>
\ No newline at end of file diff --git a/android-uitests/intellij.android.guiTests.iml b/android-uitests/intellij.android.guiTests.iml index 734b01940e3..da65fc14fe5 100644 --- a/android-uitests/intellij.android.guiTests.iml +++ b/android-uitests/intellij.android.guiTests.iml @@ -7,30 +7,30 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="uitest-framework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.guiTestFramework" scope="TEST" /> <orderEntry type="library" scope="TEST" name="JUnit4" level="project" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> - <orderEntry type="module" module-name="android" scope="TEST" /> - <orderEntry type="module" module-name="wizard" scope="TEST" /> - <orderEntry type="module" module-name="android-test-framework" scope="TEST" /> - <orderEntry type="module" module-name="community-main" scope="TEST" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> - <orderEntry type="module" module-name="debugger-openapi" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.wizard" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.testFramework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.ideaCommunity.main" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java.debugger" scope="TEST" /> <orderEntry type="library" name="fest" level="project" /> <orderEntry type="library" name="fest-swing" level="project" /> - <orderEntry type="module" module-name="analysis-api" scope="TEST" /> - <orderEntry type="module" module-name="platform-api" scope="TEST" /> - <orderEntry type="module" module-name="external-system-api" scope="TEST" /> - <orderEntry type="module" module-name="openapi" scope="TEST" /> - <orderEntry type="module" module-name="gradle" scope="TEST" /> - <orderEntry type="module" module-name="compiler-openapi" scope="TEST" /> - <orderEntry type="module" module-name="java-impl" scope="TEST" /> - <orderEntry type="module" module-name="dom-openapi" scope="TEST" /> - <orderEntry type="module" module-name="xdebugger-impl" scope="TEST" /> - <orderEntry type="module" module-name="designer" scope="TEST" /> - <orderEntry type="module" module-name="flags" scope="TEST" /> - <orderEntry type="module" module-name="adt-ui" scope="TEST" /> - <orderEntry type="module" module-name="artwork" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.ide" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.externalSystem" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java" scope="TEST" /> + <orderEntry type="module" module-name="intellij.gradle" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java.compiler" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.xml.dom" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.debugger.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.designer" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.flags" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.artwork" scope="TEST" /> <orderEntry type="library" scope="TEST" name="com.android.tools.analytics-library:shared:26.0.0" level="project" /> <orderEntry type="library" scope="TEST" name="com.android.tools.analytics-library:tracker:26.0.0" level="project" /> <orderEntry type="library" scope="TEST" name="layoutlib" level="project" /> diff --git a/android/intellij.android.iml b/android/intellij.android.iml index e9cb2f1a1a0..2c79197c68c 100755 --- a/android/intellij.android.iml +++ b/android/intellij.android.iml @@ -9,47 +9,47 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="openapi" /> - <orderEntry type="module" module-name="dom-openapi" /> - <orderEntry type="module" module-name="execution-impl" /> - <orderEntry type="module" module-name="dom-impl" /> - <orderEntry type="module" module-name="compiler-impl" /> - <orderEntry type="module" module-name="xml" /> - <orderEntry type="module" module-name="debugger-impl" /> - <orderEntry type="module" module-name="xdebugger-impl" /> - <orderEntry type="module" module-name="execution-openapi" /> - <orderEntry type="module" module-name="smRunner" /> - <orderEntry type="module" module-name="junit" /> - <orderEntry type="module" module-name="idea-ui" /> - <orderEntry type="module" module-name="maven" /> - <orderEntry type="module" module-name="java-impl" /> - <orderEntry type="module" module-name="properties" /> + <orderEntry type="module" module-name="intellij.java" /> + <orderEntry type="module" module-name="intellij.xml.dom" /> + <orderEntry type="module" module-name="intellij.java.execution.impl" /> + <orderEntry type="module" module-name="intellij.xml.dom.impl" /> + <orderEntry type="module" module-name="intellij.java.compiler.impl" /> + <orderEntry type="module" module-name="intellij.xml.impl" /> + <orderEntry type="module" module-name="intellij.java.debugger.impl" /> + <orderEntry type="module" module-name="intellij.platform.debugger.impl" /> + <orderEntry type="module" module-name="intellij.java.execution" /> + <orderEntry type="module" module-name="intellij.platform.smRunner" /> + <orderEntry type="module" module-name="intellij.junit" /> + <orderEntry type="module" module-name="intellij.java.ui" /> + <orderEntry type="module" module-name="intellij.maven" /> + <orderEntry type="module" module-name="intellij.java.impl" /> + <orderEntry type="module" module-name="intellij.properties" /> <orderEntry type="library" name="xpp3-1.1.4-min" level="project" /> - <orderEntry type="module" module-name="testng" /> - <orderEntry type="module" module-name="build-common" exported="" /> - <orderEntry type="module" module-name="android-common" /> - <orderEntry type="module" module-name="android-rt" /> - <orderEntry type="module" module-name="java-indexing-api" /> - <orderEntry type="module" module-name="jps-builders" /> - <orderEntry type="module" module-name="spellchecker" /> - <orderEntry type="module" module-name="draw9patch" /> - <orderEntry type="module" module-name="manifest-merger" /> + <orderEntry type="module" module-name="intellij.testng" /> + <orderEntry type="module" module-name="intellij.android.buildCommon" exported="" /> + <orderEntry type="module" module-name="intellij.android.common" /> + <orderEntry type="module" module-name="intellij.android.rt" /> + <orderEntry type="module" module-name="intellij.java.indexing" /> + <orderEntry type="module" module-name="intellij.platform.jps.build" /> + <orderEntry type="module" module-name="intellij.spellchecker" /> + <orderEntry type="module" module-name="android.sdktools.draw9patch" /> + <orderEntry type="module" module-name="android.sdktools.manifest-merger" /> <orderEntry type="library" name="freemarker-2.3.20" level="project" /> - <orderEntry type="module" module-name="images" /> - <orderEntry type="module" module-name="platform-api" /> - <orderEntry type="module" module-name="eclipse" /> - <orderEntry type="module" module-name="external-system-api" /> - <orderEntry type="module" module-name="sherpa-ui" /> + <orderEntry type="module" module-name="intellij.platform.images" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> + <orderEntry type="module" module-name="intellij.eclipse" /> + <orderEntry type="module" module-name="intellij.platform.externalSystem" /> + <orderEntry type="module" module-name="intellij.android.sherpaUi" /> <orderEntry type="library" name="gson" level="project" /> - <orderEntry type="module" module-name="jetgroovy" /> - <orderEntry type="module" module-name="perflib" /> + <orderEntry type="module" module-name="intellij.groovy" /> + <orderEntry type="module" module-name="android.sdktools.perflib" /> <orderEntry type="library" name="swingx" level="project" /> - <orderEntry type="module" module-name="util" /> - <orderEntry type="module" module-name="properties-psi-api" /> - <orderEntry type="module" module-name="bootstrap" /> + <orderEntry type="module" module-name="intellij.platform.util" /> + <orderEntry type="module" module-name="intellij.properties.psi" /> + <orderEntry type="module" module-name="intellij.platform.bootstrap" /> <orderEntry type="library" name="jcip" level="project" /> - <orderEntry type="module" module-name="adt-ui" /> - <orderEntry type="module" module-name="adt-ui-model" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" /> + <orderEntry type="module" module-name="intellij.android.adt.ui.model" /> <orderEntry type="module-library"> <library> <CLASSES> @@ -63,9 +63,9 @@ </orderEntry> <orderEntry type="library" name="jsr305" level="project" /> <orderEntry type="library" name="jgraphx-3.4.0.1" level="project" /> - <orderEntry type="module" module-name="repository" /> - <orderEntry type="module" module-name="instant-run-client" /> - <orderEntry type="module" module-name="instant-run-common" /> + <orderEntry type="module" module-name="android.sdktools.repository" /> + <orderEntry type="module" module-name="android.sdktools.instant-run-client" /> + <orderEntry type="module" module-name="android.sdktools.instant-run-common" /> <orderEntry type="library" name="jna" level="project" /> <orderEntry type="module-library"> <library> @@ -85,28 +85,28 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="external-system-impl" /> + <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" /> <orderEntry type="library" name="Gradle" level="project" /> - <orderEntry type="module" module-name="gradle" /> - <orderEntry type="module" module-name="layoutlib" /> + <orderEntry type="module" module-name="intellij.gradle" /> + <orderEntry type="module" module-name="android.sdktools.layoutlib" /> <orderEntry type="library" name="baksmali" level="project" /> <orderEntry type="library" name="dexlib2" level="project" /> - <orderEntry type="module" module-name="binary-resources" /> - <orderEntry type="module" module-name="analyzer" /> - <orderEntry type="module" module-name="pixelprobe" /> - <orderEntry type="module" module-name="common" /> - <orderEntry type="module" module-name="observable" /> - <orderEntry type="module" module-name="gradle-tooling-extension-impl" /> - <orderEntry type="module" module-name="wizard" /> - <orderEntry type="module" module-name="smali" /> - <orderEntry type="module" module-name="java-lib-model" /> - <orderEntry type="module" module-name="java-lib-model-builder" /> - <orderEntry type="module" module-name="layoutinspector" /> - <orderEntry type="module" module-name="sdk-common" /> - <orderEntry type="module" module-name="flags" /> - <orderEntry type="module" module-name="lang-api" /> - <orderEntry type="module" module-name="observable-ui" /> - <orderEntry type="module" module-name="artwork" /> + <orderEntry type="module" module-name="android.sdktools.binary-resources" /> + <orderEntry type="module" module-name="intellij.android.analyzer" /> + <orderEntry type="module" module-name="android.sdktools.pixelprobe" /> + <orderEntry type="module" module-name="android.sdktools.common" /> + <orderEntry type="module" module-name="intellij.android.observable" /> + <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" /> + <orderEntry type="module" module-name="intellij.android.wizard" /> + <orderEntry type="module" module-name="intellij.android.smali" /> + <orderEntry type="module" module-name="intellij.android.javaLibModel" /> + <orderEntry type="module" module-name="intellij.android.javaLibModel.builder" /> + <orderEntry type="module" module-name="intellij.android.layoutInspector" /> + <orderEntry type="module" module-name="android.sdktools.sdk-common" /> + <orderEntry type="module" module-name="intellij.android.flags" /> + <orderEntry type="module" module-name="intellij.platform.lang" /> + <orderEntry type="module" module-name="intellij.android.observable.ui" /> + <orderEntry type="module" module-name="intellij.android.artwork" /> <orderEntry type="library" name="analytics-protos" level="project" /> <orderEntry type="library" name="com.android.tools.analytics-library:tracker:26.0.0" level="project" /> <orderEntry type="library" name="com.android.tools.analytics-library:shared:26.0.0" level="project" /> diff --git a/android/intellij.android.tests.iml b/android/intellij.android.tests.iml index ac9a72b308d..26bfe7ec511 100644 --- a/android/intellij.android.tests.iml +++ b/android/intellij.android.tests.iml @@ -8,58 +8,58 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" scope="TEST" name="mockito-2" level="project" /> - <orderEntry type="module" module-name="testFramework" scope="TEST" /> - <orderEntry type="module" module-name="android" scope="TEST" /> - <orderEntry type="module" module-name="spellchecker" scope="TEST" /> - <orderEntry type="module" module-name="xml-psi-api" scope="TEST" /> - <orderEntry type="module" module-name="adt-ui" scope="TEST" /> - <orderEntry type="module" module-name="adt-ui-model" scope="TEST" /> - <orderEntry type="module" module-name="lang-impl" scope="TEST" /> - <orderEntry type="module" module-name="testFramework-java" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android" scope="TEST" /> + <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" /> + <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.adt.ui.model" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.lang.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> <orderEntry type="library" scope="TEST" name="freemarker-2.3.20" level="project" /> - <orderEntry type="module" module-name="external-system-impl" scope="TEST" /> - <orderEntry type="module" module-name="observable" scope="TEST" /> - <orderEntry type="module" module-name="compiler-openapi" scope="TEST" /> - <orderEntry type="module" module-name="common" scope="TEST" /> - <orderEntry type="module" module-name="gradle-tooling-extension-api" scope="TEST" /> - <orderEntry type="module" module-name="manifest-merger" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.observable" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java.compiler" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.common" scope="TEST" /> + <orderEntry type="module" module-name="intellij.gradle.toolingExtension" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.manifest-merger" scope="TEST" /> <orderEntry type="library" scope="TEST" name="Eclipse" level="project" /> - <orderEntry type="module" module-name="xml-psi-impl" scope="TEST" /> - <orderEntry type="module" module-name="xml" scope="TEST" /> - <orderEntry type="module" module-name="gradle" scope="TEST" /> - <orderEntry type="module" module-name="gradle-tests" scope="TEST" /> - <orderEntry type="module" module-name="groovy-psi" scope="TEST" /> - <orderEntry type="module" module-name="layoutlib" scope="TEST" /> - <orderEntry type="module" module-name="properties-psi-api" scope="TEST" /> - <orderEntry type="module" module-name="instant-run-client" scope="TEST" /> - <orderEntry type="module" module-name="diff-impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.xml.psi.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.xml.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.gradle" scope="TEST" /> + <orderEntry type="module" module-name="intellij.gradle.tests" scope="TEST" /> + <orderEntry type="module" module-name="intellij.groovy.psi" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.layoutlib" scope="TEST" /> + <orderEntry type="module" module-name="intellij.properties.psi" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.instant-run-client" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.diff.impl" scope="TEST" /> <orderEntry type="library" scope="TEST" name="dexlib2" level="project" /> - <orderEntry type="module" module-name="compiler-impl" scope="TEST" /> - <orderEntry type="module" module-name="dom-impl" scope="TEST" /> - <orderEntry type="module" module-name="execution-impl" scope="TEST" /> - <orderEntry type="module" module-name="android-test-framework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java.compiler.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.xml.dom.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.testFramework" scope="TEST" /> <orderEntry type="library" scope="TEST" name="jsr305" level="project" /> - <orderEntry type="module" module-name="analytics-testing" scope="TEST" /> - <orderEntry type="module" module-name="wizard" scope="TEST" /> - <orderEntry type="module" module-name="fakeadbserver" scope="TEST" /> - <orderEntry type="module" module-name="adt-branding" scope="TEST" /> - <orderEntry type="module" module-name="sdk-updates" scope="TEST" /> - <orderEntry type="module" module-name="java-lib-model" scope="TEST" /> - <orderEntry type="module" module-name="layoutinspector" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.analytics-testing" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.wizard" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.fakeadbserver" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.adt.branding" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.sdkUpdates" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.javaLibModel" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.layoutInspector" scope="TEST" /> <orderEntry type="library" scope="TEST" name="equalsverifier" level="project" /> - <orderEntry type="module" module-name="analyzer" scope="TEST" /> - <orderEntry type="module" module-name="sdk-common" scope="TEST" /> - <orderEntry type="module" module-name="flags" scope="TEST" /> - <orderEntry type="module" module-name="properties-psi-impl" scope="TEST" /> - <orderEntry type="module" module-name="artwork" scope="TEST" /> - <orderEntry type="module" module-name="android-common" scope="TEST" /> - <orderEntry type="module" module-name="junit" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.analyzer" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.sdk-common" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.flags" scope="TEST" /> + <orderEntry type="module" module-name="intellij.properties.psi.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.artwork" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.common" scope="TEST" /> + <orderEntry type="module" module-name="intellij.junit" scope="TEST" /> <orderEntry type="library" scope="TEST" name="analytics-protos" level="project" /> <orderEntry type="library" scope="TEST" name="com.android.tools.analytics-library:shared:26.0.0" level="project" /> <orderEntry type="library" scope="TEST" name="com.android.tools.analytics-library:tracker:26.0.0" level="project" /> - <orderEntry type="module" module-name="android-plugin" scope="RUNTIME" /> + <orderEntry type="module" module-name="intellij.android.plugin" scope="RUNTIME" /> <orderEntry type="library" name="commons-io" level="project" /> </component> </module>
\ No newline at end of file diff --git a/android/intellij.androidStudio.main.iml b/android/intellij.androidStudio.main.iml index 8354933a5fa..1937404ac52 100644 --- a/android/intellij.androidStudio.main.iml +++ b/android/intellij.androidStudio.main.iml @@ -4,12 +4,12 @@ <exclude-output /> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="adt-branding" /> - <orderEntry type="module" module-name="android" /> - <orderEntry type="module" module-name="platform-main" /> - <orderEntry type="module" module-name="resources" /> - <orderEntry type="module" module-name="structuralsearch-java" /> - <orderEntry type="module" module-name="colorSchemes" /> - <orderEntry type="module" module-name="android-plugin" /> + <orderEntry type="module" module-name="intellij.android.adt.branding" /> + <orderEntry type="module" module-name="intellij.android" /> + <orderEntry type="module" module-name="intellij.platform.main" /> + <orderEntry type="module" module-name="intellij.java.resources" /> + <orderEntry type="module" module-name="intellij.java.structuralSearch" /> + <orderEntry type="module" module-name="intellij.platform.colorSchemes" /> + <orderEntry type="module" module-name="intellij.android.plugin" /> </component> </module>
\ No newline at end of file diff --git a/artwork/intellij.android.artwork.iml b/artwork/intellij.android.artwork.iml index c84e7039127..43c45571b61 100644 --- a/artwork/intellij.android.artwork.iml +++ b/artwork/intellij.android.artwork.iml @@ -9,6 +9,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="util" /> + <orderEntry type="module" module-name="intellij.platform.util" /> </component> </module>
\ No newline at end of file diff --git a/build-common/intellij.android.buildCommon.iml b/build-common/intellij.android.buildCommon.iml index 4d6418e506a..c6cf6a6e317 100644 --- a/build-common/intellij.android.buildCommon.iml +++ b/build-common/intellij.android.buildCommon.iml @@ -10,7 +10,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="util" /> + <orderEntry type="module" module-name="intellij.platform.util" /> <orderEntry type="module-library" exported=""> <library name="android-sdk-tools-jps"> <CLASSES> @@ -23,16 +23,16 @@ </library> </orderEntry> <orderEntry type="library" name="NanoXML" level="project" /> - <orderEntry type="module" module-name="common" exported="" /> - <orderEntry type="module" module-name="ddmlib" exported="" /> - <orderEntry type="module" module-name="dvlib" exported="" /> - <orderEntry type="module" module-name="layoutlib-api" exported="" /> - <orderEntry type="module" module-name="lint-api" exported="" /> - <orderEntry type="module" module-name="lint-checks" exported="" /> - <orderEntry type="module" module-name="ninepatch" exported="" /> - <orderEntry type="module" module-name="sdk-common" exported="" /> - <orderEntry type="module" module-name="sdklib" exported="" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> - <orderEntry type="module" module-name="android-common" /> + <orderEntry type="module" module-name="android.sdktools.common" exported="" /> + <orderEntry type="module" module-name="android.sdktools.ddmlib" exported="" /> + <orderEntry type="module" module-name="android.sdktools.dvlib" exported="" /> + <orderEntry type="module" module-name="android.sdktools.layoutlib-api" exported="" /> + <orderEntry type="module" module-name="android.sdktools.lint-api" exported="" /> + <orderEntry type="module" module-name="android.sdktools.lint-checks" exported="" /> + <orderEntry type="module" module-name="android.sdktools.ninepatch" exported="" /> + <orderEntry type="module" module-name="android.sdktools.sdk-common" exported="" /> + <orderEntry type="module" module-name="android.sdktools.sdklib" exported="" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.common" /> </component> </module>
\ No newline at end of file diff --git a/designer/intellij.android.designer.iml b/designer/intellij.android.designer.iml index 7f98a84ee2d..d60a41408d2 100644 --- a/designer/intellij.android.designer.iml +++ b/designer/intellij.android.designer.iml @@ -8,26 +8,26 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="editor-ui-api" /> - <orderEntry type="module" module-name="core-api" /> - <orderEntry type="module" module-name="platform-api" /> - <orderEntry type="module" module-name="android" /> - <orderEntry type="module" module-name="sherpa-ui" /> - <orderEntry type="module" module-name="xml-psi-api" /> - <orderEntry type="module" module-name="lang-impl" /> - <orderEntry type="module" module-name="pixelprobe" /> - <orderEntry type="module" module-name="images" /> - <orderEntry type="module" module-name="android-annotations" /> + <orderEntry type="module" module-name="intellij.platform.editor" /> + <orderEntry type="module" module-name="intellij.platform.core" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> + <orderEntry type="module" module-name="intellij.android" /> + <orderEntry type="module" module-name="intellij.android.sherpaUi" /> + <orderEntry type="module" module-name="intellij.xml.psi" /> + <orderEntry type="module" module-name="intellij.platform.lang.impl" /> + <orderEntry type="module" module-name="android.sdktools.pixelprobe" /> + <orderEntry type="module" module-name="intellij.platform.images" /> + <orderEntry type="module" module-name="android.sdktools.android-annotations" /> <orderEntry type="library" name="jsr305" level="project" /> - <orderEntry type="module" module-name="dom-openapi" /> - <orderEntry type="module" module-name="lang-api" /> - <orderEntry type="module" module-name="xml-psi-impl" /> - <orderEntry type="module" module-name="java-psi-impl" /> - <orderEntry type="module" module-name="java-indexing-api" /> - <orderEntry type="module" module-name="adt-ui" /> - <orderEntry type="module" module-name="wizard" /> - <orderEntry type="module" module-name="flags" /> - <orderEntry type="module" module-name="artwork" /> + <orderEntry type="module" module-name="intellij.xml.dom" /> + <orderEntry type="module" module-name="intellij.platform.lang" /> + <orderEntry type="module" module-name="intellij.xml.psi.impl" /> + <orderEntry type="module" module-name="intellij.java.psi.impl" /> + <orderEntry type="module" module-name="intellij.java.indexing" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" /> + <orderEntry type="module" module-name="intellij.android.wizard" /> + <orderEntry type="module" module-name="intellij.android.flags" /> + <orderEntry type="module" module-name="intellij.android.artwork" /> <orderEntry type="library" name="layoutlib" level="project" /> <orderEntry type="library" name="analytics-protos" level="project" /> <orderEntry type="library" name="com.android.tools.analytics-library:tracker:26.0.0" level="project" /> diff --git a/designer/intellij.android.designer.tests.iml b/designer/intellij.android.designer.tests.iml index ee47e8b710f..3bbfbf4a243 100644 --- a/designer/intellij.android.designer.tests.iml +++ b/designer/intellij.android.designer.tests.iml @@ -7,31 +7,31 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="testFramework" scope="TEST" /> - <orderEntry type="module" module-name="designer" scope="TEST" /> - <orderEntry type="module" module-name="android" scope="TEST" /> - <orderEntry type="module" module-name="xml-psi-api" scope="TEST" /> - <orderEntry type="module" module-name="testFramework-java" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.designer" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android" scope="TEST" /> + <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> - <orderEntry type="module" module-name="lang-api" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.lang" scope="TEST" /> <orderEntry type="library" scope="TEST" name="layoutlib" level="project" /> - <orderEntry type="module" module-name="xml-psi-impl" scope="TEST" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> - <orderEntry type="module" module-name="adt-ui" scope="TEST" /> - <orderEntry type="module" module-name="pixelprobe" scope="TEST" /> - <orderEntry type="module" module-name="sherpa-ui" scope="TEST" /> - <orderEntry type="module" module-name="android-test-framework" scope="TEST" /> - <orderEntry type="module" module-name="dom-openapi" scope="TEST" /> - <orderEntry type="module" module-name="adt-branding" scope="TEST" /> - <orderEntry type="module" module-name="sdk-updates" scope="TEST" /> - <orderEntry type="module" module-name="layoutinspector" scope="TEST" /> + <orderEntry type="module" module-name="intellij.xml.psi.impl" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.pixelprobe" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.sherpaUi" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.testFramework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.xml.dom" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.adt.branding" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.sdkUpdates" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.layoutInspector" scope="TEST" /> <orderEntry type="library" scope="TEST" name="Gradle" level="project" /> - <orderEntry type="module" module-name="flags" /> - <orderEntry type="module" module-name="artwork" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.flags" /> + <orderEntry type="module" module-name="intellij.android.artwork" scope="TEST" /> <orderEntry type="library" scope="TEST" name="mockito-2" level="project" /> <orderEntry type="library" scope="TEST" name="com.android.tools.analytics-library:shared:26.0.0" level="project" /> <orderEntry type="library" scope="TEST" name="com.android.tools.analytics-library:tracker:26.0.0" level="project" /> <orderEntry type="library" scope="TEST" name="analytics-protos" level="project" /> - <orderEntry type="module" module-name="android-plugin" scope="RUNTIME" /> + <orderEntry type="module" module-name="intellij.android.plugin" scope="RUNTIME" /> </component> </module>
\ No newline at end of file diff --git a/jps-plugin/intellij.android.jps.iml b/jps-plugin/intellij.android.jps.iml index 904e8928ed4..d5e368106dd 100644 --- a/jps-plugin/intellij.android.jps.iml +++ b/jps-plugin/intellij.android.jps.iml @@ -8,16 +8,16 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="build-common" /> - <orderEntry type="module" module-name="android-rt" /> - <orderEntry type="module" module-name="jps-builders" /> - <orderEntry type="module" module-name="util" /> + <orderEntry type="module" module-name="intellij.android.buildCommon" /> + <orderEntry type="module" module-name="intellij.android.rt" /> + <orderEntry type="module" module-name="intellij.platform.jps.build" /> + <orderEntry type="module" module-name="intellij.platform.util" /> <orderEntry type="library" name="NanoXML" level="project" /> - <orderEntry type="module" module-name="jps-model-api" /> - <orderEntry type="module" module-name="jps-model-serialization" /> - <orderEntry type="module" module-name="jps-model-impl" /> - <orderEntry type="module" module-name="maven-jps-plugin" scope="TEST" /> - <orderEntry type="module" module-name="manifest-merger" /> - <orderEntry type="module" module-name="testFramework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.jps.model" /> + <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" /> + <orderEntry type="module" module-name="intellij.platform.jps.model.impl" /> + <orderEntry type="module" module-name="intellij.maven.jps" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.manifest-merger" /> + <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" /> </component> -</module> +</module>
\ No newline at end of file diff --git a/layoutlib/android.sdktools.layoutlib.iml b/layoutlib/android.sdktools.layoutlib.iml index bb86553cf31..049caa788b9 100644 --- a/layoutlib/android.sdktools.layoutlib.iml +++ b/layoutlib/android.sdktools.layoutlib.iml @@ -9,11 +9,11 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" exported="" name="layoutlib" level="project" /> - <orderEntry type="module" module-name="sdk-common" /> - <orderEntry type="module" module-name="annotations" /> - <orderEntry type="module" module-name="android-common" /> - <orderEntry type="module" module-name="platform-api" /> - <orderEntry type="module" module-name="layoutlib-api" /> + <orderEntry type="module" module-name="android.sdktools.sdk-common" /> + <orderEntry type="module" module-name="intellij.platform.annotations.java5" /> + <orderEntry type="module" module-name="intellij.android.common" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> + <orderEntry type="module" module-name="android.sdktools.layoutlib-api" /> <orderEntry type="library" name="ASM" level="project" /> </component> </module>
\ No newline at end of file diff --git a/observable-ui/intellij.android.observable.ui.iml b/observable-ui/intellij.android.observable.ui.iml index b0d40808c0e..6f08f5b8af4 100644 --- a/observable-ui/intellij.android.observable.ui.iml +++ b/observable-ui/intellij.android.observable.ui.iml @@ -8,10 +8,10 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="adt-ui" /> - <orderEntry type="module" module-name="platform-impl" /> - <orderEntry type="module" module-name="observable" /> - <orderEntry type="module" module-name="platform-api" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" /> + <orderEntry type="module" module-name="intellij.platform.ide.impl" /> + <orderEntry type="module" module-name="intellij.android.observable" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> <orderEntry type="library" scope="TEST" name="JUnit4" level="project" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> <orderEntry type="library" scope="TEST" name="Guava" level="project" /> diff --git a/observable/intellij.android.observable.iml b/observable/intellij.android.observable.iml index bfe135a172e..b6edc22c140 100644 --- a/observable/intellij.android.observable.iml +++ b/observable/intellij.android.observable.iml @@ -9,9 +9,9 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="Guava" level="project" /> - <orderEntry type="module" module-name="annotations" /> + <orderEntry type="module" module-name="intellij.platform.annotations.java5" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> <orderEntry type="library" scope="TEST" name="JUnit4" level="project" /> - <orderEntry type="module" module-name="testFramework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" /> </component> </module>
\ No newline at end of file diff --git a/perfd-host/intellij.android.perfdHost.iml b/perfd-host/intellij.android.perfdHost.iml index 84d353c65ab..21f5b2be1a0 100644 --- a/perfd-host/intellij.android.perfdHost.iml +++ b/perfd-host/intellij.android.perfdHost.iml @@ -9,16 +9,16 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="android-annotations" /> + <orderEntry type="module" module-name="android.sdktools.android-annotations" /> <orderEntry type="library" name="Trove4j" level="project" /> - <orderEntry type="module" module-name="platform-api" /> - <orderEntry type="module" module-name="platform-impl" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> + <orderEntry type="module" module-name="intellij.platform.ide.impl" /> <orderEntry type="library" scope="TEST" name="JUnit4" level="project" /> - <orderEntry type="module" module-name="common" /> + <orderEntry type="module" module-name="android.sdktools.common" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> - <orderEntry type="module" module-name="adt-ui-model" /> - <orderEntry type="module" module-name="annotations-common" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.adt.ui.model" /> + <orderEntry type="module" module-name="intellij.platform.annotations.common" /> <orderEntry type="library" name="studio-profiler-grpc-1.0-jarjar" level="project" /> <orderEntry type="library" name="jcip" level="project" /> <orderEntry type="library" name="sqlite" level="project" /> diff --git a/profilers-android/intellij.android.profilersAndroid.iml b/profilers-android/intellij.android.profilersAndroid.iml index 7182f688ae7..264b411715f 100644 --- a/profilers-android/intellij.android.profilersAndroid.iml +++ b/profilers-android/intellij.android.profilersAndroid.iml @@ -8,25 +8,25 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="core-api" /> - <orderEntry type="module" module-name="platform-api" /> - <orderEntry type="module" module-name="profilers-ui" /> - <orderEntry type="module" module-name="profilers" /> - <orderEntry type="module" module-name="adt-ui" /> - <orderEntry type="module" module-name="adt-ui-model" /> - <orderEntry type="module" module-name="perfd-host" /> + <orderEntry type="module" module-name="intellij.platform.core" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> + <orderEntry type="module" module-name="intellij.android.profilers.ui" /> + <orderEntry type="module" module-name="intellij.android.profilers" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" /> + <orderEntry type="module" module-name="intellij.android.adt.ui.model" /> + <orderEntry type="module" module-name="intellij.android.perfdHost" /> <orderEntry type="library" name="studio-profiler-grpc-1.0-jarjar" level="project" /> <orderEntry type="library" name="Guava" level="project" /> - <orderEntry type="module" module-name="java-psi-api" /> - <orderEntry type="module" module-name="android" /> - <orderEntry type="module" module-name="android-common" /> - <orderEntry type="module" module-name="lang-api" /> - <orderEntry type="module" module-name="lang-impl" /> - <orderEntry type="module" module-name="ddmlib" /> - <orderEntry type="module" module-name="platform-impl" /> - <orderEntry type="module" module-name="flags" /> + <orderEntry type="module" module-name="intellij.java.psi" /> + <orderEntry type="module" module-name="intellij.android" /> + <orderEntry type="module" module-name="intellij.android.common" /> + <orderEntry type="module" module-name="intellij.platform.lang" /> + <orderEntry type="module" module-name="intellij.platform.lang.impl" /> + <orderEntry type="module" module-name="android.sdktools.ddmlib" /> + <orderEntry type="module" module-name="intellij.platform.ide.impl" /> + <orderEntry type="module" module-name="intellij.android.flags" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> - <orderEntry type="module" module-name="artwork" /> + <orderEntry type="module" module-name="intellij.android.artwork" /> <orderEntry type="library" name="analytics-protos" level="project" /> <orderEntry type="library" name="com.android.tools.analytics-library:tracker:26.0.0" level="project" /> <orderEntry type="library" scope="TEST" name="mockito-2" level="project" /> diff --git a/profilers-ui/intellij.android.profilers.ui.iml b/profilers-ui/intellij.android.profilers.ui.iml index 8852d683bc9..ec7e0fa6507 100644 --- a/profilers-ui/intellij.android.profilers.ui.iml +++ b/profilers-ui/intellij.android.profilers.ui.iml @@ -8,20 +8,20 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="profilers" /> - <orderEntry type="module" module-name="annotations" /> + <orderEntry type="module" module-name="intellij.android.profilers" /> + <orderEntry type="module" module-name="intellij.platform.annotations.java5" /> <orderEntry type="library" name="studio-profiler-grpc-1.0-jarjar" level="project" /> - <orderEntry type="module" module-name="core-api" /> + <orderEntry type="module" module-name="intellij.platform.core" /> <orderEntry type="library" name="Guava" level="project" /> - <orderEntry type="module" module-name="adt-ui" /> - <orderEntry type="module" module-name="adt-ui-model" /> - <orderEntry type="module" module-name="platform-api" /> - <orderEntry type="module" module-name="perflib" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" /> + <orderEntry type="module" module-name="intellij.android.adt.ui.model" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> + <orderEntry type="module" module-name="android.sdktools.perflib" /> <orderEntry type="library" scope="TEST" name="JUnit4" level="project" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" /> - <orderEntry type="module" module-name="artwork" /> + <orderEntry type="module" module-name="intellij.android.artwork" /> <orderEntry type="library" scope="TEST" name="mockito-2" level="project" /> </component> </module>
\ No newline at end of file diff --git a/profilers/intellij.android.profilers.iml b/profilers/intellij.android.profilers.iml index e37ec7bfb65..a958259d5f3 100644 --- a/profilers/intellij.android.profilers.iml +++ b/profilers/intellij.android.profilers.iml @@ -8,18 +8,18 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="annotations" /> + <orderEntry type="module" module-name="intellij.platform.annotations.java5" /> <orderEntry type="library" name="studio-profiler-grpc-1.0-jarjar" level="project" /> <orderEntry type="library" name="Guava" level="project" /> - <orderEntry type="module" module-name="adt-ui-model" /> - <orderEntry type="module" module-name="util" /> + <orderEntry type="module" module-name="intellij.android.adt.ui.model" /> + <orderEntry type="module" module-name="intellij.platform.util" /> <orderEntry type="library" scope="TEST" name="JUnit4" level="project" /> - <orderEntry type="module" module-name="perflib" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.perflib" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> - <orderEntry type="module" module-name="common" /> + <orderEntry type="module" module-name="android.sdktools.common" /> <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" /> <orderEntry type="library" scope="TEST" name="mockito-2" level="project" /> - <orderEntry type="module" module-name="android-test-framework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.testFramework" scope="TEST" /> </component> </module>
\ No newline at end of file diff --git a/rt/intellij.android.rt.iml b/rt/intellij.android.rt.iml index 7e88b006711..4df0f7fbc57 100644 --- a/rt/intellij.android.rt.iml +++ b/rt/intellij.android.rt.iml @@ -7,8 +7,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="annotations" /> - <orderEntry type="module" module-name="util-rt" /> + <orderEntry type="module" module-name="intellij.platform.annotations.java5" /> + <orderEntry type="module" module-name="intellij.platform.util.rt" /> </component> -</module> - +</module>
\ No newline at end of file diff --git a/sdk-updates/intellij.android.sdkUpdates.iml b/sdk-updates/intellij.android.sdkUpdates.iml index 5d283532e64..bec79280007 100644 --- a/sdk-updates/intellij.android.sdkUpdates.iml +++ b/sdk-updates/intellij.android.sdkUpdates.iml @@ -7,13 +7,13 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="platform-impl" /> - <orderEntry type="module" module-name="android" /> - <orderEntry type="module" module-name="lang-api" /> - <orderEntry type="module" module-name="observable" /> - <orderEntry type="module" module-name="adt-ui" /> - <orderEntry type="module" module-name="wizard" /> - <orderEntry type="module" module-name="observable-ui" /> + <orderEntry type="module" module-name="intellij.platform.ide.impl" /> + <orderEntry type="module" module-name="intellij.android" /> + <orderEntry type="module" module-name="intellij.platform.lang" /> + <orderEntry type="module" module-name="intellij.android.observable" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" /> + <orderEntry type="module" module-name="intellij.android.wizard" /> + <orderEntry type="module" module-name="intellij.android.observable.ui" /> <orderEntry type="library" name="com.android.tools.analytics-library:tracker:26.0.0" level="project" /> <orderEntry type="library" name="analytics-protos" level="project" /> </component> diff --git a/smali/intellij.android.smali.iml b/smali/intellij.android.smali.iml index 039600af3b2..0e60a82fced 100644 --- a/smali/intellij.android.smali.iml +++ b/smali/intellij.android.smali.iml @@ -11,11 +11,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="platform-api" /> - <orderEntry type="module" module-name="lang-impl" /> - <orderEntry type="module" module-name="testFramework" scope="TEST" /> - <orderEntry type="module" module-name="testFramework-java" scope="TEST" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> + <orderEntry type="module" module-name="intellij.platform.lang.impl" /> + <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> <orderEntry type="library" name="Guava" level="project" /> <orderEntry type="library" scope="TEST" name="mockito-2" level="project" /> diff --git a/uitest-framework/intellij.android.guiTestFramework.iml b/uitest-framework/intellij.android.guiTestFramework.iml index e0798b0778d..f2c34204bb2 100644 --- a/uitest-framework/intellij.android.guiTestFramework.iml +++ b/uitest-framework/intellij.android.guiTestFramework.iml @@ -7,19 +7,19 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="common" scope="TEST" /> - <orderEntry type="module" module-name="android" scope="TEST" /> - <orderEntry type="module" module-name="platform-api" scope="TEST" /> - <orderEntry type="module" module-name="platform-impl" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.common" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.ide" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.ide.impl" scope="TEST" /> <orderEntry type="library" scope="TEST" name="fest" level="project" /> <orderEntry type="library" scope="TEST" name="fest-swing" level="project" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> - <orderEntry type="module" module-name="testFramework" scope="TEST" /> - <orderEntry type="module" module-name="gradle" scope="TEST" /> - <orderEntry type="module" module-name="openapi" scope="TEST" /> - <orderEntry type="module" module-name="bootstrap" scope="TEST" /> - <orderEntry type="module" module-name="xdebugger-impl" scope="TEST" /> - <orderEntry type="module" module-name="dom-openapi" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.gradle" scope="TEST" /> + <orderEntry type="module" module-name="intellij.java" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.bootstrap" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.debugger.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.xml.dom" scope="TEST" /> <orderEntry type="module-library" scope="TEST"> <library> <CLASSES> @@ -31,10 +31,10 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module" module-name="adt-ui" scope="TEST" /> - <orderEntry type="module" module-name="designer" scope="TEST" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> - <orderEntry type="module" module-name="android-test-framework" scope="TEST" /> - <orderEntry type="module" module-name="flags" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.designer" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.testFramework" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.flags" scope="TEST" /> </component> </module>
\ No newline at end of file diff --git a/ultimate/intellij.android.ultimate.iml b/ultimate/intellij.android.ultimate.iml index 775aee700aa..e2a9b703eae 100644 --- a/ultimate/intellij.android.ultimate.iml +++ b/ultimate/intellij.android.ultimate.iml @@ -8,12 +8,12 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="openapi" /> - <orderEntry type="module" module-name="database-openapi" /> - <orderEntry type="module" module-name="database-impl" /> - <orderEntry type="module" module-name="android" /> - <orderEntry type="module" module-name="lang-impl" /> - <orderEntry type="module" module-name="dom-openapi" /> - <orderEntry type="module" module-name="artwork" /> + <orderEntry type="module" module-name="intellij.java" /> + <orderEntry type="module" module-name="intellij.database" /> + <orderEntry type="module" module-name="intellij.database.impl" /> + <orderEntry type="module" module-name="intellij.android" /> + <orderEntry type="module" module-name="intellij.platform.lang.impl" /> + <orderEntry type="module" module-name="intellij.xml.dom" /> + <orderEntry type="module" module-name="intellij.android.artwork" /> </component> </module>
\ No newline at end of file diff --git a/wizard-model/intellij.android.wizard.model.iml b/wizard-model/intellij.android.wizard.model.iml index b20e3f61b83..a71f4bfb18f 100644 --- a/wizard-model/intellij.android.wizard.model.iml +++ b/wizard-model/intellij.android.wizard.model.iml @@ -8,12 +8,12 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="android-annotations" /> - <orderEntry type="module" module-name="observable" /> + <orderEntry type="module" module-name="android.sdktools.android-annotations" /> + <orderEntry type="module" module-name="intellij.android.observable" /> <orderEntry type="library" name="Guava" level="project" /> - <orderEntry type="module" module-name="platform-api" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> <orderEntry type="library" scope="TEST" name="JUnit4" level="project" /> <orderEntry type="library" scope="TEST" name="truth" level="project" /> - <orderEntry type="module" module-name="testutils" scope="TEST" /> + <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" /> </component> -</module> +</module>
\ No newline at end of file diff --git a/wizard/intellij.android.wizard.iml b/wizard/intellij.android.wizard.iml index e2cd7eeae04..50435e7d00d 100644 --- a/wizard/intellij.android.wizard.iml +++ b/wizard/intellij.android.wizard.iml @@ -8,12 +8,12 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="wizard-model" exported="" /> - <orderEntry type="module" module-name="observable" /> - <orderEntry type="module" module-name="platform-api" /> + <orderEntry type="module" module-name="intellij.android.wizard.model" exported="" /> + <orderEntry type="module" module-name="intellij.android.observable" /> + <orderEntry type="module" module-name="intellij.platform.ide" /> <orderEntry type="library" scope="TEST" name="Guava" level="project" /> - <orderEntry type="module" module-name="adt-ui" scope="TEST" /> - <orderEntry type="module" module-name="platform-impl" scope="TEST" /> - <orderEntry type="module" module-name="observable-ui" /> + <orderEntry type="module" module-name="intellij.android.adt.ui" scope="TEST" /> + <orderEntry type="module" module-name="intellij.platform.ide.impl" scope="TEST" /> + <orderEntry type="module" module-name="intellij.android.observable.ui" /> </component> </module>
\ No newline at end of file |