Skip to content

Merge main into workstation/swift-migration - #882

Merged
thomson-t merged 3 commits into
workstation/swift-migrationfrom
thomson-t/merge-main-workstation
Aug 31, 2026
Merged

Merge main into workstation/swift-migration#882
thomson-t merged 3 commits into
workstation/swift-migrationfrom
thomson-t/merge-main-workstation

Conversation

@thomson-t

Copy link
Copy Markdown
Contributor

Summary

  • Merges main into workstation/swift-migration to bring the workstation branch up to date with the latest mainline changes.
  • Includes 2 commits from main:
    • feat: accept native GoDaddy R1 certificate chains (#879)
    • chore: Release v9.4.1 (#881)

Test plan

Made with Cursor

thomson-t and others added 3 commits August 28, 2026 16:44
feat(network): accept native GoDaddy R1 certificate chains

Add GoDaddy TLS Root CA - R1 to the default certificate set while retaining all existing trust anchors.

Verify the embedded certificate against GoDaddy's published SHA-256 fingerprint to prevent accidental pin changes.

#agentic
chore: (release) 9.4.1

Updates version to 9.4.1 across the mParticle ecosystem.
@thomson-t
thomson-t requested a review from a team as a code owner August 28, 2026 22:50
@github-actions

Copy link
Copy Markdown

🐦 Swift Migration Progress

Production implementation code at 9e7d9ecb8c88 compared with a16b1e84e8df.

Area Goal Progress Base This PR Swift SLOC Objective-C remaining Change
Core SDK Short term — in scope ███▌░░░░░░ 35.43% 35.42% 5,070 9,243 ↩️ -0.01 pp
Core SDK Long term — all Objective-C ██▌░░░░░░░ 25.14% 25.13% 5,070 15,103 ↩️ -0.01 pp
SDK kit infrastructure Short term — in scope ░░░░░░░░░░ 0.00% 0.00% 0 3,340 ➖ 0.00 pp
SDK kit infrastructure Long term — all Objective-C ░░░░░░░░░░ 0.00% 0.00% 0 3,725 ➖ 0.00 pp
Standalone kits Short term — in scope ▏░░░░░░░░░ 1.06% 1.06% 152 14,231 ➖ 0.00 pp
Standalone kits Long term — all Objective-C ▏░░░░░░░░░ 1.06% 1.06% 152 14,231 ➖ 0.00 pp

Objective-C retained by design: Core SDK 5,860 · SDK kit infrastructure 385 · Standalone kits 0.

This PR's code movement

Area Swift lines added Objective-C lines removed
Core SDK 0 4
SDK kit infrastructure 0 0
Standalone kits 1 3
How this is measured
  • Current composition uses production source lines of code (SLOC) from cloc; comments and blank lines are excluded.
  • Short term — in scope excludes the Objective-C the migration will not delete, so 100% is the end of this project: every in-scope implementation gone.
  • Long term — all Objective-C keeps the full denominator. Reaching 100% there means the public API itself becomes Swift, which is a breaking change reserved for a future major release.
  • The gap between the two rows is the retained public/kit contract, runtime-identity, and boundary-glue surface listed in Tools/swift-migration-retained-objc.txt.
  • Retained wrappers keep their Objective-C interface but still shed logic to Swift. That thinning moves the long-term row and the retained figure, not the short-term row.
  • Both revisions are measured with the manifest from the head revision, so a manifest edit does not by itself move the reported change. A retained file this pull request renamed or deleted still counts as retained at the base.
  • Pull request movement uses physical additions/deletions from git diff base...head --numstat; it counts retained files too and is intentionally separate from SLOC totals.
  • Core excludes SDK kit infrastructure and vendored libraries. Standalone kits include only files below Kits/**/Sources.
  • Tests, examples, headers, build outputs, vendored libraries, and the MParticle/Sources Swift overlay are excluded.
  • Objective-C++ (.mm) is included in the Objective-C figures and removed counts.

Generated with cloc 2.10. This report is informational and does not gate migration direction.

@github-actions

Copy link
Copy Markdown

📦 SDK Size Impact Report

Measures how much the SDK adds to an app's size (with-SDK minus without-SDK).

Metric Target Branch This PR Change
App Bundle Impact 2.12 MB 2.12 MB +N/A
Executable Impact 848 bytes 848 bytes +N/A
XCFramework Size 6.72 MB 6.72 MB +N/A

➡️ SDK size impact change is minimal.

Raw measurements

Target branch (workstation/swift-migration):

{"baseline_app_size_kb":84,"baseline_executable_size_bytes":75464,"with_sdk_app_size_kb":2256,"with_sdk_executable_size_bytes":76312,"sdk_impact_kb":2172,"sdk_executable_impact_bytes":848,"xcframework_size_kb":6880}

This PR:

{"baseline_app_size_kb":84,"baseline_executable_size_bytes":75464,"with_sdk_app_size_kb":2256,"with_sdk_executable_size_bytes":76312,"sdk_impact_kb":2172,"sdk_executable_impact_bytes":848,"xcframework_size_kb":6880}

@thomson-t
thomson-t merged commit 150f0b0 into workstation/swift-migration Aug 31, 2026
155 of 158 checks passed
@thomson-t
thomson-t deleted the thomson-t/merge-main-workstation branch August 31, 2026 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants