Skip to content

Commit 70fb7e3

Browse files
authored
Merge pull request #55861 from software-mansion-labs/@wolewicki/rn-77-upgrade
feat: RN 77 upgrade
2 parents 6e2edad + a77c0dc commit 70fb7e3

File tree

82 files changed

+5274
-6083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+5274
-6083
lines changed

.github/actions/javascript/authorChecklist/index.js

Lines changed: 1962 additions & 3026 deletions
Large diffs are not rendered by default.

.github/actions/javascript/bumpVersion/index.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3481,7 +3481,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
34813481
return (mod && mod.__esModule) ? mod : { "default": mod };
34823482
};
34833483
Object.defineProperty(exports, "__esModule", ({ value: true }));
3484-
exports.PLIST_PATH_TEST = exports.PLIST_PATH = exports.BUILD_GRADLE_PATH = exports.generateAndroidVersionCode = exports.updateAndroidVersion = exports.updateiOSVersion = void 0;
3484+
exports.PLIST_PATH = exports.BUILD_GRADLE_PATH = exports.generateAndroidVersionCode = exports.updateAndroidVersion = exports.updateiOSVersion = void 0;
34853485
const child_process_1 = __nccwpck_require__(2081);
34863486
const fs_1 = __nccwpck_require__(7147);
34873487
const path_1 = __importDefault(__nccwpck_require__(1017));
@@ -3494,8 +3494,6 @@ const BUILD_GRADLE_PATH = process.env.NODE_ENV === 'test' ? path_1.default.resol
34943494
exports.BUILD_GRADLE_PATH = BUILD_GRADLE_PATH;
34953495
const PLIST_PATH = './ios/NewExpensify/Info.plist';
34963496
exports.PLIST_PATH = PLIST_PATH;
3497-
const PLIST_PATH_TEST = './ios/NewExpensifyTests/Info.plist';
3498-
exports.PLIST_PATH_TEST = PLIST_PATH_TEST;
34993497
const PLIST_PATH_NSE = './ios/NotificationServiceExtension/Info.plist';
35003498
/**
35013499
* Pad a number to be two digits (with leading zeros if necessary).
@@ -3541,10 +3539,8 @@ function updateiOSVersion(version) {
35413539
console.log('Updating iOS', `CFBundleShortVersionString: ${shortVersion}`, `CFBundleVersion: ${cfVersion}`);
35423540
// Update Plists
35433541
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH}`);
3544-
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_TEST}`);
35453542
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_NSE}`);
35463543
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH}`);
3547-
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_TEST}`);
35483544
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_NSE}`);
35493545
// Return the cfVersion so we can set the NEW_IOS_VERSION in ios.yml
35503546
return cfVersion;

.github/libs/nativeVersionUpdater.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import getBuildVersion from 'semver/functions/prerelease';
1010
// Filepath constants
1111
const BUILD_GRADLE_PATH = process.env.NODE_ENV === 'test' ? path.resolve(__dirname, '../../android/app/build.gradle') : './android/app/build.gradle';
1212
const PLIST_PATH = './ios/NewExpensify/Info.plist';
13-
const PLIST_PATH_TEST = './ios/NewExpensifyTests/Info.plist';
1413
const PLIST_PATH_NSE = './ios/NotificationServiceExtension/Info.plist';
1514

1615
/**
@@ -65,14 +64,12 @@ function updateiOSVersion(version: string): string {
6564

6665
// Update Plists
6766
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH}`);
68-
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_TEST}`);
6967
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_NSE}`);
7068
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH}`);
71-
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_TEST}`);
7269
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_NSE}`);
7370

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

78-
export {updateiOSVersion, updateAndroidVersion, generateAndroidVersionCode, BUILD_GRADLE_PATH, PLIST_PATH, PLIST_PATH_TEST};
75+
export {updateiOSVersion, updateAndroidVersion, generateAndroidVersionCode, BUILD_GRADLE_PATH, PLIST_PATH};

.github/workflows/createNewVersion.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ jobs:
143143
./package-lock.json \
144144
./android/app/build.gradle \
145145
./ios/NewExpensify/Info.plist \
146-
./ios/NewExpensifyTests/Info.plist \
147146
./ios/NotificationServiceExtension/Info.plist
148147
git commit -m "Update version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"
149148

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ buildscript {
66
minSdkVersion = 24
77
compileSdkVersion = 35
88
targetSdkVersion = 34
9-
ndkVersion = "26.1.10909125"
9+
ndkVersion = "27.1.12297006"
1010

1111
androidXCore = "1.0.2"
1212
multiDexEnabled = true
1313
googlePlayServicesVersion = "17.0.0"
14-
kotlinVersion = "1.9.24"
14+
kotlinVersion = "2.0.21"
1515

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

0 commit comments

Comments
 (0)