Fix duplicate class generation in test folders #2106
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tasomaniac
commented
Mar 27, 2020
| @@ -55,7 +55,7 @@ subprojects { | |||
| } | |||
|
|
|||
| plugins.withType(com.android.build.gradle.BasePlugin::class.java) { | |||
| extension.compileOptions { | |||
There was a problem hiding this comment.
I just noticed that this is deprecated in AGP 3.6.1 and removed in 4.0
tasomaniac
commented
Mar 27, 2020
|
|
||
| private fun SourceDirectorySet.findSources(schemaFile: RegularFileProperty) { | ||
| when { | ||
| apolloVariant.isTest -> srcDirFromVariant(apolloVariant) |
There was a problem hiding this comment.
Starting from suggestions in the IDE, I ended up refactoring this to make it easier to follow. This is the only behavior change.
I recommend reviewing this in "split" view.
tasomaniac
changed the title
martinbonnin
approved these changes
Mar 27, 2020
tasomaniac
added a commit
that referenced
this pull request
Mar 30, 2020
* Replace deprecated AGP function * Modify and auto-add sourceSets only for non-test variants * Add tests to verify the fix * Revert change in Plugin and adjust finding soources based on test sources * Do not take sourceFolder into account (cherry picked from commit 10c04ee)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Modify and auto-add sourceSets only for non-test variants