Refactoring: rename android-compiler-plugin to android-extensions-compiler

.idea/artifacts/KotlinPlugin.xml

@@ -57,7 +57,7 @@
           <element id="module-output" name="android-idea-plugin" />
         </element>
         <element id="archive" name="kotlin-android-extensions-compiler-plugin.jar">
-          <element id="module-output" name="android-compiler-plugin" />
+          <element id="module-output" name="android-extensions-compiler" />
         </element>
       </element>
       <element id="directory" name="kotlinc">

.idea/modules.xml

@@ -3,7 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-compiler-plugin/android-compiler-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-compiler-plugin/android-compiler-plugin.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/android-idea-plugin/android-idea-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-idea-plugin/android-idea-plugin.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/android-jps-plugin/android-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-jps-plugin/android-jps-plugin.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/android-studio/android-studio.iml" filepath="$PROJECT_DIR$/android-studio/android-studio.iml" group="ide" />

build.xml

@@ -719,15 +719,15 @@
         </jar>
     </target>
 
-    <target name="android-compiler-plugin">
+    <target name="android-extensions-compiler">
-        <cleandir dir="${output}/classes/android-compiler-plugin"/>
+        <cleandir dir="${output}/classes/android-extensions/android-extensions-compiler"/>
-        <javac2 destdir="${output}/classes/android-compiler-plugin" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
+        <javac2 destdir="${output}/classes/android-extensions/android-extensions-compiler" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
-            <withKotlin modulename="kotlin-android-compiler-plugin">
+            <withKotlin modulename="kotlin-android-extensions-compiler">
                 <compilerarg value="-version"/>
             </withKotlin>
             <skip pattern="kotlin/Metadata"/>
             <src>
-                <pathelement path="plugins/android-compiler-plugin/src"/>
+                <pathelement path="plugins/android-extensions/android-extensions-compiler/src"/>
             </src>
             <classpath>
                 <pathelement path="${idea.sdk}/core/intellij-core.jar"/>
@@ -737,10 +737,10 @@
             </classpath>
         </javac2>
 
-        <jar destfile="${kotlin-home}/lib/android-compiler-plugin.jar">
+        <jar destfile="${kotlin-home}/lib/android-extensions-compiler.jar">
-            <fileset dir="${output}/classes/android-compiler-plugin"/>
+            <fileset dir="${output}/classes/android-extensions/android-extensions-compiler"/>
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-            <fileset dir="${basedir}/plugins/android-compiler-plugin/src" includes="META-INF/services/**"/>
+            <fileset dir="${basedir}/plugins/android-extensions/android-extensions-compiler/src" includes="META-INF/services/**"/>
         </jar>
     </target>
 
@@ -1074,11 +1074,11 @@
             depends="builtins,stdlib,kotlin-test,core,reflection,pack-runtime,pack-runtime-sources,mock-runtime-for-test"/>
 
     <target name="dist"
-            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,kotlin-build-common,ant-tools,runtime,kotlin-js-stdlib,android-compiler-plugin,daemon-client,kotlin-build-common-test"
+            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,kotlin-build-common,ant-tools,runtime,kotlin-js-stdlib,android-extensions-compiler,daemon-client,kotlin-build-common-test"
             description="Builds redistributables from sources"/>
 
     <target name="dist-quick"
-            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,runtime,kotlin-js-stdlib,android-compiler-plugin"
+            depends="clean,init,prepare-dist,preloader,serialize-builtins,compiler-quick,ant-tools,runtime,kotlin-js-stdlib,android-extensions-compiler"
             description="Builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc"/>
 
     <target name="dist-quick-compiler-only"

compiler/testData/cli/jvm/pluginSimple.args

@@ -1,7 +1,7 @@
 -d
 $TEMP_DIR$
 -Xplugin
-dist/kotlinc/lib/android-compiler-plugin.jar
+dist/kotlinc/lib/android-extensions-compiler.jar
 -P
 plugin\:org.jetbrains.kotlin.android\:package=com.myapp
 -P

compiler/testData/cli/jvm/pluginSimpleUsage.args

@@ -1,7 +1,7 @@
 -d
 $TEMP_DIR$
 -Xplugin
-dist/kotlinc/lib/android-compiler-plugin.jar
+dist/kotlinc/lib/android-extensions-compiler.jar
 -P
 plugin\:org.jetbrains.kotlin.android\:package=com.myapp
 $TESTDATA_DIR$/pluginSimple.kt

compiler/tests/compiler-tests.iml

@@ -22,7 +22,7 @@
     <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="js.tests" />
     <orderEntry type="module" module-name="preloader" />
-    <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
+    <orderEntry type="module" module-name="android-extensions-compiler" scope="TEST" />
     <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="js.translator" scope="TEST" />
     <orderEntry type="module" module-name="util" />
@@ -30,4 +30,4 @@
     <orderEntry type="module" module-name="daemon-common" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
   </component>
-</module>
+</module>

generators/generators.iml

@@ -24,7 +24,7 @@
     <orderEntry type="module" module-name="js.dart-ast" scope="TEST" />
     <orderEntry type="module" module-name="js.frontend" scope="TEST" />
     <orderEntry type="module" module-name="util" scope="TEST" />
-    <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
+    <orderEntry type="module" module-name="android-extensions-compiler" scope="TEST" />
     <orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
     <orderEntry type="module" module-name="android-jps-plugin" scope="TEST" />
     <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />

generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -935,7 +935,7 @@ fun main(args: Array<String>) {
         }
     }
 
-    testGroup("plugins/android-compiler-plugin/tests", "plugins/android-compiler-plugin/testData") {
+    testGroup("plugins/android-extensions/android-extensions-compiler/tests", "plugins/android-extensions/android-extensions-compiler/testData") {
         testClass<AbstractAndroidSyntheticPropertyDescriptorTest>() {
             model("descriptors", recursive = false, extension = null)
         }

idea/idea.iml

@@ -41,7 +41,7 @@
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
+    <orderEntry type="module" module-name="android-extensions-compiler" scope="TEST" />
     <orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
     <orderEntry type="library" name="markdown" level="project" />
     <orderEntry type="module" module-name="idea-completion" scope="TEST" />

libraries/tools/kotlin-android-extensions/pom.xml

@@ -57,7 +57,7 @@
                         <phase>compile</phase>
                         <configuration>
                             <tasks>
-                                <unzip src="${kotlin-sdk}/lib/android-compiler-plugin.jar" dest="target/classes/" />
+                                <unzip src="${kotlin-sdk}/lib/android-extensions-compiler.jar" dest="target/classes/" />
                             </tasks>
                         </configuration>
                         <goals>
@@ -79,7 +79,7 @@
                         </goals>
                         <configuration>
                             <classifier>sources</classifier>
-                            <classesDirectory>${basedir}/../../../plugins/android-compiler-plugin/src</classesDirectory>
+                            <classesDirectory>${basedir}/../../../plugins/android-extensions/android-extensions-compiler/src</classesDirectory>
                         </configuration>
                     </execution>
                 </executions>