Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add aar support when importing sbt-android #42

Merged
merged 1 commit into from
Aug 4, 2016

Conversation

pfn
Copy link
Contributor

@pfn pfn commented Jul 18, 2016

Implemented by:

  • change extractProject to return Seq[ProjectData]
  • adding a new Aar data type which contains a synthetic ProjectData which contains synthetic AndroidData for the aar module
  • inspecting the aars task in sbt-android and mapping aar values to the Aar data type
  • when running extractProject inspect android for any aar values and expand them to a list

@pfn pfn force-pushed the aar-support branch 2 times, most recently from a303df5 to 231aaa0 Compare July 18, 2016 18:05
@pfn
Copy link
Contributor Author

pfn commented Jul 18, 2016

@jastice for review, and maybe @pavelfatin and @Alefas

pfn added a commit to scala-android/sbt-android that referenced this pull request Jul 19, 2016
@jastice
Copy link
Member

jastice commented Aug 2, 2016

I manually merged and adapated this PR due to conflicting changes: https://github.com/JetBrains/sbt-structure/tree/pfn-aar-support

Can you check if everything works as expected for you? (The Android tests are not adapted yet)

@pfn
Copy link
Contributor Author

pfn commented Aug 2, 2016

changes on pfn-aar-support look good, tests ok on my end.

Before merging this in, my main question to you: is this a good approach for handling these aar modules? does the android plugin in intellij have anything special to handle aar differently that can be leveraged?

@jastice
Copy link
Member

jastice commented Aug 3, 2016

Good question. I am not familiar with anything Android-related but I'll ask around. We can probably take this change as is and adapt the support later.

@jastice jastice merged commit a997ec0 into JetBrains:master Aug 4, 2016
@jastice
Copy link
Member

jastice commented Dec 15, 2016

From @alexruiz:

The specific part of AARs is in the class com.android.tools.idea.gradle.project.sync.setup.module.dependency.Dependency
It is a little too long to paste here, but the code deals with AndroidModuleModel and BaseArtifact, which are the holders of dependencies in the Android model

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants