From 0b3b24e8a05c5d6f4099c908e65e495f671dbec8 Mon Sep 17 00:00:00 2001 From: Daniel Roberts Date: Thu, 19 Mar 2026 15:45:45 -0500 Subject: [PATCH 1/2] Point commcare-core submodule at master branch The formplayer branch has been deleted. Both commcare-android and formplayer now use master, with cross-repo CI ensuring compatibility. Co-Authored-By: Claude Opus 4.6 (1M context) --- .gitmodules | 2 +- libs/commcare | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 405813a0d..fbb94b277 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "libs/commcare"] path = libs/commcare url = https://github.com/dimagi/commcare-core.git - branch = formplayer \ No newline at end of file + branch = master \ No newline at end of file diff --git a/libs/commcare b/libs/commcare index 20946a6a8..3b9c3eaac 160000 --- a/libs/commcare +++ b/libs/commcare @@ -1 +1 @@ -Subproject commit 20946a6a81041467d4c4e31f26b780b483921177 +Subproject commit 3b9c3eaace9e7dc9166ff32bffb2f30d1505d392 From dc45eee9a93cfbad3baf2cd140b3a1a4dbea9d28 Mon Sep 17 00:00:00 2001 From: Daniel Roberts Date: Thu, 19 Mar 2026 15:47:17 -0500 Subject: [PATCH 2/2] Update README to reflect single-branch commcare-core workflow Co-Authored-By: Claude Opus 4.6 (1M context) --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b84e8c273..30594c381 100644 --- a/README.md +++ b/README.md @@ -159,14 +159,11 @@ For PRs that just modify code in the Formplayer repo, submit a PR to Formplayer #### Contributing changes to commcare -Formplayer also has a dependency on the commcare-core repository. The commcare-core `master` branch is not -stable and Formplayer uses a different branch. The submodule repo `libs/commcare` should always be pointing to -the `formplayer` branch. +Formplayer depends on the commcare-core repository via the `libs/commcare` submodule, which tracks the `master` branch. Cross-repo CI automatically tests formplayer against commcare-core PRs, so no manual cross-testing is needed. -#### Updating the CommCare version +#### Updating the CommCare Version -When updating Formplayer to have a new release of a CommCare version (e.g. 2.34 to 2.35), a PR should be opened from the `commcare_X.Y` branch into -the `formplayer` branch. Once QA has been finished, merge the PR and update the Formplayer submodule. +When updating Formplayer to a new CommCare version (e.g. 2.34 to 2.35), open a PR from the `commcare_X.Y` branch into `master` on commcare-core. Once QA has finished, merge the PR and update the Formplayer submodule. ### IntelliJ Code Style Settings