micro:bit official Android application code. The application is free to download from https://play.google.com/store/apps/details?id=com.samsung.microbit
Apache License 2.0
13
stars
10
forks
source link
Prepare for merging from300 branch back by reverting the Gradle upgrade on master #49
[x] We use GitHub’s UI to rename master to main for consistency with other projects
Commands to update a local copy:
git branch -m master main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a
I made the same change to the partial flashing library.
[x] Move pfLibrary as a git submodule or CI won't have a way to know what version to use.
I've done this in 08b8733f61a7a1356b92bb5d1b5c58d29277c76e
[ ] We tidy up docs to cover the current build process
[ ] We add a GitHub actions build replacing the CircleCI one that's currently failing (I'll do this)
Rationale for microbit-android
@martinwork said via email that "from300 is rooted in v2.8.8" and that "The master branch has had many commits since then, with which we don't want to merge" but on investigation there doesn't seem to be much change on master since the branches diverged.
There is no tag or GH release for v2.8.8 that I can see so working from git merge-base master from300 which is 5455c06df78929afc0adced0ccb172c782df67f6 (Sam’s commit adding CircleCI support)
Suggested plan for moving back to using master/main @microbit-grace / @martinwork:
Commands to update a local copy:
I made the same change to the partial flashing library.
Rationale for microbit-android
@martinwork said via email that "from300 is rooted in v2.8.8" and that "The master branch has had many commits since then, with which we don't want to merge" but on investigation there doesn't seem to be much change on master since the branches diverged.
There is no tag or GH release for v2.8.8 that I can see so working from
git merge-base master from300
which is 5455c06df78929afc0adced0ccb172c782df67f6 (Sam’s commit adding CircleCI support)There are only 6 commits on master after 5455c06df78929afc0adced0ccb172c782df67f6
The 6 commits are all doc or issue template changes except one that updates Gradle
So if we merge this PR then we get a clean merge of from300 back to master with no concerning commits on master that can see.