chore: back-merge prod into development - #205
Closed
DeepakSingh80 wants to merge 10 commits into
Closed
DeepakSingh80 wants to merge 10 commits into
DeepakSingh80 wants to merge 10 commits into
Conversation
Release/v7.4.4
* 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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Phase 1 T4 of the native SDK CI/CD runbook (
docs/hlds/native-sdk-cicd/phase-1-runbook.md).Why
developmentis behindprod. T8.3 renamesdevelopment→devand 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
developmentis an ancestor ofprod— 0 commits ahead — so this is a clean fast-forward. No conflicts.Ten commits, spanning releases 7.4.4 → 7.7.0:
Net effect on the pins and version:
developmentpackage.jsonversion7.4.37.7.0com.smallcase.gateway:sdk6.1.16.1.2com.smallcase.loans:sdksdk-sourav-native-dark-theme-cb54bf9:5.1.4-92-releasesdk:5.3.2SCLoansSCLoans-sourav-native-dark-theme-37c97d97.1.2-45-releaseSCLoans7.4.0This supersedes #204 (T3)
#204 reverted the internal dark-theme remix pins by hand, using
prodas the reference.prodalready 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.jsonand the podspec") does not apply: the conflict it anticipated only exists if T3 merges first.Test plan
com.smallcase.loans:sdk:5.3.2andcom.smallcase.gateway:sdk:6.1.2resolve from the publicSCGatewayArtifactory repo, notSCGateway-internal.pod installinsmart_investing_react_nativeresolvesSCLoans 7.4.0/SCGateway 7.2.0.yarn install --frozen-lockfilesucceeds against the mergedyarn.lock.🤖 Generated with Claude Code