From e7f7123e302e35a4fe93b3482b5e7ab656ec65d9 Mon Sep 17 00:00:00 2001 From: Kyle Date: Sun, 26 Nov 2023 17:13:36 +0800 Subject: [PATCH] Fix version issue --- Configs/Common.xcconfig | 4 ++-- MenuHelper.xcodeproj/project.pbxproj | 31 +++++++--------------------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/Configs/Common.xcconfig b/Configs/Common.xcconfig index 5e5403b..7549dbe 100644 --- a/Configs/Common.xcconfig +++ b/Configs/Common.xcconfig @@ -14,10 +14,10 @@ MENUHELPER_SUFFIX = $(MENUHELPER_SUFFIX_$(CONFIGURATION)) MENUHELPER_APP_NAME = MenuHelper$(MENUHELPER_SUFFIX) MENUHELPER_TARGET_NAME = $(TARGET_NAME)$(MENUHELPER_SUFFIX) -MENUHELPER_APP_VERSION = 0.3.2 +MENUHELPER_APP_VERSION = 3.2.0 MARKETING_VERSION = $(MENUHELPER_APP_VERSION) -PRODUCT_NAME = $(MENUHELPER_TARGET_NAME) +PRODUCT_NAME = $(TARGET_NAME) PRODUCT_BUNDLE_IDENTIFIER_MenuHelper = top.kyleye.$(MENUHELPER_APP_NAME) PRODUCT_BUNDLE_IDENTIFIER_MenuHelperExtension = $(PRODUCT_BUNDLE_IDENTIFIER_MenuHelper).$(MENUHELPER_TARGET_NAME) diff --git a/MenuHelper.xcodeproj/project.pbxproj b/MenuHelper.xcodeproj/project.pbxproj index e440fa8..350292e 100644 --- a/MenuHelper.xcodeproj/project.pbxproj +++ b/MenuHelper.xcodeproj/project.pbxproj @@ -31,7 +31,6 @@ 2781A62D2688A0260042B453 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2781A62C2688A0260042B453 /* Assets.xcassets */; }; 2781A6302688A0260042B453 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2781A62F2688A0260042B453 /* Preview Assets.xcassets */; }; 2781C5932688A4540042B453 /* FinderSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2781C5922688A4540042B453 /* FinderSync.swift */; }; - 2781C5972688A4540042B453 /* MenuHelperExtensionDebug.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 2781C5902688A4540042B453 /* MenuHelperExtensionDebug.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 2795203B268B5B7E00492ABF /* SettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2795203A268B5B7E00492ABF /* SettingView.swift */; }; 27952041268B5F0700492ABF /* FolderSettingTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27952040268B5F0700492ABF /* FolderSettingTab.swift */; }; 27952043268B5F1100492ABF /* MenuSettingTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27952042268B5F1100492ABF /* MenuSettingTab.swift */; }; @@ -47,6 +46,7 @@ 27AC028726896D31000CCE63 /* AppMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AC028626896D31000CCE63 /* AppMenuItem.swift */; }; 27AC028826896D31000CCE63 /* AppMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AC028626896D31000CCE63 /* AppMenuItem.swift */; }; 27ADFF902AF202ED00731FA8 /* AcknowKit in Frameworks */ = {isa = PBXBuildFile; productRef = 27ADFF8F2AF202ED00731FA8 /* AcknowKit */; }; + 27BB52A22B134562003EDCE2 /* MenuHelperExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 2781C5902688A4540042B453 /* MenuHelperExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 27CC3F2F272038F2000A6005 /* SyncFolderItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27CC3F2E272038F2000A6005 /* SyncFolderItem.swift */; }; 27CC3F30272038F2000A6005 /* SyncFolderItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27CC3F2E272038F2000A6005 /* SyncFolderItem.swift */; }; 27CC3F3227203924000A6005 /* FolderItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27CC3F3127203924000A6005 /* FolderItem.swift */; }; @@ -79,23 +79,13 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 27421AC12720083800A0BD28 /* Embed XPC Services */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "$(CONTENTS_FOLDER_PATH)/XPCServices"; - dstSubfolderSpec = 16; - files = ( - ); - name = "Embed XPC Services"; - runOnlyForDeploymentPostprocessing = 0; - }; 2781C5982688A4540042B453 /* Embed Foundation Extensions */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 13; files = ( - 2781C5972688A4540042B453 /* MenuHelperExtensionDebug.appex in Embed Foundation Extensions */, + 27BB52A22B134562003EDCE2 /* MenuHelperExtension.appex in Embed Foundation Extensions */, ); name = "Embed Foundation Extensions"; runOnlyForDeploymentPostprocessing = 0; @@ -124,12 +114,12 @@ 274C25FA2A32427000A6CE0F /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = ""; }; 274C25FC2A32427000A6CE0F /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = ""; }; 276D4122299D465E00C47CAF /* BundleHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BundleHelper.swift; sourceTree = ""; }; - 2781A6252688A0260042B453 /* MenuHelperDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MenuHelperDebug.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 2781A6252688A0260042B453 /* MenuHelper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MenuHelper.app; sourceTree = BUILT_PRODUCTS_DIR; }; 2781A6282688A0260042B453 /* MenuHelperApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuHelperApp.swift; sourceTree = ""; }; 2781A62A2688A0260042B453 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 2781A62C2688A0260042B453 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2781A62F2688A0260042B453 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 2781C5902688A4540042B453 /* MenuHelperExtensionDebug.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = MenuHelperExtensionDebug.appex; sourceTree = BUILT_PRODUCTS_DIR; }; + 2781C5902688A4540042B453 /* MenuHelperExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = MenuHelperExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 2781C5922688A4540042B453 /* FinderSync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FinderSync.swift; sourceTree = ""; }; 2781C5942688A4540042B453 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 2795203A268B5B7E00492ABF /* SettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingView.swift; sourceTree = ""; }; @@ -271,8 +261,8 @@ 2781A6262688A0260042B453 /* Products */ = { isa = PBXGroup; children = ( - 2781A6252688A0260042B453 /* MenuHelperDebug.app */, - 2781C5902688A4540042B453 /* MenuHelperExtensionDebug.appex */, + 2781A6252688A0260042B453 /* MenuHelper.app */, + 2781C5902688A4540042B453 /* MenuHelperExtension.appex */, 2732A5AF27B9558D005DB4A0 /* MenuHelperUITests.xctest */, ); name = Products; @@ -397,7 +387,6 @@ 2781A6222688A0260042B453 /* Frameworks */, 2781A6232688A0260042B453 /* Resources */, 2781C5982688A4540042B453 /* Embed Foundation Extensions */, - 27421AC12720083800A0BD28 /* Embed XPC Services */, ); buildRules = ( ); @@ -410,7 +399,7 @@ 27ADFF8F2AF202ED00731FA8 /* AcknowKit */, ); productName = FinderHelper; - productReference = 2781A6252688A0260042B453 /* MenuHelperDebug.app */; + productReference = 2781A6252688A0260042B453 /* MenuHelper.app */; productType = "com.apple.product-type.application"; }; 2781C58F2688A4540042B453 /* MenuHelperExtension */ = { @@ -430,7 +419,7 @@ 272986BA2711FDCD00EBCCBF /* OrderedCollections */, ); productName = FinderMenu; - productReference = 2781C5902688A4540042B453 /* MenuHelperExtensionDebug.appex */; + productReference = 2781C5902688A4540042B453 /* MenuHelperExtension.appex */; productType = "com.apple.product-type.app-extension"; }; /* End PBXNativeTarget section */ @@ -785,7 +774,6 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 14.0; - MARKETING_VERSION = 3.2.0; OTHER_SWIFT_FLAGS = "-enable-upcoming-feature BareSlashRegexLiterals -enable-upcoming-feature ConciseMagicFile -enable-upcoming-feature ExistentialAny -enable-upcoming-feature ForwardTrailingClosures -enable-upcoming-feature ImplicitOpenExistentials -enable-upcoming-feature StrictConcurrency -warn-concurrency -enable-actor-data-race-checks"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -821,7 +809,6 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 14.0; - MARKETING_VERSION = 3.2.0; OTHER_SWIFT_FLAGS = "-enable-upcoming-feature BareSlashRegexLiterals -enable-upcoming-feature ConciseMagicFile -enable-upcoming-feature ExistentialAny -enable-upcoming-feature ForwardTrailingClosures -enable-upcoming-feature ImplicitOpenExistentials -enable-upcoming-feature StrictConcurrency -warn-concurrency -enable-actor-data-race-checks"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -853,7 +840,6 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 14.0; - MARKETING_VERSION = 3.0.0; OTHER_SWIFT_FLAGS = "-enable-upcoming-feature BareSlashRegexLiterals -enable-upcoming-feature ConciseMagicFile -enable-upcoming-feature ExistentialAny -enable-upcoming-feature ForwardTrailingClosures -enable-upcoming-feature ImplicitOpenExistentials -enable-upcoming-feature StrictConcurrency -warn-concurrency -enable-actor-data-race-checks"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; @@ -886,7 +872,6 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 14.0; - MARKETING_VERSION = 3.0.0; OTHER_SWIFT_FLAGS = "-enable-upcoming-feature BareSlashRegexLiterals -enable-upcoming-feature ConciseMagicFile -enable-upcoming-feature ExistentialAny -enable-upcoming-feature ForwardTrailingClosures -enable-upcoming-feature ImplicitOpenExistentials -enable-upcoming-feature StrictConcurrency -warn-concurrency -enable-actor-data-race-checks"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES;