Skip to content

chore: back-merge prod into development - #205

Closed
DeepakSingh80 wants to merge 10 commits into
developmentfrom
prod
Closed

DeepakSingh80 wants to merge 10 commits into
developmentfrom
prod

Conversation

@DeepakSingh80

Copy link
Copy Markdown

Phase 1 T4 of the native SDK CI/CD runbook (docs/hlds/native-sdk-cicd/phase-1-runbook.md).

Why

development is behind prod. T8.3 renames development → dev and makes it the integration branch; if this lands after the rename, the divergence is frozen into the new branch contract. So it goes in first.

What merges in

development is an ancestor of prod — 0 commits ahead — so this is a clean fast-forward. No conflicts.

Ten commits, spanning releases 7.4.4 → 7.7.0:

26b8085 Release v7.7.0 (#199)
f1c0794 chore(release): 7.6.2 (#200)
dc1952f Merge pull request #198 from smallcase/release/v7.6.1
2477b33 chore(release): 7.6.1
81774d5 chore(android): bump Loans SDK to 5.3.1
eb2c5d5 Merge remote-tracking branch 'origin/prod' into development
4883b70 Release/v7.6.0 (#197)
2b429ca Merge pull request #194 from smallcase/release/v7.4.4
1fcbec2 chore(release): 7.4.4
f46bcfd chore(prod): bump up gw sdk Android native to 6.1.2

Net effect on the pins and version:

development after merge
package.json version 7.4.3 7.7.0
com.smallcase.gateway:sdk 6.1.1 6.1.2
com.smallcase.loans:sdk sdk-sourav-native-dark-theme-cb54bf9:5.1.4-92-release sdk:5.3.2
SCLoans SCLoans-sourav-native-dark-theme-37c97d9 7.1.2-45-release SCLoans 7.4.0

This supersedes #204 (T3)

#204 reverted the internal dark-theme remix pins by hand, using prod as the reference. prod already carries that exact revert — byte-identical in both files — so this merge does T3's job as a side effect. #204 should be closed unmerged once this lands; merging both is redundant, not harmful.

The runbook's T3/T4 sequencing warning ("expect conflicts in package.json and the podspec") does not apply: the conflict it anticipated only exists if T3 merges first.

Test plan

  • Android: com.smallcase.loans:sdk:5.3.2 and com.smallcase.gateway:sdk:6.1.2 resolve from the public SCGateway Artifactory repo, not SCGateway-internal.
  • iOS: pod install in smart_investing_react_native resolves SCLoans 7.4.0 / SCGateway 7.2.0.
  • yarn install --frozen-lockfile succeeds against the merged yarn.lock.
  • Dark-theme behaviour is re-verified against the released SDK, or confirmed as unshipped — the remix was an internal test build.

🤖 Generated with Claude Code

dporwal-shipit and others added 10 commits June 11, 2026 12:17
* bump Loans SDK to dark-theme internal release (Android 5.1.4-91, iOS … (#195)

* bump Loans SDK to dark-theme internal release (Android 5.1.4-91, iOS 7.1.2-44)

* chore(loans): bump loans SDK pin to sdk-sourav-native-dark-theme-cb54bf9 (5.1.4-92-release)

* fix(proguard): drop stale loans repackage workaround, keep R8 full mode on

* chore: update Loans native SDK dependencies

* chore(release): 7.5.0

* chore: use default R8 mode in sample app

* chore(android): bump Loans SDK to 5.3.0

* fix(android): keep SCGateway classes for R8

* docs(changelog): document v7.5.0 changes

* chore(release): 7.6.0
# Conflicts:
#	android/build.gradle
#	react-native-smallcase-gateway.podspec
#	smart_investing_react_native/android/app/proguard-rules.pro
#	smart_investing_react_native/android/gradle.properties
#	smart_investing_react_native/ios/Podfile.lock
#	smart_investing_react_native/yarn.lock
chore(android): bump Loans SDK to 5.3.1
* chore(android): bump Loans SDK to 5.3.2

* chore(release): 7.6.2
* feat: add Loans KYC permission usage descriptions

* chore: bump SCLoans iOS SDK to 7.4.0

* chore(release): 7.7.0
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