From ec4f1b16de0bc1f6047fe76fdfaf012b12a81f1b Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 11 Dec 2015 13:28:23 +0300
Subject: [PATCH] Remove obsolete Android Extensions plugin

---
 TeamCityBuild.xml                                 |  5 -----
 plugins/android-idea-plugin/old_plugin/plugin.xml | 13 -------------
 2 files changed, 18 deletions(-)
 delete mode 100644 plugins/android-idea-plugin/old_plugin/plugin.xml

diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 360007bd758..a02e50557c4 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -18,7 +18,6 @@
 
     <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip"/>
     <property name="bare.plugin.zip" value="${artifact.output.path}/kotlin-bare-plugin-${build.number}.zip"/>
-    <property name="android-extensions.zip" value="${artifact.output.path}/kotlin-android-extensions-plugin-${build.number}.zip"/>
 
     <property name="kotlin.bare.plugin.xml" value="jps-plugin/bare-plugin/src/META-INF/plugin.xml"/>
     <property name="kotlin.bare.plugin.xml.bk" value="${version_substitute_dir}/kotlin.bare.plugin.xml.bk"/>
@@ -127,10 +126,6 @@
 
         <zipPlugin filename="${plugin.zip}" dir="Kotlin"/>
         <zipPlugin filename="${bare.plugin.zip}" dir="BareKotlin"/>
-
-        <zip destfile="${android-extensions.zip}">
-            <zipfileset prefix="META-INF" dir="${basedir}/plugins/android-idea-plugin/old_plugin" includes="plugin.xml" />
-        </zip>
     </target>
 
     <macrodef name="print-statistic">
diff --git a/plugins/android-idea-plugin/old_plugin/plugin.xml b/plugins/android-idea-plugin/old_plugin/plugin.xml
deleted file mode 100644
index ada072b80cb..00000000000
--- a/plugins/android-idea-plugin/old_plugin/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<idea-plugin version="2" url="http://kotlinlang.org">
-    <id>org.jetbrains.kotlin.android</id>
-
-    <name>Kotlin Extensions For Android (obsolete)</name>
-    <description>This plugin is obsolete. Android Extensions are now inside the main Kotlin plugin.</description>
-    <version>1.0-obsolete</version>
-    <vendor url="http://www.jetbrains.com">JetBrains s.r.o.</vendor>
-
-    <idea-version since-build="141.1009" until-build="199.9999"/>
-
-    <depends optional="false">org.jetbrains.kotlin</depends>
-    <depends optional="false">org.jetbrains.android</depends>
-</idea-plugin>