Skip to content

Commit 4866ed4

Browse files
AndrewGableAndrewGable
authored
Merge pull request #59057 from Expensify/georgia-ios
[No QA] Fix `CFBundleVersion and CFBundleShortVersionString` IOS Build Warning
2 parents d9f595e + 8760cb6 commit 4866ed4

File tree

5 files changed

+27
-8
lines changed

5 files changed

+27
-8
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3495,6 +3495,7 @@ exports.BUILD_GRADLE_PATH = BUILD_GRADLE_PATH;
34953495
const PLIST_PATH = './ios/NewExpensify/Info.plist';
34963496
exports.PLIST_PATH = PLIST_PATH;
34973497
const PLIST_PATH_NSE = './ios/NotificationServiceExtension/Info.plist';
3498+
const PLIST_PATH_SHARE = './ios/ShareViewController/Info.plist';
34983499
/**
34993500
* Pad a number to be two digits (with leading zeros if necessary).
35003501
*/
@@ -3540,8 +3541,10 @@ function updateiOSVersion(version) {
35403541
// Update Plists
35413542
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH}`);
35423543
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_NSE}`);
3544+
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_SHARE}`);
35433545
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH}`);
35443546
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_NSE}`);
3547+
(0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_SHARE}`);
35453548
// Return the cfVersion so we can set the NEW_IOS_VERSION in ios.yml
35463549
return cfVersion;
35473550
}

‎.github/libs/nativeVersionUpdater.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import getBuildVersion from 'semver/functions/prerelease';
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';
1313
const PLIST_PATH_NSE = './ios/NotificationServiceExtension/Info.plist';
14+
const PLIST_PATH_SHARE = './ios/ShareViewController/Info.plist';
1415

1516
/**
1617
* Pad a number to be two digits (with leading zeros if necessary).
@@ -65,8 +66,10 @@ function updateiOSVersion(version: string): string {
6566
// Update Plists
6667
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH}`);
6768
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_NSE}`);
69+
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_SHARE}`);
6870
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH}`);
6971
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_NSE}`);
72+
execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_SHARE}`);
7073

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

‎.github/workflows/createNewVersion.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ jobs:
137137
./package-lock.json \
138138
./android/app/build.gradle \
139139
./ios/NewExpensify/Info.plist \
140-
./ios/NotificationServiceExtension/Info.plist
140+
./ios/NotificationServiceExtension/Info.plist \
141+
./ios/ShareViewController/Info.plist
141142
git commit -m "Update version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"
142143
143144
- name: Update Mobile-Expensify submodule in E/App

‎ios/NewExpensify.xcodeproj/project.pbxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2226,7 +2226,7 @@
22262226
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
22272227
ENABLE_USER_SCRIPT_SANDBOXING = YES;
22282228
GCC_C_LANGUAGE_STANDARD = gnu17;
2229-
GENERATE_INFOPLIST_FILE = YES;
2229+
GENERATE_INFOPLIST_FILE = NO;
22302230
INFOPLIST_FILE = ShareViewController/Info.plist;
22312231
INFOPLIST_KEY_CFBundleDisplayName = ShareViewController;
22322232
INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -2275,7 +2275,7 @@
22752275
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
22762276
ENABLE_USER_SCRIPT_SANDBOXING = YES;
22772277
GCC_C_LANGUAGE_STANDARD = gnu17;
2278-
GENERATE_INFOPLIST_FILE = YES;
2278+
GENERATE_INFOPLIST_FILE = NO;
22792279
INFOPLIST_FILE = ShareViewController/Info.plist;
22802280
INFOPLIST_KEY_CFBundleDisplayName = ShareViewController;
22812281
INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -2323,7 +2323,7 @@
23232323
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
23242324
ENABLE_USER_SCRIPT_SANDBOXING = YES;
23252325
GCC_C_LANGUAGE_STANDARD = gnu17;
2326-
GENERATE_INFOPLIST_FILE = YES;
2326+
GENERATE_INFOPLIST_FILE = NO;
23272327
INFOPLIST_FILE = ShareViewController/Info.plist;
23282328
INFOPLIST_KEY_CFBundleDisplayName = ShareViewController;
23292329
INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -2371,7 +2371,7 @@
23712371
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
23722372
ENABLE_USER_SCRIPT_SANDBOXING = YES;
23732373
GCC_C_LANGUAGE_STANDARD = gnu17;
2374-
GENERATE_INFOPLIST_FILE = YES;
2374+
GENERATE_INFOPLIST_FILE = NO;
23752375
INFOPLIST_FILE = ShareViewController/Info.plist;
23762376
INFOPLIST_KEY_CFBundleDisplayName = ShareViewController;
23772377
INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -2452,7 +2452,7 @@
24522452
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
24532453
GCC_WARN_UNUSED_FUNCTION = YES;
24542454
GCC_WARN_UNUSED_VARIABLE = YES;
2455-
GENERATE_INFOPLIST_FILE = YES;
2455+
GENERATE_INFOPLIST_FILE = NO;
24562456
INFOPLIST_FILE = ShareViewController/Info.plist;
24572457
INFOPLIST_KEY_CFBundleDisplayName = ShareViewController;
24582458
INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -2533,7 +2533,7 @@
25332533
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
25342534
GCC_WARN_UNUSED_FUNCTION = YES;
25352535
GCC_WARN_UNUSED_VARIABLE = YES;
2536-
GENERATE_INFOPLIST_FILE = YES;
2536+
GENERATE_INFOPLIST_FILE = NO;
25372537
INFOPLIST_FILE = ShareViewController/Info.plist;
25382538
INFOPLIST_KEY_CFBundleDisplayName = ShareViewController;
25392539
INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -2614,7 +2614,7 @@
26142614
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
26152615
GCC_WARN_UNUSED_FUNCTION = YES;
26162616
GCC_WARN_UNUSED_VARIABLE = YES;
2617-
GENERATE_INFOPLIST_FILE = YES;
2617+
GENERATE_INFOPLIST_FILE = NO;
26182618
INFOPLIST_FILE = ShareViewController/Info.plist;
26192619
INFOPLIST_KEY_CFBundleDisplayName = ShareViewController;
26202620
INFOPLIST_KEY_NSHumanReadableCopyright = "";

‎ios/ShareViewController/Info.plist

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
<plist version="1.0">
44

55
<dict>
6+
<key>CFBundleDisplayName</key>
7+
<string>$(PRODUCT_NAME)</string>
8+
<key>CFBundleExecutable</key>
9+
<string>$(EXECUTABLE_NAME)</string>
10+
<key>CFBundleIdentifier</key>
11+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
12+
<key>CFBundleName</key>
13+
<string>$(PRODUCT_NAME)</string>
14+
<key>CFBundleShortVersionString</key>
15+
<string>9.1.18</string>
16+
<key>CFBundleVersion</key>
17+
<string>9.1.18.2</string>
618
<key>NSExtension</key>
719
<dict>
820
<key>NSExtensionAttributes</key>

0 commit comments

Comments
 (0)