Prepare for merging from300 branch back by reverting the Gradle upgrade on master #49
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
- I've done this in 08b8733
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 5455c06 (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
- The doc changes are OK/neutral. Grace and I will revisit the docs after merge to document the current build process.
- The Gradle change updates are from v5.1.1 to 6.5 (also updating the wrapper script)
- The Gradle version on the from300 branch has independently been upgraded to 8.2
- If you attempt to merge from300 to master Gradle is the only conflict. If you revert the Gradle upgrade on master first then it’s a clean merge.
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.