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 F-Droid build #3415

Merged
merged 1 commit into from
Apr 15, 2020
Merged

Fix F-Droid build #3415

merged 1 commit into from
Apr 15, 2020

Conversation

TobiGr
Copy link
Member

@TobiGr TobiGr commented Apr 10, 2020

Fixes the behaviour described in #3265 (comment)

What is it?

  • Bug fix (build facing)
  • Feature (user facing)
  • Code base improvement (dev facing)
  • Meta improvement to the project (dev facing)

Description of the changes in your PR

@Bubu told us:

when doing a release build the apk is now called:
NewPipe_head-release-unsigned.apk. Also a file in the META-INF dir now ends up being called NewPipe_head_release.kotlin_module instead of app_release.kotlin_module.

For some reason the archivesBaseName Gradle property from debug builds was used in release builds. Forcing it to be app and changing the order of build flavors fixed the problem for me

Fixes the following issue(s)

Testing apk

@Bubu With the changes I could not reproduce the behaviour you mentioned. Can you verify this by running a build on your machine, please?
app-release-unsigned.apk.zip

Agreement

@TobiGr TobiGr added this to the 0.19.3 milestone Apr 10, 2020
@Bubu
Copy link

Bubu commented Apr 11, 2020

Looks, good. Seems that solves the problem I encountered.

@B0pol
Copy link
Member

B0pol commented Apr 11, 2020

I found another bug with apk name: if the branch has _, the _ will be dropped for the apk name. See the debug apk for #3406.

@Stypox
Copy link
Member

Stypox commented Apr 11, 2020

@B0pol that's intended, as to be sure not to create issues with names

Fixes the behaviour described in #3265 (comment)
@TobiGr
Copy link
Member Author

TobiGr commented Apr 11, 2020

@Bubu Thank you for testing.

I added a comment to ensure that the release build config is kept at the end of the list. Should be good to go now, I think.

Copy link
Member

@Stypox Stypox left a comment

Choose a reason for hiding this comment

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

Yeah, this can be merged

@Stypox Stypox merged commit d7d45fb into dev Apr 15, 2020
@TobiGr TobiGr deleted the fix/f-droid_build branch April 19, 2020 09:26
This was referenced Apr 24, 2020
@opusforlife2
Copy link
Collaborator

I'm guessing it was this PR since I can see no other reason why: all debug apks generated have the name app-debug. Is there a way to fix it to have branch names again and still have F-Droid builds not break?

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.

5 participants