Merge pull request #60 from JetBrains/drop-android-support

Drop android support

extractor/src/main/scala/org/jetbrains/sbt/CreateTasks.scala

@@ -28,7 +28,6 @@ object CreateTasks extends (State => State) with SbtStateOps {
     StructureKeys.testConfigurations := UtilityTasks.testConfigurations.value,
     StructureKeys.sourceConfigurations := UtilityTasks.sourceConfigurations.value,
 
-    StructureKeys.extractAndroid := extractors.extractAndroidSdkPlugin.value,
     StructureKeys.extractPlay2 := Play2Extractor.taskDef.value,
     StructureKeys.extractBuild := BuildExtractor.taskDef.value,
     StructureKeys.extractDependencies := DependenciesExtractor.taskDef.value,

extractor/src/main/scala/org/jetbrains/sbt/StructureKeys.scala

@@ -15,11 +15,10 @@ object StructureKeys {
   val acceptedProjects: TaskKey[Seq[ProjectRef]] = TaskKey("ssAcceptedProjects", rank = Invisible)
 
   val extractPlay2: TaskKey[Option[Play2Data]] = TaskKey("ssExtractPlay2", rank = Invisible)
-  val extractAndroid: TaskKey[Option[AndroidData]] = TaskKey("ssExtractAndroid", rank = Invisible)
   val extractBuild: TaskKey[BuildData] = TaskKey("ssExtractBuild", rank = Invisible)
   val extractBuilds: TaskKey[Seq[BuildData]] = TaskKey("ssExtractBuilds", rank = Invisible)
   val extractDependencies: TaskKey[DependencyData] = TaskKey("ssExtractDependencies", rank = Invisible)
-  val extractProject: TaskKey[Seq[ProjectData]] = TaskKey("ssExtractProject", rank = Invisible)
+  val extractProject: TaskKey[ProjectData] = TaskKey("ssExtractProject", rank = Invisible)
   val extractProjects: TaskKey[Seq[ProjectData]] = TaskKey("ssExtractProjects", rank = Invisible)
   val extractRepository: TaskKey[Option[RepositoryData]] = TaskKey("ssExtractRepository", rank = Invisible)
   val extractStructure: TaskKey[StructureData] = TaskKey("extractStructure", rank = Invisible)

extractor/src/main/scala/org/jetbrains/sbt/extractors/ProjectExtractor.scala

@@ -40,14 +40,13 @@ class ProjectExtractor(
   sourceConfigurations: Seq[sbt.Configuration],
   testConfigurations: Seq[sbt.Configuration],
   dependencies: DependencyData,
-  android: Option[AndroidData],
   play2: Option[Play2Data],
   settingData: Seq[SettingData],
   taskData: Seq[TaskData],
   commandData: Seq[CommandData]
 ) {
 
-  private[extractors] def extract: Seq[ProjectData] = {
+  private[extractors] def extract: ProjectData = {
 
     val resolvers = allResolvers.collect {
       case repo: MavenRepository => ResolverData(repo.name, repo.root)
@@ -58,7 +57,7 @@ class ProjectExtractor(
         sourceConfigurations.flatMap(extractConfiguration(Compile.name)) ++
           testConfigurations.flatMap(extractConfiguration(Test.name))
       )
-    val projectData = ProjectData(
+    ProjectData(
       projectRef.id,
       projectRef.build,
       name,
@@ -72,36 +71,13 @@ class ProjectExtractor(
       extractJava,
       extractScala,
       compileOrder.toString,
-      android,
       dependencies,
       resolvers,
       play2,
       settingData,
       taskData,
       commandData
     )
-
-    android match {
-      case None => Seq(projectData)
-      case Some(a) =>
-        val deps = a.aars.map(
-          aar =>
-            ProjectDependencyData(aar.name, None, Configuration.Compile :: Nil)
-        )
-        // add aar module dependencies
-        val updatedProject = projectData.copy(
-          dependencies = dependencies
-            .copy(projects = projectData.dependencies.projects ++ deps)
-        )
-        updatedProject +: a.aars.map(
-          _.project.copy(
-            java = projectData.java,
-            scala = projectData.scala,
-            resolvers = projectData.resolvers,
-            dependencies = projectData.dependencies
-          )
-        )
-    }
   }
 
   private def extractConfiguration(
@@ -274,7 +250,7 @@ object ProjectExtractor extends SbtStateOps with TaskOps {
                                                 state: State) =
     key.in(projectRef, Compile).get(state)
 
-  def taskDef: Initialize[Task[Seq[ProjectData]]] = Def.taskDyn {
+  def taskDef: Initialize[Task[ProjectData]] = Def.taskDyn {
 
     implicit val state: State = Keys.state.value
     implicit val projectRef: ProjectRef = sbt.Keys.thisProjectRef.value
@@ -365,7 +341,6 @@ object ProjectExtractor extends SbtStateOps with TaskOps {
         StructureKeys.sourceConfigurations.value,
         StructureKeys.testConfigurations.value,
         StructureKeys.extractDependencies.value,
-        StructureKeys.extractAndroid.value,
         StructureKeys.extractPlay2.value,
         StructureKeys.settingData.value,
         StructureKeys.taskData.value,

extractor/src/main/scala/org/jetbrains/sbt/extractors/UtilityTasks.scala

@@ -120,7 +120,7 @@ object UtilityTasks extends SbtStateOps {
     Def.task {
       StructureKeys.extractProject
         .forAllProjects(state, accepted)
-        .map(_.values.toSeq.flatten)
+        .map(_.values.toSeq)
         .value
     }
   }

extractor/src/main/scala/org/jetbrains/sbt/extractors/package.scala

@@ -1,7 +1,6 @@
 package org.jetbrains.sbt
 
-import org.jetbrains.sbt.extractors.AndroidSdkPluginExtractor.{androidTask, _}
-import org.jetbrains.sbt.structure.{AndroidData, StructureData}
+import org.jetbrains.sbt.structure.StructureData
 import sbt.{Def, Keys, Task}
 
 
@@ -19,14 +18,4 @@ package object extractors {
       StructureKeys.localCachePath.value
     )
   }
-
-  val extractAndroidSdkPlugin: Def.Initialize[Task[Option[AndroidData]]] = Def.taskDyn {
-    val state = sbt.Keys.state.value
-    val projectRef = sbt.Keys.thisProjectRef.value
-    val androidTaskOpt = androidTask(state, projectRef)
-
-    Def.task {
-      androidTaskOpt.getOrElse(Option.empty[AndroidData].toTask).value
-    }
-  }
 }