Skip to content

Remove Blockly fork#3940

Open
mjgallag wants to merge 3 commits into
mit-cml:masterfrom
mjgallag:remove-blockly-fork
Open

Remove Blockly fork#3940
mjgallag wants to merge 3 commits into
mit-cml:masterfrom
mjgallag:remove-blockly-fork

Conversation

@mjgallag
Copy link
Copy Markdown
Contributor

What does this PR accomplish?

Removes Blockly fork.

Context for the changes

If this PR changes anything related to the companion make sure you have used the ucr branch. For all other changes use master or provide context for having used a different branch.
See a summary of git branches in the docs: App Inventor Developer Overview

If your code changes how something works on the device (i.e., it affects the companion):

  • I have made no changes that affect the companion

  • I branched from ucr

  • My pull request has ucr as the base

Further, if you've changed the blocks language or another user-facing designer/blocks API (added a SimpleProperty, etc.):

  • I have updated the corresponding version number in appinventor/components/src/.../common/YaVersion.java
  • I have updated the corresponding upgrader in appinventor/appengine/src/.../client/youngandroid/YoungAndroidFormUpgrader.java (components only)
  • I have updated the corresponding entries in appinventor/blocklyeditor/src/versioning.js

For all other changes:

  • I have made no changes that affect the master branch

  • I branched from master

  • My pull request has master as the base

General items:

  • I have updated the relevant documentation files under docs/
  • My code follows the:
  • ant tests passes on my machine

@mjgallag mjgallag requested a review from ewpatton May 14, 2026 01:25
@mjgallag
Copy link
Copy Markdown
Contributor Author

@ewpatton while I noticed your work on RaspberryPiFoundation/blockly#9128 I realized we can already pretty easily get off the fork now without that. This is actually a pretty tiny PR as it turns out I did the bulk of the work to get off our fork with the Blockly 11 upgrade. Once this gets merged to master I will rebase #3768 and close mit-cml/blockly#13. I'll probably wait for #3924 to merge to master too so I only have to rebase once. Both of these should be low risk for master. Unless more bugs are found I have no more planned changes for Blockly 12.

@mjgallag
Copy link
Copy Markdown
Contributor Author

@jisqyv I think this may be a good candidate to include on ai2-test, pretty small and low risk.

@jisqyv
Copy link
Copy Markdown
Member

jisqyv commented May 20, 2026 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants