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

Use stable output path for generated source #4269

Merged
merged 1 commit into from
Jun 13, 2023

Conversation

joshfriend
Copy link
Contributor

Always include the variant name as part of output path

Closes #4267

} else {
generatedSourcesDirectory
}
private val Source.outputDir get() = File(generatedSourcesDirectory, name)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea why we did this and I already changed this in another locally branch too.

@hfhbd
Copy link
Collaborator

hfhbd commented Jun 12, 2023

@joshfriend Please fix the merge conflicts to run the CI.

@joshfriend
Copy link
Contributor Author

This change would be nice to have backported to 1.x if possible, let me know if i can help with that somehow.

@dellisd
Copy link
Collaborator

dellisd commented Jun 12, 2023

The 1.x branch is the 1.5.3 branch, so you could open a PR targeting that branch.

@hfhbd
Copy link
Collaborator

hfhbd commented Jun 12, 2023

@dellisd Are you sure we still want to publish another 1.5.x release?

@joshfriend
Copy link
Contributor Author

(i have noticed the other test failures and am fixing them)

Always include the variant name as part of output path

Closes cashapp#4267
@hfhbd hfhbd merged commit e1deecf into cashapp:master Jun 13, 2023
5 checks passed
@joshfriend joshfriend deleted the jf/single-variant-android branch June 13, 2023 14:05
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.

Generated source should always be placed inside folder structure by build variant name (Android)
3 participants