Skip to content

Commit 996d0f7

Browse files
OrlaMOrlaM
authored
Add FXIOS-11615 Update version for Firefox from version.txt (#25302)
* Update version for Firefox from version.txt * Include version.xcconfig in other config files * Add version * Fix warning * Fix version config location * Fix version location * Fix xcode reference
1 parent ea8fc32 commit 996d0f7

File tree

13 files changed

+35
-7
lines changed

13 files changed

+35
-7
lines changed

‎firefox-ios/Client.xcodeproj/project.pbxproj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7536,6 +7536,7 @@
75367536
5A271ABC2860B0D700471CE4 /* WebServerUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebServerUtil.swift; sourceTree = "<group>"; };
75377537
5A2918CA2B522338002B197E /* GeneralBrowserAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralBrowserAction.swift; sourceTree = "<group>"; };
75387538
5A2918CC2B522381002B197E /* ToastType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastType.swift; sourceTree = "<group>"; };
7539+
5A2D1A4D2D84BD210066F7C9 /* version.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = version.xcconfig; sourceTree = "<group>"; };
75397540
5A31275728906422001F30FA /* BookmarksDelegateMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksDelegateMock.swift; sourceTree = "<group>"; };
75407541
5A32C2B52AD8517200A9B5A4 /* MetricKitWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetricKitWrapper.swift; sourceTree = "<group>"; };
75417542
5A3A2A0C287F742C00B79EAC /* BackgroundSyncUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundSyncUtility.swift; sourceTree = "<group>"; };
@@ -14669,6 +14670,7 @@
1466914670
E60961841B62B7E100DD640F /* Configuration */ = {
1467014671
isa = PBXGroup;
1467114672
children = (
14673+
5A2D1A4D2D84BD210066F7C9 /* version.xcconfig */,
1467214674
8A2B1A5B28216C4C0061216B /* Common.xcconfig */,
1467314675
8A2B1A5A28216C4C0061216B /* Debug.xcconfig */,
1467414676
E6DCC1ED1DCBB6AA00CEC4B7 /* Fennec.enterprise.xcconfig */,
@@ -15748,6 +15750,7 @@
1574815750
isa = PBXNativeTarget;
1574915751
buildConfigurationList = F84B21DD1A090F8100AAB793 /* Build configuration list for PBXNativeTarget "Client" */;
1575015752
buildPhases = (
15753+
5AFF989D2D821A27008A0B79 /* Update Version */,
1575115754
C874A4E327F62C5B006F54E5 /* Swiftlint */,
1575215755
5FA2232B27F6FA00005B3D87 /* Glean SDK Generator Script */,
1575315756
5FA2232C27F6FA69005B3D87 /* Nimbus Feature Manifest Generator Script */,
@@ -16556,6 +16559,25 @@
1655616559
shellPath = /bin/sh;
1655716560
shellScript = "bash $PWD/bin/sdk_generator.sh -g Glean -o $SRCROOT/Storage/Generated\n";
1655816561
};
16562+
5AFF989D2D821A27008A0B79 /* Update Version */ = {
16563+
isa = PBXShellScriptBuildPhase;
16564+
alwaysOutOfDate = 1;
16565+
buildActionMask = 2147483647;
16566+
files = (
16567+
);
16568+
inputFileListPaths = (
16569+
);
16570+
inputPaths = (
16571+
);
16572+
name = "Update Version";
16573+
outputFileListPaths = (
16574+
);
16575+
outputPaths = (
16576+
);
16577+
runOnlyForDeploymentPostprocessing = 0;
16578+
shellPath = /bin/sh;
16579+
shellScript = "#!/bin/sh\n\nVERSION_FILE=\"${SRCROOT}/../version.txt\"\nXCCONFIG_FILE=\"${SRCROOT}/Client/Configuration/version.xcconfig\"\n\n# Read version from file\nif [ -f \"$VERSION_FILE\" ]; then\n VERSION_NUMBER=$(cat \"$VERSION_FILE\" | tr -d '[:space:]')\nelse\n echo \"Error: version.txt not found!\"\n exit 1\nfi\n\n# Update the xcconfig file with the version number\necho \"APP_VERSION = $VERSION_NUMBER\" > \"$XCCONFIG_FILE\"\n\necho \"Updated Version.xcconfig with version: $VERSION_NUMBER\"\n";
16580+
};
1655916581
5FA2232B27F6FA00005B3D87 /* Glean SDK Generator Script */ = {
1656016582
isa = PBXShellScriptBuildPhase;
1656116583
buildActionMask = 2147483647;

‎firefox-ios/Client/Configuration/Fennec.enterprise.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include "Common.xcconfig"
66
#include "Debug.xcconfig"
7+
#include "version.xcconfig"
78

89
MOZ_BUNDLE_DISPLAY_NAME = Fennec
910
MOZ_BUNDLE_ID = org.mozilla.ios.FennecEnterprise

‎firefox-ios/Client/Configuration/Fennec.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include "Common.xcconfig"
66
#include "Debug.xcconfig"
7+
#include "version.xcconfig"
78

89
INFOPLIST_FILE = Client/Info.plist
910
MOZ_BUNDLE_DISPLAY_NAME = Fennec ($(USER))

‎firefox-ios/Client/Configuration/Firefox.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include "Common.xcconfig"
66
#include "Release.xcconfig"
7+
#include "version.xcconfig"
78

89
MOZ_BUNDLE_DISPLAY_NAME = Firefox
910
MOZ_BUNDLE_ID = org.mozilla.ios.Firefox

‎firefox-ios/Client/Configuration/FirefoxBeta.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include "Common.xcconfig"
66
#include "Release.xcconfig"
7+
#include "version.xcconfig"
78

89
MOZ_BUNDLE_DISPLAY_NAME = Firefox Beta
910
MOZ_BUNDLE_ID = org.mozilla.ios.FirefoxBeta

‎firefox-ios/Client/Configuration/version.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
APP_VERSION = 138.0

‎firefox-ios/Client/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<key>CFBundlePackageType</key>
2929
<string>APPL</string>
3030
<key>CFBundleShortVersionString</key>
31-
<string>138.0</string>
31+
<string>$(APP_VERSION)</string>
3232
<key>CFBundleSignature</key>
3333
<string>????</string>
3434
<key>CFBundleURLTypes</key>

‎firefox-ios/Client/version.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
APP_VERSION = 138.0

‎firefox-ios/CredentialProvider/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>138.0</string>
20+
<string>$(APP_VERSION)</string>
2121
<key>CFBundleVersion</key>
2222
<string>1</string>
2323
<key>MozDevelopmentTeam</key>

‎firefox-ios/Extensions/NotificationService/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>XPC!</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>138.0</string>
20+
<string>$(APP_VERSION)</string>
2121
<key>CFBundleVersion</key>
2222
<string>1</string>
2323
<key>MozDevelopmentTeam</key>

‎firefox-ios/Extensions/ShareTo/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>XPC!</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>138.0</string>
20+
<string>$(APP_VERSION)</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>

‎firefox-ios/WidgetKit/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>138.0</string>
20+
<string>$(APP_VERSION)</string>
2121
<key>CFBundleVersion</key>
2222
<string>1</string>
2323
<key>MozDevelopmentTeam</key>

‎firefox-ios/sticker/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleShortVersionString</key>
6-
<string>138.0</string>
6+
<string>$(APP_VERSION)</string>
77
<key>CFBundleVersion</key>
88
<string>1</string>
99
<key>CFBundleIdentifier</key>
@@ -22,4 +22,4 @@
2222
<string>StickerBrowserViewController</string>
2323
</dict>
2424
</dict>
25-
</plist>
25+
</plist>

0 commit comments

Comments
 (0)