From abb2e4fd436048bd7ac994aeed8f8182d350f53d Mon Sep 17 00:00:00 2001 From: 1024jp <1024jp@wolfrosch.com> Date: Sun, 29 Aug 2021 18:23:05 +0900 Subject: [PATCH] Migrate Sparkle from submodule to SwiftPM --- .gitmodules | 4 - CHANGELOG.md | 1 + .../xcshareddata/swiftpm/Package.resolved | 9 ++ CotEditor/CotEditor.xcodeproj/project.pbxproj | 119 ++++-------------- .../xcshareddata/xcschemes/Sparkle.xcscheme | 76 ----------- CotEditor/buildSparkle.sh | 54 -------- Frameworks/Sparkle | 1 - README.md | 1 - 8 files changed, 34 insertions(+), 231 deletions(-) delete mode 100644 CotEditor/CotEditor.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme delete mode 100755 CotEditor/buildSparkle.sh delete mode 160000 Frameworks/Sparkle diff --git a/.gitmodules b/.gitmodules index 97d6fb734..d64bb8ffe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ [submodule "cot"] path = cot url = https://github.com/coteditor/cot.git -[submodule "Frameworks/Sparkle"] - path = Frameworks/Sparkle - url = https://github.com/sparkle-project/Sparkle.git - branch = 2.x diff --git a/CHANGELOG.md b/CHANGELOG.md index e02f4e042..572c86117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ Change Log - Highlight named capture where highlight regular expression patterns such as in the find panel. - Add β€œ.erb” extension to Ruby syntax style. - [trivial] Tweak the help layout. +- [dev] Migrate Sparkle from submodule to SwiftPM. ### Fixes diff --git a/CotEditor.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CotEditor.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9ad8a6f84..c6b2a4115 100644 --- a/CotEditor.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/CotEditor.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,6 +1,15 @@ { "object": { "pins": [ + { + "package": "Sparkle", + "repositoryURL": "https://github.com/sparkle-project/Sparkle", + "state": { + "branch": "2.x", + "revision": "515b8259bcd0defb08c28cdee8b697b045ffdeeb", + "version": null + } + }, { "package": "ColorCode", "repositoryURL": "https://github.com/1024jp/WFColorCode", diff --git a/CotEditor/CotEditor.xcodeproj/project.pbxproj b/CotEditor/CotEditor.xcodeproj/project.pbxproj index 8abe7b7a0..876a55b89 100644 --- a/CotEditor/CotEditor.xcodeproj/project.pbxproj +++ b/CotEditor/CotEditor.xcodeproj/project.pbxproj @@ -18,17 +18,6 @@ name = "Update Help Index"; productName = "Update Help Index"; }; - 2A9246E71FCD2004008DBC30 /* Sparkle */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 2A9246EA1FCD200A008DBC30 /* Build configuration list for PBXAggregateTarget "Sparkle" */; - buildPhases = ( - 2A9246EB1FCD2012008DBC30 /* Build Sparkle */, - ); - dependencies = ( - ); - name = Sparkle; - productName = "Sparkle XPCs"; - }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ @@ -400,7 +389,6 @@ 2A91C31F1D1C3963007CF8BE /* PrintPaneController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A91C31D1D1C3963007CF8BE /* PrintPaneController.swift */; }; 2A91C3211D1C40E4007CF8BE /* FileDropPaneController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A91C3201D1C40E4007CF8BE /* FileDropPaneController.swift */; }; 2A91C3221D1C40E4007CF8BE /* FileDropPaneController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A91C3201D1C40E4007CF8BE /* FileDropPaneController.swift */; }; - 2A9246FF1FCD2D07008DBC30 /* org.sparkle-project.InstallerLauncher.xpc in Embed XPC Services */ = {isa = PBXBuildFile; fileRef = 2A9246FB1FCD2CF0008DBC30 /* org.sparkle-project.InstallerLauncher.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 2A94FC791BE225A200B454A8 /* cot in Copy Command-Line Tools */ = {isa = PBXBuildFile; fileRef = 2A94FC781BE2256F00B454A8 /* cot */; }; 2A94FC7B1BE225F000B454A8 /* cot in Copy Command-Line Tools */ = {isa = PBXBuildFile; fileRef = 2A94FC781BE2256F00B454A8 /* cot */; }; 2A97849F2034561B00482647 /* WebDocumentWindow.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A97849D2034561B00482647 /* WebDocumentWindow.storyboard */; }; @@ -459,6 +447,8 @@ 2AA7E97E1DBAAC950083B7ED /* Script.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA7E97C1DBAAC950083B7ED /* Script.swift */; }; 2AA86282212ED91400BB75C9 /* NSSplitView+Autosave.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA86281212ED91400BB75C9 /* NSSplitView+Autosave.swift */; }; 2AA86283212ED91400BB75C9 /* NSSplitView+Autosave.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA86281212ED91400BB75C9 /* NSSplitView+Autosave.swift */; }; + 2AAAE6E526DB82F800C5F0AC /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 2AAAE6E426DB82F800C5F0AC /* Sparkle */; }; + 2AAAE6E926DB886F00C5F0AC /* org.sparkle-project.InstallerLauncher.xpc in Embed XPC Services */ = {isa = PBXBuildFile; fileRef = 2AAAE6E826DB87E000C5F0AC /* org.sparkle-project.InstallerLauncher.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 2AAB4BF91D2435AC0049A68B /* DocumentInspectorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAB4BF81D2435AC0049A68B /* DocumentInspectorViewController.swift */; }; 2AAB4BFA1D2435AC0049A68B /* DocumentInspectorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAB4BF81D2435AC0049A68B /* DocumentInspectorViewController.swift */; }; 2AAB4BFC1D2437EA0049A68B /* IncompatibleCharactersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAB4BFB1D2437EA0049A68B /* IncompatibleCharactersViewController.swift */; }; @@ -547,9 +537,6 @@ 2ACC65321C98033D000574DC /* ThemeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ACC65311C98033D000574DC /* ThemeTests.swift */; }; 2ACD02BD22A87EFD00893051 /* ColorCode in Frameworks */ = {isa = PBXBuildFile; productRef = 2ACD02BC22A87EFD00893051 /* ColorCode */; }; 2ACD02BF22A87F0400893051 /* ColorCode in Frameworks */ = {isa = PBXBuildFile; productRef = 2ACD02BE22A87F0400893051 /* ColorCode */; }; - 2ACD681E1D6B0E4500496B47 /* Sparkle.framework.dSYM in Copy dSYM Files */ = {isa = PBXBuildFile; fileRef = 2ACD681D1D6B0E4500496B47 /* Sparkle.framework.dSYM */; }; - 2ACD68251D6B0F0700496B47 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A594C9E1D4BAF100076FEDC /* Sparkle.framework */; }; - 2ACD68301D6B113500496B47 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2A594C9E1D4BAF100076FEDC /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 2ACDC08E1D1725F7009B72D6 /* FlippedClipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ACDC08D1D1725F7009B72D6 /* FlippedClipView.swift */; }; 2ACDC08F1D1725F7009B72D6 /* FlippedClipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ACDC08D1D1725F7009B72D6 /* FlippedClipView.swift */; }; 2ACDC0911D1726BD009B72D6 /* DotView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ACDC0901D1726BD009B72D6 /* DotView.swift */; }; @@ -742,7 +729,7 @@ dstPath = "$(CONTENTS_FOLDER_PATH)/XPCServices"; dstSubfolderSpec = 16; files = ( - 2A9246FF1FCD2D07008DBC30 /* org.sparkle-project.InstallerLauncher.xpc in Embed XPC Services */, + 2AAAE6E926DB886F00C5F0AC /* org.sparkle-project.InstallerLauncher.xpc in Embed XPC Services */, ); name = "Embed XPC Services"; runOnlyForDeploymentPostprocessing = 0; @@ -769,28 +756,6 @@ name = "Copy Command-Line Tools"; runOnlyForDeploymentPostprocessing = 0; }; - 2ACD68151D6B0DCF00496B47 /* Copy dSYM Files */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 16; - files = ( - 2ACD681E1D6B0E4500496B47 /* Sparkle.framework.dSYM in Copy dSYM Files */, - ); - name = "Copy dSYM Files"; - runOnlyForDeploymentPostprocessing = 0; - }; - 2ACD68221D6B0F0100496B47 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 12; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 2ACD68301D6B113500496B47 /* Sparkle.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -1016,7 +981,6 @@ 2A4E637F20ADC45F0033CE63 /* NSBezierPath.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSBezierPath.swift; sourceTree = ""; }; 2A50AA61204D513500D10A10 /* DocumentFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentFile.swift; sourceTree = ""; }; 2A54BE2B1D40EB24000816B0 /* LineEndingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineEndingTests.swift; sourceTree = ""; }; - 2A594C9E1D4BAF100076FEDC /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = ""; }; 2A5ADE831D2168FC00F6CE26 /* Collection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Collection.swift; sourceTree = ""; }; 2A5ADE871D216D4900F6CE26 /* NSColor+NamedColors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSColor+NamedColors.swift"; sourceTree = ""; }; 2A5D13091D1ED10400D38E6A /* Console.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Console.swift; sourceTree = ""; }; @@ -1093,7 +1057,6 @@ 2A6FD9EC1D3A85D700A59784 /* NSString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSString.swift; sourceTree = ""; }; 2A6FD9F21D3ACEB500A59784 /* DefaultKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultKey.swift; sourceTree = ""; }; 2A6FD9F51D3AE29E00A59784 /* SyntaxStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyntaxStyle.swift; sourceTree = ""; }; - 2A706BE9244071FF000D3A64 /* buildSparkle.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = buildSparkle.sh; sourceTree = ""; }; 2A7135821CFFDC6600ADA555 /* FilePermissionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilePermissionTests.swift; sourceTree = ""; }; 2A715E21261AC5960060CF84 /* CotEditor-Sparkle.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "CotEditor-Sparkle.entitlements"; sourceTree = ""; }; 2A719F6523CD92370026F877 /* FuzzyRangeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FuzzyRangeTests.swift; sourceTree = ""; }; @@ -1155,7 +1118,6 @@ 2A91C31A1D1BFE47007CF8BE /* DocumentType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentType.swift; sourceTree = ""; }; 2A91C31D1D1C3963007CF8BE /* PrintPaneController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrintPaneController.swift; sourceTree = ""; }; 2A91C3201D1C40E4007CF8BE /* FileDropPaneController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileDropPaneController.swift; sourceTree = ""; }; - 2A9246FB1FCD2CF0008DBC30 /* org.sparkle-project.InstallerLauncher.xpc */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.xpc-service"; path = "org.sparkle-project.InstallerLauncher.xpc"; sourceTree = ""; }; 2A94FC781BE2256F00B454A8 /* cot */ = {isa = PBXFileReference; explicitFileType = text.script.python; name = cot; path = ../cot/cot; sourceTree = SOURCE_ROOT; }; 2A97849E2034561B00482647 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/WebDocumentWindow.storyboard; sourceTree = ""; }; 2A9AC936244849B700D05643 /* NSLayoutManager+InvisibleDrawing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSLayoutManager+InvisibleDrawing.swift"; sourceTree = ""; }; @@ -1187,6 +1149,7 @@ 2AA79C7721CB7251005AD6AD /* PreferencesWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindow.swift; sourceTree = ""; }; 2AA7E97C1DBAAC950083B7ED /* Script.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Script.swift; sourceTree = ""; }; 2AA86281212ED91400BB75C9 /* NSSplitView+Autosave.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSSplitView+Autosave.swift"; sourceTree = ""; }; + 2AAAE6E826DB87E000C5F0AC /* org.sparkle-project.InstallerLauncher.xpc */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.xpc-service"; name = "org.sparkle-project.InstallerLauncher.xpc"; path = "../../../SourcePackages/artifacts/Sparkle/XPCServices/org.sparkle-project.InstallerLauncher.xpc"; sourceTree = BUILT_PRODUCTS_DIR; }; 2AAB4BF81D2435AC0049A68B /* DocumentInspectorViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentInspectorViewController.swift; sourceTree = ""; }; 2AAB4BFB1D2437EA0049A68B /* IncompatibleCharactersViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IncompatibleCharactersViewController.swift; sourceTree = ""; }; 2AAB4BFE1D2444930049A68B /* SidebarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SidebarViewController.swift; sourceTree = ""; }; @@ -1317,7 +1280,6 @@ 2ACC5E401E7B08D300109ABC /* MultipleReplacementViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MultipleReplacementViewController.swift; sourceTree = ""; }; 2ACC5E491E7B20AA00109ABC /* ThemeMetaDataViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemeMetaDataViewController.swift; sourceTree = ""; }; 2ACC65311C98033D000574DC /* ThemeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemeTests.swift; sourceTree = ""; }; - 2ACD681D1D6B0E4500496B47 /* Sparkle.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; path = Sparkle.framework.dSYM; sourceTree = ""; }; 2ACDC08D1D1725F7009B72D6 /* FlippedClipView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlippedClipView.swift; sourceTree = ""; }; 2ACDC0901D1726BD009B72D6 /* DotView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DotView.swift; sourceTree = ""; }; 2ACDC0961D172B2A009B72D6 /* PaddingTextFieldCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaddingTextFieldCell.swift; sourceTree = ""; }; @@ -1470,7 +1432,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2ACD68251D6B0F0700496B47 /* Sparkle.framework in Frameworks */, + 2AAAE6E526DB82F800C5F0AC /* Sparkle in Frameworks */, 2ACD02BD22A87EFD00893051 /* ColorCode in Frameworks */, 2AA2C6FE24399AA20017D1EC /* Yams in Frameworks */, ); @@ -1850,7 +1812,7 @@ 2AC71DE01BF0BDBC002E1434 /* Tests */, 2A3F18F8203270BE002F1CA7 /* UI Tests */, 2A8544E6267872E0006EF01A /* SyntaxMapBuilder */, - BEED9F89D1E364DD05CA42CB /* Frameworks */, + BEED9F89D1E364DD05CA42CB /* XPCs */, 19C28FB0FE9D524F11CA2CBB /* Products */, ); name = CotEditor; @@ -1878,7 +1840,6 @@ isa = PBXGroup; children = ( 2A3E84821D07331900070A54 /* updateHelpindex.sh */, - 2A706BE9244071FF000D3A64 /* buildSparkle.sh */, ); name = Scripts; sourceTree = ""; @@ -2345,14 +2306,12 @@ path = Configurations; sourceTree = ""; }; - BEED9F89D1E364DD05CA42CB /* Frameworks */ = { + BEED9F89D1E364DD05CA42CB /* XPCs */ = { isa = PBXGroup; children = ( - 2A594C9E1D4BAF100076FEDC /* Sparkle.framework */, - 2A9246FB1FCD2CF0008DBC30 /* org.sparkle-project.InstallerLauncher.xpc */, - 2ACD681D1D6B0E4500496B47 /* Sparkle.framework.dSYM */, + 2AAAE6E826DB87E000C5F0AC /* org.sparkle-project.InstallerLauncher.xpc */, ); - name = Frameworks; + name = XPCs; path = ../Frameworks/Build; sourceTree = ""; }; @@ -2428,9 +2387,7 @@ 8D15AC2B0486D014006FF6A4 /* Resources */, 2A94FC771BE2253500B454A8 /* Copy Command-Line Tools */, 8D15AC330486D014006FF6A4 /* Frameworks */, - 2ACD68221D6B0F0100496B47 /* Embed Frameworks */, 2A9246F51FCD21E6008DBC30 /* Embed XPC Services */, - 2ACD68151D6B0DCF00496B47 /* Copy dSYM Files */, ); buildRules = ( ); @@ -2441,6 +2398,7 @@ packageProductDependencies = ( 2ACD02BC22A87EFD00893051 /* ColorCode */, 2AA2C6FD24399AA20017D1EC /* Yams */, + 2AAAE6E426DB82F800C5F0AC /* Sparkle */, ); productInstallPath = "$(HOME)/Applications"; productName = CotEditor; @@ -2479,10 +2437,6 @@ }; }; }; - 2A9246E71FCD2004008DBC30 = { - CreatedOnToolsVersion = 9.1; - ProvisioningStyle = Automatic; - }; 2AC71DDE1BF0BDBC002E1434 = { CreatedOnToolsVersion = 7.1; LastSwiftMigration = 0900; @@ -2522,6 +2476,7 @@ packageReferences = ( 2ACD02BB22A87CED00893051 /* XCRemoteSwiftPackageReference "WFColorCode" */, 2AA2C6FA24399A920017D1EC /* XCRemoteSwiftPackageReference "Yams" */, + 2AAAE6E326DB82F800C5F0AC /* XCRemoteSwiftPackageReference "Sparkle" */, ); projectDirPath = ""; projectRoot = ""; @@ -2531,7 +2486,6 @@ 2AC71DDE1BF0BDBC002E1434 /* Tests */, 2A3F18F6203270BE002F1CA7 /* UI Tests */, 2A3E847D1D07296200070A54 /* Update Help Index */, - 2A9246E71FCD2004008DBC30 /* Sparkle */, ); }; /* End PBXProject section */ @@ -2738,21 +2692,6 @@ shellPath = /bin/sh; shellScript = "\"${BUILT_PRODUCTS_DIR}/SyntaxMapBuilder\" \"${SCRIPT_INPUT_FILE_0}\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; }; - 2A9246EB1FCD2012008DBC30 /* Build Sparkle */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/../Frameworks/Sparkle", - ); - name = "Build Sparkle"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "./buildSparkle.sh ${SCRIPT_INPUT_FILE_0} ${DERIVED_FILES_DIR}\n"; - }; 2ACC21B81E5445BA0078241F /* Lint Swift Code */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -4160,20 +4099,6 @@ }; name = Release; }; - 2A9246E81FCD2005008DBC30 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 2A9246E91FCD2005008DBC30 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; 2AC71DE61BF0BDBC002E1434 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 5454B92C243C8257009275BC /* Tests.xcconfig */; @@ -4387,15 +4312,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2A9246EA1FCD200A008DBC30 /* Build configuration list for PBXAggregateTarget "Sparkle" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2A9246E81FCD2005008DBC30 /* Debug */, - 2A9246E91FCD2005008DBC30 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 2AC71DE81BF0BDBC002E1434 /* Build configuration list for PBXNativeTarget "Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -4434,6 +4350,14 @@ minimumVersion = 4.0.0; }; }; + 2AAAE6E326DB82F800C5F0AC /* XCRemoteSwiftPackageReference "Sparkle" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/sparkle-project/Sparkle"; + requirement = { + branch = 2.x; + kind = branch; + }; + }; 2ACD02BB22A87CED00893051 /* XCRemoteSwiftPackageReference "WFColorCode" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/1024jp/WFColorCode"; @@ -4463,6 +4387,11 @@ package = 2AA2C6FA24399A920017D1EC /* XCRemoteSwiftPackageReference "Yams" */; productName = Yams; }; + 2AAAE6E426DB82F800C5F0AC /* Sparkle */ = { + isa = XCSwiftPackageProductDependency; + package = 2AAAE6E326DB82F800C5F0AC /* XCRemoteSwiftPackageReference "Sparkle" */; + productName = Sparkle; + }; 2ACD02BC22A87EFD00893051 /* ColorCode */ = { isa = XCSwiftPackageProductDependency; package = 2ACD02BB22A87CED00893051 /* XCRemoteSwiftPackageReference "WFColorCode" */; diff --git a/CotEditor/CotEditor.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme b/CotEditor/CotEditor.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme deleted file mode 100644 index 150614578..000000000 --- a/CotEditor/CotEditor.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CotEditor/buildSparkle.sh b/CotEditor/buildSparkle.sh deleted file mode 100755 index f53c08432..000000000 --- a/CotEditor/buildSparkle.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/zsh - -# buildSparkle.sh -# -# CotEditor -# https://coteditor.com -# -# Created by 1024jp on 2020-04-10. -# -# ------------------------------------------------------------------------------ -# -# Β© 2018-2021 1024jp -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -cd $1 - -derivedData=$2 - -# build Sparkle -echo "πŸ“¦ Building Sparkle" -xcodebuild -scheme Distribution -configuration Release -derivedDataPath $derivedData build - -# copy results to Build/ directory -mkdir -p ../Build -items=( - 'org.sparkle-project.InstallerLauncher.xpc' - 'Sparkle.framework' -) -for item in ${items[@]}; do - file="${derivedData}/Build/Products/Release/${item}" - echo "πŸš› Copying ${item}..." - rm -r ../Build/${item} - cp -R ${file}* ../Build -done - -# remove duplicated items in Sparkle.framework -cd ../Build -rm -f Sparkle.framework/Autoupdate -rm -f Sparkle.framework/Updater -rm -f Sparkle.framework/Versions/A/Autoupdate -rm -rf Sparkle.framework/Versions/A/Updater.app -codesign -f -s "-" Sparkle.framework -codesign --verify --deep Sparkle.framework diff --git a/Frameworks/Sparkle b/Frameworks/Sparkle deleted file mode 160000 index 119766a65..000000000 --- a/Frameworks/Sparkle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 119766a650672e81a8ae9fa399bf20ee32ed7f51 diff --git a/README.md b/README.md index 182a2f6b3..13a782c39 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,6 @@ For those people who just want to build and play with CotEditor locally. 1. Run following commands to resolve dependencies. - `git submodule update --init --recursive` 1. Open `CotEditor.xcworkspace` in Xcode. -1. Run "Sparkle" scheme in CotEditor.xcworkspace 1. Build "CotEditor" scheme in the workspace.