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

Fix gradle free builds #2002

Closed

Conversation

drabux
Copy link
Contributor

@drabux drabux commented Jun 8, 2016

Replaces #1996, follows #1982 to resolve #1959.
Here is a new solution that fix the flavor and build variants build under gradle and seems to integrate better with android studio.
To make a free build -DfreeBuildHackDoFreeBuild=true must be passed to gradle, ex:./gradlew clean assembleFreeRelease -DfreeBuildHackDoFreeBuild=true

@mvdan and @mfietz : are you ok with this solution?

This solution is better that #1996 cause the build variants are correctly linked on Android Studio.

For the record:


// free build hack: common functions
def doFreeBuild() {
return System.properties["freeBuildHackDoFreeBuild"] == "true"
Copy link
Contributor

@mfietz mfietz Jun 8, 2016

Choose a reason for hiding this comment

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

I like it, but freeBuildHackDoFreeBuild is just horrible.
Couldn't we shorten that to just freeBuild, i.e. -DfreeBuild=true would be passed?

Looks like F-Droid recipes only support setting gradle/project properties (-P) [1].
Maybe return hasProperty("freeBuild")? (we can omit =true)

[1] https://f-droid.org/manual/fdroid.html#Build

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like F-Droid recipes only support setting gradle/project properties (-P) [1].
Maybe return hasProperty("freeBuild")? (we can omit =true)

Yes, that's better, patch done.

@mfietz
Copy link
Contributor

mfietz commented Jun 9, 2016

Github currently has issues. Will retry and merge this asap.

Edit: https://status.github.com/ Interesting, everything spiked and then the app server was gone

@mfietz
Copy link
Contributor

mfietz commented Jun 9, 2016

Woah, this is so weird. Merging always fails, this PR is not in the commits.
When I do a git pull locally, I do see the commit o_O

Edit: I contacted the Github support. The repo is "broken" due to a service failure. I hope to hear back soon.

@mfietz mfietz closed this Jun 9, 2016
@mfietz
Copy link
Contributor

mfietz commented Jun 9, 2016

GitHub support cleared the cache, repo is back to normal.
I could close this PR, because it has already been merged.

mfietz added a commit to mfietz/AntennaPod that referenced this pull request Jun 10, 2016
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.

Provide free version for f-droid builts
2 participants