diff --git a/.github/actions/javascript/bumpVersion/index.js b/.github/actions/javascript/bumpVersion/index.js index db369a1ec389d..5f6d054c68926 100644 --- a/.github/actions/javascript/bumpVersion/index.js +++ b/.github/actions/javascript/bumpVersion/index.js @@ -3495,6 +3495,7 @@ exports.BUILD_GRADLE_PATH = BUILD_GRADLE_PATH; const PLIST_PATH = './ios/NewExpensify/Info.plist'; exports.PLIST_PATH = PLIST_PATH; const PLIST_PATH_NSE = './ios/NotificationServiceExtension/Info.plist'; +const PLIST_PATH_SHARE = './ios/ShareViewController/Info.plist'; /** * Pad a number to be two digits (with leading zeros if necessary). */ @@ -3540,8 +3541,10 @@ function updateiOSVersion(version) { // 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_NSE}`); + (0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_SHARE}`); (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_NSE}`); + (0, child_process_1.execSync)(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_SHARE}`); // Return the cfVersion so we can set the NEW_IOS_VERSION in ios.yml return cfVersion; } diff --git a/.github/libs/nativeVersionUpdater.ts b/.github/libs/nativeVersionUpdater.ts index 2d0abb0533225..5637d2e55d2ee 100644 --- a/.github/libs/nativeVersionUpdater.ts +++ b/.github/libs/nativeVersionUpdater.ts @@ -11,6 +11,7 @@ import getBuildVersion from 'semver/functions/prerelease'; 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_NSE = './ios/NotificationServiceExtension/Info.plist'; +const PLIST_PATH_SHARE = './ios/ShareViewController/Info.plist'; /** * Pad a number to be two digits (with leading zeros if necessary). @@ -65,8 +66,10 @@ 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_NSE}`); + execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${shortVersion}" ${PLIST_PATH_SHARE}`); execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH}`); execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_NSE}`); + execSync(`/usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${cfVersion}" ${PLIST_PATH_SHARE}`); // Return the cfVersion so we can set the NEW_IOS_VERSION in ios.yml return cfVersion; diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index 97275cea3cb92..1ebd1a45e5189 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -137,7 +137,8 @@ jobs: ./package-lock.json \ ./android/app/build.gradle \ ./ios/NewExpensify/Info.plist \ - ./ios/NotificationServiceExtension/Info.plist + ./ios/NotificationServiceExtension/Info.plist \ + ./ios/ShareViewController/Info.plist git commit -m "Update version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}" - name: Update Mobile-Expensify submodule in E/App diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 2146851df89f5..21cb37d7c0512 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -2226,7 +2226,7 @@ "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; + GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = ShareViewController/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = ShareViewController; INFOPLIST_KEY_NSHumanReadableCopyright = ""; @@ -2275,7 +2275,7 @@ "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; + GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = ShareViewController/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = ShareViewController; INFOPLIST_KEY_NSHumanReadableCopyright = ""; @@ -2323,7 +2323,7 @@ "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; + GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = ShareViewController/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = ShareViewController; INFOPLIST_KEY_NSHumanReadableCopyright = ""; @@ -2371,7 +2371,7 @@ "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; + GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = ShareViewController/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = ShareViewController; INFOPLIST_KEY_NSHumanReadableCopyright = ""; @@ -2452,7 +2452,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - GENERATE_INFOPLIST_FILE = YES; + GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = ShareViewController/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = ShareViewController; INFOPLIST_KEY_NSHumanReadableCopyright = ""; @@ -2533,7 +2533,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - GENERATE_INFOPLIST_FILE = YES; + GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = ShareViewController/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = ShareViewController; INFOPLIST_KEY_NSHumanReadableCopyright = ""; @@ -2614,7 +2614,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - GENERATE_INFOPLIST_FILE = YES; + GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = ShareViewController/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = ShareViewController; INFOPLIST_KEY_NSHumanReadableCopyright = ""; diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist index a7de63f1f6d62..524cecd4010f4 100644 --- a/ios/ShareViewController/Info.plist +++ b/ios/ShareViewController/Info.plist @@ -3,6 +3,18 @@ + CFBundleDisplayName + $(PRODUCT_NAME) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleName + $(PRODUCT_NAME) + CFBundleShortVersionString + 9.1.18 + CFBundleVersion + 9.1.18.2 NSExtension NSExtensionAttributes