F-Droid build failed for version 0.54.0 #40

New Issue

Closed

opened 2020-12-07 18:32:17 +00:00 by marc.nause · 5 comments

marc.nause commented

2020-12-07 18:32:17 +00:00

According to https://gitlab.com/fdroid/fdroiddata/-/commit/4cae0c1cc72eed28fdc80d2bd2cbfed31d8d7991 F-Droid was not able to build version 0.54.0. The reason is:

cannot find symbol TEXT_PAINT

I checked https://codeberg.org/Starfish/TinyWeatherForecastGermany/src/branch/master/app/src/main/java/de/kaffeemitkoffein/tinyweatherforecastgermany/ForecastBitmap.java and it uses TEXT_PAINT, but it is not decared anywhere.

In my branch (https://codeberg.org/marc.nause/TinyWeatherForecastGermany/src/branch/fixjerkylist/app/src/main/java/de/kaffeemitkoffein/tinyweatherforecastgermany/ForecastBitmap.java) it is declared in line 39.

It seems like the manual merge in pull request #39 has not worked correctly.

According to [https://gitlab.com/fdroid/fdroiddata/-/commit/4cae0c1cc72eed28fdc80d2bd2cbfed31d8d7991](https://gitlab.com/fdroid/fdroiddata/-/commit/4cae0c1cc72eed28fdc80d2bd2cbfed31d8d7991) F-Droid was not able to build version 0.54.0. The reason is: >cannot find symbol TEXT_PAINT I checked https://codeberg.org/Starfish/TinyWeatherForecastGermany/src/branch/master/app/src/main/java/de/kaffeemitkoffein/tinyweatherforecastgermany/ForecastBitmap.java and it uses TEXT_PAINT, but it is not decared anywhere. In my branch (https://codeberg.org/marc.nause/TinyWeatherForecastGermany/src/branch/fixjerkylist/app/src/main/java/de/kaffeemitkoffein/tinyweatherforecastgermany/ForecastBitmap.java) it is declared in line 39. It seems like the manual merge in pull request https://codeberg.org/Starfish/TinyWeatherForecastGermany/pulls/39 has not worked correctly.

Starfish commented

2020-12-08 17:03:20 +00:00

Owner

yes, just noticed yesterday night, too.

Strange thing. I had to manually merge your pull request, because I changed the ForecastBitmap.java the same time you did the pull request, which resulted in a conflict.

I used a patch-file, which I worked along step by step to merge both file versions and to join the code changes together.

I have a local copy that is working, but it does not match the one in this repo. I am not sure how this happened, because everything changed should have been pulled, and now I have to try to fix it somehow....

yes, just noticed yesterday night, too. Strange thing. I had to manually merge your pull request, because I changed the ForecastBitmap.java the same time you did the pull request, which resulted in a conflict. I used a patch-file, which I worked along step by step to merge both file versions and to join the code changes together. I have a local copy that is working, but it does not match the one in this repo. I am not sure how this happened, because everything changed should have been pulled, and now I have to try to fix it somehow....

Starfish commented

2020-12-08 18:27:55 +00:00

Owner

ok, found out I had some (but not all) of the changes stashed, have committed them now, so it should be solved. 👍

I will fix 2 small bugs before a new release, since a next fdroid build try requires a new tag.

ok, found out I had some (but not all) of the changes stashed, have committed them now, so it should be solved. 👍 I will fix 2 small bugs before a new release, since a next fdroid build try requires a new tag.

👍 1

Starfish commented

2020-12-09 16:39:51 +00:00

Owner

Everything is fixed. I will test & release 0.54.1 soon.

👍 1 🎉 1

Starfish commented

2020-12-09 18:32:44 +00:00

Owner

New version tagged. Let's hope the best.

👍 2

marc.nause commented