Skip to content

chore(build): bump flatpak-sources plugin to 0.1.7, drop Isolated Projects workaround - #6690

Merged
jamesarich merged 1 commit into
mainfrom
chore/flatpak-sources-0.1.7-isolated-projects
Aug 13, 2026
Merged

chore(build): bump flatpak-sources plugin to 0.1.7, drop Isolated Projects workaround#6690
jamesarich merged 1 commit into
mainfrom
chore/flatpak-sources-0.1.7-isolated-projects

Conversation

@jamesarich

@jamesarich jamesarich commented Aug 13, 2026

Copy link
Copy Markdown
Collaborator

Why

org.meshtastic.flatpak.sources.settings was pinned at 0.1.5 because it read
Gradle.extensions in a way Isolated Projects forbids — this repo runs with
Isolated Projects on by default (org.gradle.isolated-projects=true), so
every flatpak-sources generation call had to disable IP + config cache, and
the plugin itself was gated behind an opt-in property in
settings.gradle.kts. Upstream 0.1.7
(meshtastic/gradle-flatpak-sources#36)
fixes the incompatibility by sharing state via a BuildService instead.

Changes

  • 🛠️ Refactoring & Architecture
    • Bump org.meshtastic.flatpak.sources.settings 0.1.5 → 0.1.7 and apply it
      unconditionally again (removed the apply false + opt-in-property gate).
    • Drop -Dorg.gradle.isolated-projects=false --no-configuration-cache -Pmeshtastic.flatpakSources=true from the four call sites that carried
      it: verify-flatpak.yml, release.yml, reusable-check.yml,
      verify.sh.

Testing Performed

Verified end-to-end, not just compiled: ran the real
:desktopApp:packageUberJarForCurrentOS :captureFlatpakSources pipeline
with Isolated Projects left on (this repo's default) and none of the
removed workaround flags — 189 tasks, zero IP/config-cache violations,
flatpak-sources.json emitted with 2808 captured URLs.

Summary by CodeRabbit

  • Build & Verification
    • Updated Flatpak source generation and verification workflows to use the current Gradle configuration.
    • Improved consistency across release, reusable-check, and Flatpak verification processes.
  • Maintenance
    • Upgraded Flatpak source tooling to the latest supported version.
    • Simplified Flatpak source configuration and removed obsolete compatibility settings.

…jects workaround

0.1.5 read Gradle.extensions in a way Isolated Projects forbids, so every
flatpak-sources generation call had to disable IP + config cache and the
plugin itself was gated behind an opt-in property in settings.gradle.kts.
0.1.7 fixes this upstream (shares state via a BuildService instead), so:

- Apply the plugin unconditionally again, at its real version.
- Drop -Dorg.gradle.isolated-projects=false --no-configuration-cache
  -Pmeshtastic.flatpakSources=true from the four call sites that carried it
  (verify-flatpak.yml, release.yml, reusable-check.yml, verify.sh).

Verified end-to-end, not just compiled: ran the real
:desktopApp:packageUberJarForCurrentOS :captureFlatpakSources pipeline with
Isolated Projects left ON (this repo's default) and no workaround flags —
189 tasks, zero IP/config-cache violations, flatpak-sources.json emitted
with 2808 captured URLs.
@github-actions github-actions Bot added chore repo Repository maintenance labels Aug 13, 2026
@coderabbitai

coderabbitai Bot commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: eb51c84b-82fa-43f0-a1ac-bbb408a6354f

📥 Commits

Reviewing files that changed from the base of the PR and between d6cdace and 648d112.

📒 Files selected for processing (5)
  • .github/workflows/release.yml
  • .github/workflows/reusable-check.yml
  • .github/workflows/verify-flatpak.yml
  • scripts/verify-flatpak/verify.sh
  • settings.gradle.kts

📝 Walkthrough

Walkthrough

The Flatpak sources settings plugin is upgraded and applied unconditionally. CI workflows and the verification script stop passing obsolete isolated-projects, configuration-cache, and Flatpak source properties.

Changes

Flatpak source generation

Layer / File(s) Summary
Update Flatpak sources plugin
settings.gradle.kts
The Flatpak sources settings plugin changes from version 0.1.5 to 0.1.7 and is applied unconditionally.
Align generation commands
.github/workflows/release.yml, .github/workflows/reusable-check.yml, .github/workflows/verify-flatpak.yml, scripts/verify-flatpak/verify.sh
Flatpak source generation commands remove obsolete isolated-projects, configuration-cache, and property flags while retaining the existing tasks and required options.

Estimated code review effort: 2 (Simple) | ~10 minutes

Mergeability Score: ⚪ Minimal · up to 648d1

This change updates the Flatpak sources plugin and removes obsolete Gradle workarounds while preserving the verified build pipeline; no actionable merge-blocking risk remains.

Possibly related PRs

Suggested labels: build

🚥 Pre-merge checks | ✅ 6
✅ Passed checks (6 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the plugin upgrade and removal of the Isolated Projects workaround.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Sibling Call Sites And Presence Semantics ✅ Passed The PR changes only Gradle plugin setup and Flatpak commands. It changes no sensor field, zero-guard, or NodeItem/NodeItemCompact call site.
Tests Prove The Path, Not The End State ✅ Passed The commit changes only Gradle settings and Flatpak generation commands; it adds or changes no test assertions, fake stores, collection-size checks, or Unconfined ordering checks.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@jamesarich
jamesarich added this pull request to the merge queue Aug 13, 2026
Merged via the queue into main with commit 42b07b2 Aug 13, 2026
17 of 18 checks passed
@jamesarich
jamesarich deleted the chore/flatpak-sources-0.1.7-isolated-projects branch August 13, 2026 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

chore repo Repository maintenance

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant