Skip to content

Commit 21efbf3

Browse files
ACTCDACTCD
committed
refactor: unify mac and ios version numbers
1 parent c0089b9 commit 21efbf3

8 files changed

Lines changed: 9 additions & 23 deletions

‎xcode/Userscripts.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@
572572
);
573573
runOnlyForDeploymentPostprocessing = 0;
574574
shellPath = /bin/sh;
575-
shellScript = "sed \"s/_VERSION_/$MAC_APP_VERSION/\" $SRCROOT/$MANIFEST_FILE > $TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/manifest.json\nsed -i \"\" \"s/_NAME_/$MANIFEST_NAME/\" $TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/_locales/en/messages.json\n";
575+
shellScript = "sed \"s/_VERSION_/$MARKETING_VERSION/\" $SRCROOT/$MANIFEST_FILE > $TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/manifest.json\nsed -i \"\" \"s/_NAME_/$MANIFEST_NAME/\" $TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/_locales/en/messages.json\n";
576576
};
577577
039F59592ADFA415002E9977 /* UScript: Produce ext manifest.json */ = {
578578
isa = PBXShellScriptBuildPhase;
@@ -594,7 +594,7 @@
594594
);
595595
runOnlyForDeploymentPostprocessing = 0;
596596
shellPath = /bin/sh;
597-
shellScript = "sed \"s/_VERSION_/$IOS_APP_VERSION/\" $SRCROOT/$MANIFEST_FILE > $TARGET_BUILD_DIR/$CONTENTS_FOLDER_PATH/manifest.json\nsed -i \"\" \"s/_NAME_/$MANIFEST_NAME/\" $TARGET_BUILD_DIR/$CONTENTS_FOLDER_PATH/_locales/en/messages.json\n";
597+
shellScript = "sed \"s/_VERSION_/$MARKETING_VERSION/\" $SRCROOT/$MANIFEST_FILE > $TARGET_BUILD_DIR/$CONTENTS_FOLDER_PATH/manifest.json\nsed -i \"\" \"s/_NAME_/$MANIFEST_NAME/\" $TARGET_BUILD_DIR/$CONTENTS_FOLDER_PATH/_locales/en/messages.json\n";
598598
};
599599
/* End PBXShellScriptBuildPhase section */
600600

‎xcode/xcconfig/Mac-App.xcconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
33
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
44
CODE_SIGN_ENTITLEMENTS = $(SRC_DIR)/App.entitlements
55
COMBINE_HIDPI_IMAGES = YES
6-
CURRENT_PROJECT_VERSION = $(MAC_APP_BUILD)
76
ENABLE_HARDENED_RUNTIME = YES
87
GENERATE_INFOPLIST_FILE = YES
98
INFOPLIST_FILE = $(SRC_DIR)/Info.plist
109
INFOPLIST_KEY_CFBundleDisplayName = $(PROJECT_NAME)-$(TARGET_NAME)
1110
INFOPLIST_KEY_CFBundleDisplayName[config=Debug] = $(PROJECT_NAME)-$(TARGET_NAME)-Debug
1211
INFOPLIST_KEY_CFBundleDisplayName[config=Vite] = $(PROJECT_NAME)-$(TARGET_NAME)-Vite
1312
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks
14-
MARKETING_VERSION = $(MAC_APP_VERSION)
1513
PRODUCT_BUNDLE_IDENTIFIER = $(APP_IDENTIFIER)
1614
PRODUCT_NAME = $(PROJECT_NAME)
1715
PRODUCT_NAME[config=Debug] = $(PROJECT_NAME)-Debug

‎xcode/xcconfig/Mac-Safari-Extension.xcconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
#include? "Safari-Extension.xcconfig"
33

44
CODE_SIGN_ENTITLEMENTS = $(SRC_DIR)/Mac.entitlements
5-
CURRENT_PROJECT_VERSION = $(MAC_APP_BUILD)
65
ENABLE_HARDENED_RUNTIME = YES
76
GENERATE_INFOPLIST_FILE = YES
87
INFOPLIST_FILE = $(SRC_DIR)/Info.plist
98
INFOPLIST_KEY_CFBundleDisplayName = $(PRODUCT_NAME)
109
INFOPLIST_KEY_CFBundleDisplayName[config=Debug] = $(PRODUCT_NAME)-Debug
1110
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks
12-
MARKETING_VERSION = $(MAC_APP_VERSION)
1311
PRODUCT_BUNDLE_IDENTIFIER = $(EXT_IDENTIFIER)
1412
PRODUCT_NAME = $(PROJECT_NAME)-$(TARGET_NAME)
1513
SKIP_INSTALL = YES

‎xcode/xcconfig/Userscripts-Debug.xcconfig‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#include "Userscripts-Base.xcconfig"
22

33
INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © Userscripts
4-
IOS_APP_BUILD = 1
5-
IOS_APP_VERSION = 1.0.0
6-
MAC_APP_BUILD = 1
7-
MAC_APP_VERSION = 1.0.0
4+
CURRENT_PROJECT_VERSION = 1
5+
MARKETING_VERSION = 1.0.0
86

97
// Sign to Run Locally
108
CODE_SIGN_IDENTITY = -

‎xcode/xcconfig/Userscripts-Release.xcconfig‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#include "Userscripts-Base.xcconfig"
22

3-
INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2018–2023 Justin Wasack. All rights reserved.
4-
IOS_APP_BUILD = 60
5-
IOS_APP_VERSION = 1.5.0
6-
MAC_APP_BUILD = 87
7-
MAC_APP_VERSION = 4.5.0
3+
INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2018–2024 Justin Wasack. All rights reserved.
4+
CURRENT_PROJECT_VERSION = 88
5+
MARKETING_VERSION = 4.5.0
86

97
// Development
108
CODE_SIGN_IDENTITY = Apple Development

‎xcode/xcconfig/Userscripts-Vite.xcconfig‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#include "Userscripts-Base.xcconfig"
22

33
INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © Userscripts
4-
IOS_APP_BUILD = 2
5-
IOS_APP_VERSION = 2.0.0
6-
MAC_APP_BUILD = 5
7-
MAC_APP_VERSION = 5.0.0
4+
CURRENT_PROJECT_VERSION = 2
5+
MARKETING_VERSION = 2.0.0
86

97
// Sign to Run Locally
108
CODE_SIGN_IDENTITY = -

‎xcode/xcconfig/iOS-App.xcconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
33
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
44
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor
55
CODE_SIGN_ENTITLEMENTS = $(SRC_DIR)/App.entitlements
6-
CURRENT_PROJECT_VERSION = $(IOS_APP_BUILD)
76
GENERATE_INFOPLIST_FILE = YES
87
INFOPLIST_FILE = $(SRC_DIR)/Info.plist
98
INFOPLIST_KEY_CFBundleDisplayName = $(PROJECT_NAME)
@@ -16,7 +15,6 @@ INFOPLIST_KEY_UIStatusBarHidden = NO
1615
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight
1716
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight
1817
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks
19-
MARKETING_VERSION = $(IOS_APP_VERSION)
2018
OTHER_LDFLAGS = -framework SafariServices -framework WebKit
2119
PRODUCT_BUNDLE_IDENTIFIER = $(APP_IDENTIFIER)
2220
PRODUCT_NAME = $(PROJECT_NAME)-$(TARGET_NAME)

‎xcode/xcconfig/iOS-Safari-Extension.xcconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
#include? "Safari-Extension.xcconfig"
33

44
CODE_SIGN_ENTITLEMENTS = $(SRC_DIR)/iOS.entitlements
5-
CURRENT_PROJECT_VERSION = $(IOS_APP_BUILD)
65
GENERATE_INFOPLIST_FILE = YES
76
INFOPLIST_FILE = $(SRC_DIR)/Info.plist
87
INFOPLIST_KEY_CFBundleDisplayName = $(PRODUCT_NAME)
98
INFOPLIST_KEY_CFBundleDisplayName[config=Debug] = $(PROJECT_NAME)-D
109
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
11-
MARKETING_VERSION = $(IOS_APP_VERSION)
1210
OTHER_LDFLAGS = -framework SafariServices
1311
PRODUCT_BUNDLE_IDENTIFIER = $(EXT_IDENTIFIER)
1412
PRODUCT_NAME = $(PROJECT_NAME)-$(TARGET_NAME)

0 commit comments

Comments
 (0)