Skip to content

fix(setVersion.sh): support pre-release version formats (e.g. 14.0.0-rc.0) - #4137

Merged
wmathurin merged 1 commit into
forcedotcom:devfrom
wmathurin:ios-setversion-rc-support
Aug 19, 2026
Merged

fix(setVersion.sh): support pre-release version formats (e.g. 14.0.0-rc.0)#4137
wmathurin merged 1 commit into
forcedotcom:devfrom
wmathurin:ios-setversion-rc-support

Conversation

@wmathurin

Copy link
Copy Markdown
Contributor

Summary

Strip the pre-release suffix before computing the C preprocessor macro name and value in update_salesforce_sdk_constants. For 14.0.0-rc.0, the old code produced __SALESFORCE_SDK_14_0_0-rc_0 (invalid C identifier — hyphen is not allowed in macro names) and 14000-rc00 (not a valid integer). The fix derives both from base_version=${version%%-*} so the macro is always a valid C identifier.

GUS: W-23916129

Test plan

  • ./setVersion.sh -v 14.0.0-rc.0 completes without error; generated header contains valid #define __SALESFORCE_SDK_14_0_0 140000
  • ./setVersion.sh -v 14.0.0 continues to work as before (no regression)

@github-actions

Copy link
Copy Markdown
TestsPassed ☑️SkippedFailed ❌️
SalesforceSDKCore iOS ^18 Test Results979 ran978 ✅1 ❌
TestResult
SalesforceSDKCore iOS ^18 Test Results
SalesforceRestAPITests.testUpdateSeenNotifications❌ failure

@github-actions

Copy link
Copy Markdown
TestsPassedSkippedFailed ❌️
AuthFlowTester UI Test Results all1 ran1 ❌
TestResult
AuthFlowTester UI Test Results all
AuthFlowTesterUITests.xctest
LegacyLoginTests.testCAOpaque_DefaultScopes_WebServerFlow()❌ failure

@codecov

codecov Bot commented Aug 19, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 58.04%. Comparing base (1c71899) to head (aabbbc5).
⚠️ Report is 4 commits behind head on dev.

Additional details and impacted files
@@            Coverage Diff             @@
##              dev    #4137      +/-   ##
==========================================
- Coverage   64.77%   58.04%   -6.74%     
==========================================
  Files         195      195              
  Lines       16671    16671              
==========================================
- Hits        10799     9677    -1122     
- Misses       5872     6994    +1122     
Components Coverage Δ
Analytics 40.98% <ø> (-2.36%) ⬇️
Common 57.48% <ø> (-0.19%) ⬇️
Core 58.58% <ø> (-7.36%) ⬇️
SmartStore ∅ <ø> (∅)
MobileSync ∅ <ø> (∅)
see 41 files with indirect coverage changes
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@sfdctaka sfdctaka left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@wmathurin
wmathurin merged commit 1055b39 into forcedotcom:dev Aug 19, 2026
21 of 24 checks passed
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.

2 participants