Move Android Extensions subplugin to the main kotlin-gradle-plugin artifact

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

@@ -21,49 +21,7 @@
 
     <description>Android compiler plugin for Kotlin</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-gradle-plugin</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-gradle-plugin-api</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>gradle-api</artifactId>
-            <version>2.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.android.tools.build</groupId>
-            <artifactId>gradle</artifactId>
-            <version>1.1.0</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
     <build>
-        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <artifactId>kotlin-maven-plugin</artifactId>

libraries/tools/kotlin-android-extensions/src/main/kotlin/org/jetbrains/kotlin/android/AndroidSubplugin.kt

@@ -1,83 +0,0 @@
-/*
- * Copyright 2010-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.android
-
-import com.android.build.gradle.BaseExtension
-import com.android.build.gradle.api.AndroidSourceSet
-import org.gradle.api.Project
-import org.gradle.api.tasks.compile.AbstractCompile
-import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
-import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
-import org.jetbrains.kotlin.gradle.plugin.android.AndroidGradleWrapper
-import org.w3c.dom.Document
-import java.io.File
-import javax.xml.parsers.DocumentBuilderFactory
-
-public class AndroidSubplugin : KotlinGradleSubplugin {
-
-    override fun getExtraArguments(project: Project, task: AbstractCompile): List<SubpluginOption>? {
-        val androidExtension = project.extensions.getByName("android") as? BaseExtension ?: return null
-
-        val sourceSets = androidExtension.sourceSets
-
-        val pluginOptions = arrayListOf<SubpluginOption>()
-
-        val mainSourceSet = sourceSets.getByName("main")
-        val manifestFile = mainSourceSet.manifest.srcFile
-        val applicationPackage = getApplicationPackageFromManifest(manifestFile) ?: run {
-            project.logger.warn(
-                    "Application package name is not present in the manifest file (${manifestFile.absolutePath})")
-            ""
-        }
-        pluginOptions += SubpluginOption("package", applicationPackage)
-
-        fun addVariant(sourceSet: AndroidSourceSet) {
-            pluginOptions += SubpluginOption("variant", sourceSet.name + ';' +
-                    sourceSet.res.srcDirs.joinToString(";") { it.absolutePath })
-        }
-
-        addVariant(mainSourceSet)
-
-        val flavorSourceSets = AndroidGradleWrapper.getProductFlavorsSourceSets(androidExtension).filterNotNull()
-        for (sourceSet in flavorSourceSets) {
-            addVariant(sourceSet)
-        }
-
-        return pluginOptions
-    }
-
-    private fun getApplicationPackageFromManifest(manifestFile: File): String? {
-        try {
-            return manifestFile.parseXml().documentElement.getAttribute("package")
-        }
-        catch (e: Exception) {
-            return null
-        }
-    }
-
-    override fun getPluginName() = "org.jetbrains.kotlin.android"
-
-    override fun getGroupName() = "org.jetbrains.kotlin"
-
-    override fun getArtifactName() = "kotlin-android-extensions"
-
-    fun File.parseXml(): Document {
-        val factory = DocumentBuilderFactory.newInstance()
-        val builder = factory.newDocumentBuilder()
-        return builder.parse(this)
-    }
-}

libraries/tools/kotlin-android-extensions/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin

@@ -1 +0,0 @@
-org.jetbrains.kotlin.android.AndroidSubplugin