Skip to content

feat: RN 77 upgrade #55861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from 57 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
2b8db83
feat: android working and ios release working
WoLewicki Jan 20, 2025
225d1dd
chore: bump to stable rn77
WoLewicki Jan 21, 2025
93e9b3d
chore: merge current main
WoLewicki Jan 27, 2025
8c6871c
feat: bump expo and update patches
WoLewicki Jan 28, 2025
7eaa3b6
chore: merge current main
WoLewicki Jan 28, 2025
37654b1
fix: bump metaspace
WoLewicki Jan 28, 2025
f45ba4d
feat: bump expo to fix ios dev
WoLewicki Jan 29, 2025
3fa0603
chore: merge current main
WoLewicki Jan 29, 2025
f937635
chore: gh actions
WoLewicki Jan 29, 2025
d8368ca
fix: workaround typescript
WoLewicki Jan 29, 2025
de5d124
fix: change to expect-error
WoLewicki Jan 29, 2025
3b9ab01
fix: add other lib needed by lottie
WoLewicki Jan 29, 2025
77b63fb
fix: type
WoLewicki Jan 30, 2025
130eade
chore: merge current main
WoLewicki Jan 30, 2025
2f1d703
chore: merge current main
WoLewicki Feb 3, 2025
df94cc3
chore: merge current main
WoLewicki Feb 4, 2025
76be385
chore: merge current main
WoLewicki Feb 4, 2025
adf8b47
fix: add patch for android height
WoLewicki Feb 6, 2025
4a3f890
chore: merge current main
WoLewicki Feb 6, 2025
bdf6541
chore: merge current main
WoLewicki Feb 6, 2025
c77ac1c
chore: merge current main
WoLewicki Feb 10, 2025
a188ad5
chore: merge current main
WoLewicki Feb 12, 2025
4762769
chore: merge current main
WoLewicki Feb 17, 2025
e276966
feat: bump to 0.77.1
WoLewicki Feb 19, 2025
d220ee9
chore: merge current main
WoLewicki Feb 19, 2025
7ee27d3
fix: add workaround for ios crash
WoLewicki Feb 20, 2025
86faa35
chore: merge current main
WoLewicki Feb 20, 2025
a3428b5
fix: proper back handler subscription
WoLewicki Feb 20, 2025
e1c61fb
fix: almost all tests
WoLewicki Feb 24, 2025
00d9474
chore: merge current main
WoLewicki Feb 24, 2025
fdda8a1
fix: last remaining test
WoLewicki Feb 25, 2025
3ba96d8
chore: merge current main
WoLewicki Feb 25, 2025
84cba26
fix: github actions
WoLewicki Feb 25, 2025
12eeb4f
fix: just dont change formdata prototype
WoLewicki Feb 26, 2025
3f1d777
chore: merge current main
WoLewicki Feb 26, 2025
ceaab79
Merge branch 'main' into @wolewicki/rn-77-upgrade
WoLewicki Feb 26, 2025
37e85da
chore: merge current main
WoLewicki Mar 3, 2025
eb6c77b
feat: change patches to upstream ones
WoLewicki Mar 3, 2025
1bb428e
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 3, 2025
4fdba02
bump dotlottie-react to fix lottie-related bugs
war-in Mar 4, 2025
b5edea9
override dotlottie-react in `lottie-react-native`
war-in Mar 4, 2025
dde42f2
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 4, 2025
8c72e77
remove outdated NewExpensifyTest references
war-in Mar 4, 2025
af99419
fix gh-actions-validate
war-in Mar 4, 2025
7c306ab
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 5, 2025
aae5769
update expo patch to align with https://github.com/expo/expo/pull/35243
war-in Mar 5, 2025
fd68132
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 7, 2025
69e2543
fix package-lock
war-in Mar 7, 2025
fd41866
revert `lottie-react-native` bump and add patch supporting 0.77 in it
war-in Mar 7, 2025
c79cd2d
update pods
war-in Mar 7, 2025
3ff368d
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 12, 2025
675462b
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 12, 2025
8e25152
merge
war-in Mar 17, 2025
0134b57
post-merge fixes
war-in Mar 17, 2025
c770a4a
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 18, 2025
7036f40
fix podfiles
war-in Mar 18, 2025
21c2a5c
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 18, 2025
9070bb3
fix typecheck
war-in Mar 18, 2025
681978e
fix submodule bump
war-in Mar 18, 2025
1da86bd
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 18, 2025
7bab11d
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 19, 2025
8bb2ede
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 19, 2025
a77c0dc
Merge branch 'main' into @wolewicki/rn-77-upgrade
war-in Mar 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,988 changes: 1,962 additions & 3,026 deletions .github/actions/javascript/authorChecklist/index.js

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions .github/actions/javascript/bumpVersion/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3481,7 +3481,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.PLIST_PATH_TEST = exports.PLIST_PATH = exports.BUILD_GRADLE_PATH = exports.generateAndroidVersionCode = exports.updateAndroidVersion = exports.updateiOSVersion = void 0;
exports.PLIST_PATH = exports.BUILD_GRADLE_PATH = exports.generateAndroidVersionCode = exports.updateAndroidVersion = exports.updateiOSVersion = void 0;
const child_process_1 = __nccwpck_require__(2081);
const fs_1 = __nccwpck_require__(7147);
const path_1 = __importDefault(__nccwpck_require__(1017));
Expand All @@ -3494,8 +3494,6 @@ const BUILD_GRADLE_PATH = process.env.NODE_ENV === 'test' ? path_1.default.resol
exports.BUILD_GRADLE_PATH = BUILD_GRADLE_PATH;
const PLIST_PATH = './ios/NewExpensify/Info.plist';
exports.PLIST_PATH = PLIST_PATH;
const PLIST_PATH_TEST = './ios/NewExpensifyTests/Info.plist';
exports.PLIST_PATH_TEST = PLIST_PATH_TEST;
const PLIST_PATH_NSE = './ios/NotificationServiceExtension/Info.plist';
/**
* Pad a number to be two digits (with leading zeros if necessary).
Expand Down Expand Up @@ -3541,10 +3539,8 @@ function updateiOSVersion(version) {
console.log('Updating iOS', `CFBundleShortVersionString: ${shortVersion}`, `CFBundleVersion: ${cfVersion}`);
// Update Plists
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH}`);
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_TEST}`);
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_NSE}`);
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH}`);
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_TEST}`);
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_NSE}`);
// Return the cfVersion so we can set the NEW_IOS_VERSION in ios.yml
return cfVersion;
Expand Down
5 changes: 1 addition & 4 deletions .github/libs/nativeVersionUpdater.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import getBuildVersion from 'semver/functions/prerelease';
// Filepath constants
const BUILD_GRADLE_PATH = process.env.NODE_ENV === 'test' ? path.resolve(__dirname, '../../android/app/build.gradle') : './android/app/build.gradle';
const PLIST_PATH = './ios/NewExpensify/Info.plist';
const PLIST_PATH_TEST = './ios/NewExpensifyTests/Info.plist';
const PLIST_PATH_NSE = './ios/NotificationServiceExtension/Info.plist';

/**
Expand Down Expand Up @@ -65,14 +64,12 @@ function updateiOSVersion(version: string): string {

// Update Plists
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH}`);
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_TEST}`);
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_NSE}`);
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH}`);
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_TEST}`);
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_NSE}`);

// Return the cfVersion so we can set the NEW_IOS_VERSION in ios.yml
return cfVersion;
}

export {updateiOSVersion, updateAndroidVersion, generateAndroidVersionCode, BUILD_GRADLE_PATH, PLIST_PATH, PLIST_PATH_TEST};
export {updateiOSVersion, updateAndroidVersion, generateAndroidVersionCode, BUILD_GRADLE_PATH, PLIST_PATH};
1 change: 0 additions & 1 deletion .github/workflows/createNewVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ jobs:
./package-lock.json \
./android/app/build.gradle \
./ios/NewExpensify/Info.plist \
./ios/NewExpensifyTests/Info.plist \
./ios/NotificationServiceExtension/Info.plist
git commit -m "Update version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"

Expand Down
2 changes: 1 addition & 1 deletion Mobile-Expensify
Copy link
Contributor

Choose a reason for hiding this comment

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

is this needed? I think this is kinda by git config

Copy link
Contributor

@war-in war-in Mar 18, 2025

Choose a reason for hiding this comment

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

It's not! good catch 🤦‍♂️
I'll fix it in a moment

Copy link
Contributor

Choose a reason for hiding this comment

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

done 🫡

4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ buildscript {
minSdkVersion = 24
compileSdkVersion = 35
targetSdkVersion = 34
ndkVersion = "26.1.10909125"
ndkVersion = "27.1.12297006"

androidXCore = "1.0.2"
multiDexEnabled = true
googlePlayServicesVersion = "17.0.0"
kotlinVersion = "1.9.24"
kotlinVersion = "2.0.21"

// This property configures the type of Mapbox SDK used by the @rnmapbox/maps library.
// "mapbox" indicates the usage of the Mapbox SDK.
Expand Down
Loading
Loading