diff --git a/Brewfile b/Brewfile index 61f7eeb..0afd05f 100644 --- a/Brewfile +++ b/Brewfile @@ -1,5 +1,3 @@ -brew "carthage" -brew "make" brew "shfmt" brew "swift-format" brew "swiftformat" diff --git a/Brewfile.lock.json b/Brewfile.lock.json index 796e61a..8d0927d 100644 --- a/Brewfile.lock.json +++ b/Brewfile.lock.json @@ -1,69 +1,6 @@ { "entries": { "brew": { - "carthage": { - "version": "0.37.0", - "bottle": { - "rebuild": 0, - "root_url": "https://ghcr.io/v2/homebrew/core", - "files": { - "arm64_big_sur": { - "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/carthage/blobs/sha256:cd0c716682b5b094b82a589fb79def4eb696f70a3fd92423923a5cb86c2c79b3", - "sha256": "cd0c716682b5b094b82a589fb79def4eb696f70a3fd92423923a5cb86c2c79b3" - }, - "big_sur": { - "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/carthage/blobs/sha256:0770b4dd885f3018031c2d27fc090a34027d5856a248f33fa2a415d58da74632", - "sha256": "0770b4dd885f3018031c2d27fc090a34027d5856a248f33fa2a415d58da74632" - }, - "catalina": { - "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/carthage/blobs/sha256:8a07c198835cb179d4054313b199ce126e64bb9414eaaa91f55162a4aed63134", - "sha256": "8a07c198835cb179d4054313b199ce126e64bb9414eaaa91f55162a4aed63134" - }, - "mojave": { - "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/carthage/blobs/sha256:7fb777ac169aa4cb05683f0f8bfb5b56dbb0b0e8b673df995ef2fb2bbe0d90d2", - "sha256": "7fb777ac169aa4cb05683f0f8bfb5b56dbb0b0e8b673df995ef2fb2bbe0d90d2" - } - } - } - }, - "make": { - "version": "4.3", - "bottle": { - "rebuild": 1, - "root_url": "https://ghcr.io/v2/homebrew/core", - "files": { - "arm64_big_sur": { - "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/make/blobs/sha256:eab3fbc3688aecec0fe90b8d0fe3cb7beb84ed773ba0411fc2f855c66deaf882", - "sha256": "eab3fbc3688aecec0fe90b8d0fe3cb7beb84ed773ba0411fc2f855c66deaf882" - }, - "big_sur": { - "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/make/blobs/sha256:2019ba646e4471d42e09c28a0992c59dd82e292bf8275b0b3bfcce3220ef9c1b", - "sha256": "2019ba646e4471d42e09c28a0992c59dd82e292bf8275b0b3bfcce3220ef9c1b" - }, - "catalina": { - "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/make/blobs/sha256:39fc5ebff5ff708c2e3eea597b9f2eb79b910a122d30c3ac9bb93ebe313f030c", - "sha256": "39fc5ebff5ff708c2e3eea597b9f2eb79b910a122d30c3ac9bb93ebe313f030c" - }, - "mojave": { - "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/make/blobs/sha256:0c0a08eef68bcd78b0345f5f57a6efffcc7be877bcb3b803f39ac8916b882477", - "sha256": "0c0a08eef68bcd78b0345f5f57a6efffcc7be877bcb3b803f39ac8916b882477" - }, - "high_sierra": { - "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/make/blobs/sha256:429177235322c3209e1657bea36364cd84222075b636939f6ed93a1cd04aeb21", - "sha256": "429177235322c3209e1657bea36364cd84222075b636939f6ed93a1cd04aeb21" - } - } - } - }, "shfmt": { "version": "3.2.4", "bottle": { diff --git a/Cartfile b/Cartfile deleted file mode 100644 index 2e93317..0000000 --- a/Cartfile +++ /dev/null @@ -1 +0,0 @@ -github "Carthage/Commandant" diff --git a/Cartfile.private b/Cartfile.private deleted file mode 100644 index e95f845..0000000 --- a/Cartfile.private +++ /dev/null @@ -1,2 +0,0 @@ -github "Quick/Quick" -github "Quick/Nimble" \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index c2e80d1..0000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,3 +0,0 @@ -github "Carthage/Commandant" "0.18.0" -github "Quick/Nimble" "v9.0.1" -github "Quick/Quick" "v3.1.2" diff --git a/Homebrew/mas-tap.rb b/Homebrew/mas-tap.rb index 68bd669..29eace2 100644 --- a/Homebrew/mas-tap.rb +++ b/Homebrew/mas-tap.rb @@ -18,7 +18,6 @@ class Mas < Formula sha256 cellar: :any, el_capitan: "d54d864976f78665d5175fd9e69ab81b3911fa28fd6ae627b61a18d55d68191a" end - depends_on "carthage" => :build depends_on :macos if Hardware::CPU.arm? depends_on xcode: ["12.2", :build] @@ -37,8 +36,6 @@ class Mas < Formula EOS ENV["XCODE_XCCONFIG_FILE"] = xcconfig - # Only build necessary dependencies - system "carthage", "bootstrap", "--platform", "macOS", "Commandant" system "script/install", prefix bash_completion.install "contrib/completion/mas-completion.bash" => "mas" diff --git a/Homebrew/mas.rb b/Homebrew/mas.rb index 232ad87..3fd47ca 100644 --- a/Homebrew/mas.rb +++ b/Homebrew/mas.rb @@ -13,7 +13,6 @@ class Mas < Formula sha256 cellar: :any, catalina: "2e7ffedf674543f98c2b95868b6a23db208cb2e6a3ec1ddbb3553ddab0cf9a68" end - depends_on "carthage" => :build depends_on :macos if Hardware::CPU.arm? depends_on xcode: ["12.2", :build] @@ -32,8 +31,6 @@ class Mas < Formula EOS ENV["XCODE_XCCONFIG_FILE"] = xcconfig - # Only build necessary dependencies - system "carthage", "bootstrap", "--platform", "macOS", "Commandant" system "script/install", prefix bash_completion.install "contrib/completion/mas-completion.bash" => "mas" diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index ea3e8b0..30a3380 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -9,14 +9,8 @@ /* Begin PBXBuildFile section */ 60D8CF3624262F92005B4004 /* PurchaseCommandSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60D8CF3524262F92005B4004 /* PurchaseCommandSpec.swift */; }; 75FB3E761F9F7841005B6F20 /* Purchase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75FB3E751F9F7841005B6F20 /* Purchase.swift */; }; - B537017421A0F85B00538F78 /* Commandant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90CB406B213F4DDD0044E445 /* Commandant.framework */; }; - B537017621A0F94200538F78 /* Commandant.framework in Copy Carthage Frameworks */ = {isa = PBXBuildFile; fileRef = 90CB406B213F4DDD0044E445 /* Commandant.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B5552928219A1BB900ACB4CA /* CommerceKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F83213A62173EF75008BA8A0 /* CommerceKit.framework */; }; B5552929219A1BC700ACB4CA /* StoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F83213A52173EF75008BA8A0 /* StoreFoundation.framework */; }; - B555292E219A218E00ACB4CA /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90CB406A213F4DDD0044E445 /* Quick.framework */; }; - B555292F219A219100ACB4CA /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90CB406C213F4DDD0044E445 /* Nimble.framework */; }; - B5552936219A23FF00ACB4CA /* Nimble.framework in Copy Carthage Frameworks */ = {isa = PBXBuildFile; fileRef = 90CB406C213F4DDD0044E445 /* Nimble.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - B5552937219A23FF00ACB4CA /* Quick.framework in Copy Carthage Frameworks */ = {isa = PBXBuildFile; fileRef = 90CB406A213F4DDD0044E445 /* Quick.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B55B3D9221ED9B8C0009A1A5 /* SearchResultFormatterSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55B3D9121ED9B8C0009A1A5 /* SearchResultFormatterSpec.swift */; }; B576FDF321E03B780016B39D /* MasStoreSearchSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FDF221E03B780016B39D /* MasStoreSearchSpec.swift */; }; B576FDF521E1078F0016B39D /* MASErrorTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FDF421E1078F0016B39D /* MASErrorTestCase.swift */; }; @@ -28,6 +22,7 @@ B576FE0021E113610016B39D /* NetworkSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FDFF21E113610016B39D /* NetworkSession.swift */; }; B576FE0221E1139E0016B39D /* URLSession+NetworkSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE0121E1139E0016B39D /* URLSession+NetworkSession.swift */; }; B576FE0421E113E90016B39D /* NetworkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE0321E113E90016B39D /* NetworkManager.swift */; }; + B576FE0821E114A80016B39D /* NetworkResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE0721E114A80016B39D /* NetworkResult.swift */; }; B576FE0C21E116590016B39D /* NetworkManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE0B21E116590016B39D /* NetworkManagerTests.swift */; }; B576FE0E21E1D6310016B39D /* String+PercentEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE0D21E1D6310016B39D /* String+PercentEncoding.swift */; }; B576FE1221E1D82D0016B39D /* NetworkSessionMockFromFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE1121E1D82D0016B39D /* NetworkSessionMockFromFile.swift */; }; @@ -35,6 +30,7 @@ B576FE1621E1D8CB0016B39D /* String+FileExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE1521E1D8CB0016B39D /* String+FileExtension.swift */; }; B576FE1B21E28E8A0016B39D /* NetworkSessionMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE1A21E28E8A0016B39D /* NetworkSessionMock.swift */; }; B576FE1D21E28EF70016B39D /* URLSessionDataTaskMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE1C21E28EF70016B39D /* URLSessionDataTaskMock.swift */; }; + B576FE2821E423E60016B39D /* Dictionary+StringOrEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE2721E423E60016B39D /* Dictionary+StringOrEmpty.swift */; }; B576FE2A21E4240B0016B39D /* AppInfoFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE2921E4240B0016B39D /* AppInfoFormatter.swift */; }; B576FE2C21E42A230016B39D /* OutputListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE2B21E42A230016B39D /* OutputListener.swift */; }; B576FE2E21E5A8010016B39D /* Strongify.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE2D21E5A8010016B39D /* Strongify.swift */; }; @@ -75,7 +71,10 @@ B5DBF81321DEEC7C00F3B151 /* OpenCommandSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBF81221DEEC7C00F3B151 /* OpenCommandSpec.swift */; }; B5DBF81521E02BA900F3B151 /* StoreSearchMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBF81421E02BA900F3B151 /* StoreSearchMock.swift */; }; B5DBF81721E02E3400F3B151 /* OpenSystemCommandMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBF81621E02E3400F3B151 /* OpenSystemCommandMock.swift */; }; - C56C4FF5262A50F5004F37EB /* Version in Frameworks */ = {isa = PBXBuildFile; productRef = C56C4FF4262A50F5004F37EB /* Version */; }; + C56F16D226376B3800EAC548 /* Nimble in Frameworks */ = {isa = PBXBuildFile; productRef = C56F16D126376B3800EAC548 /* Nimble */; }; + C56F16DA26376C4B00EAC548 /* Quick in Frameworks */ = {isa = PBXBuildFile; productRef = C56F16D926376C4B00EAC548 /* Quick */; }; + C56F16E92637C2B300EAC548 /* Version in Frameworks */ = {isa = PBXBuildFile; productRef = C56F16E82637C2B300EAC548 /* Version */; }; + C56F16EC2637C2C600EAC548 /* Commandant in Frameworks */ = {isa = PBXBuildFile; productRef = C56F16EB2637C2C600EAC548 /* Commandant */; }; ED031A7C1B5127C00097692E /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED031A7B1B5127C00097692E /* main.swift */; }; F80B27B62611116A00A285C9 /* AppListFormatterSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80B27B52611116A00A285C9 /* AppListFormatterSpec.swift */; }; F80B27BA2611118E00A285C9 /* AppListFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80B27B92611118E00A285C9 /* AppListFormatter.swift */; }; @@ -85,24 +84,26 @@ F832138C2173D3E1008BA8A0 /* CKPurchaseController.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB719D20F2EC4500F56FDC /* CKPurchaseController.h */; }; F832138D2173D3E1008BA8A0 /* CKServiceInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB719E20F2EC4500F56FDC /* CKServiceInterface.h */; }; F832138E2173D3E1008BA8A0 /* CKSoftwareMap.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB719F20F2EC4500F56FDC /* CKSoftwareMap.h */; }; + F832138F2173D3E1008BA8A0 /* CKUpdateController.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71A020F2EC4500F56FDC /* CKUpdateController.h */; }; + F83213902173D3E1008BA8A0 /* ISStoreURLOperationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71A120F2EC4500F56FDC /* ISStoreURLOperationDelegate.h */; }; F83213912173D3E1008BA8A0 /* CKDownloadDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71B620F2F87300F56FDC /* CKDownloadDirectory.h */; }; F83213922173D5AB008BA8A0 /* CKSoftwareProduct.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71A320F2EC4500F56FDC /* CKSoftwareProduct.h */; }; F83213932173D5AB008BA8A0 /* CKUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71A420F2EC4500F56FDC /* CKUpdate.h */; }; F83213942173D5AB008BA8A0 /* ISAccountService.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71A520F2EC4500F56FDC /* ISAccountService.h */; }; F83213952173D5AB008BA8A0 /* ISAuthenticationContext.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71A620F2EC4500F56FDC /* ISAuthenticationContext.h */; }; + F83213962173D5AB008BA8A0 /* ISOperationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71A720F2EC4500F56FDC /* ISOperationDelegate.h */; }; F83213972173D5AB008BA8A0 /* ISServiceProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71A820F2EC4500F56FDC /* ISServiceProxy.h */; }; F83213982173D5AB008BA8A0 /* ISServiceRemoteObject.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71A920F2EC4500F56FDC /* ISServiceRemoteObject.h */; }; F83213992173D5AB008BA8A0 /* ISStoreAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71AA20F2EC4500F56FDC /* ISStoreAccount.h */; }; F832139A2173D5AB008BA8A0 /* ISStoreClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71AB20F2EC4500F56FDC /* ISStoreClient.h */; }; + F832139B2173D5AB008BA8A0 /* ISURLOperationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71AC20F2EC4500F56FDC /* ISURLOperationDelegate.h */; }; F832139C2173D5B2008BA8A0 /* SSDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71AD20F2EC4500F56FDC /* SSDownload.h */; }; F832139D2173D5B2008BA8A0 /* SSDownloadMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71AE20F2EC4500F56FDC /* SSDownloadMetadata.h */; }; F832139E2173D5B2008BA8A0 /* SSDownloadPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71AF20F2EC4500F56FDC /* SSDownloadPhase.h */; }; F832139F2173D5B2008BA8A0 /* SSDownloadStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71B020F2EC4500F56FDC /* SSDownloadStatus.h */; }; F83213A02173D5B2008BA8A0 /* SSPurchase.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71B120F2EC4500F56FDC /* SSPurchase.h */; }; F83213A12173D5B2008BA8A0 /* SSPurchaseResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = F8FB71B220F2EC4500F56FDC /* SSPurchaseResponse.h */; }; - F83213A22173DC13008BA8A0 /* Commandant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90CB406B213F4DDD0044E445 /* Commandant.framework */; }; F83213A82173F5A7008BA8A0 /* MasKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8FB715220F2B41400F56FDC /* MasKit.framework */; }; - F83213A92173F5D0008BA8A0 /* Commandant.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 90CB406B213F4DDD0044E445 /* Commandant.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; F85DA8AE240C313900FE5650 /* MasAppLibrarySpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85DA8AD240C313900FE5650 /* MasAppLibrarySpec.swift */; }; F85DA8B0240C32FA00FE5650 /* SoftwareMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85DA8AF240C32FA00FE5650 /* SoftwareMap.swift */; }; F85DA8B2240CBAFE00FE5650 /* CKSoftwareMap+SoftwareMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85DA8B1240CBAFE00FE5650 /* CKSoftwareMap+SoftwareMap.swift */; }; @@ -160,19 +161,6 @@ name = "Copy Debugging Symbols"; runOnlyForDeploymentPostprocessing = 0; }; - B5552935219A23EE00ACB4CA /* Copy Carthage Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - B537017621A0F94200538F78 /* Commandant.framework in Copy Carthage Frameworks */, - B5552936219A23FF00ACB4CA /* Nimble.framework in Copy Carthage Frameworks */, - B5552937219A23FF00ACB4CA /* Quick.framework in Copy Carthage Frameworks */, - ); - name = "Copy Carthage Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; ED031A761B5127C00097692E /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -182,17 +170,6 @@ ); runOnlyForDeploymentPostprocessing = 1; }; - F83213A72173F58B008BA8A0 /* Copy Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - F83213A92173F5D0008BA8A0 /* Commandant.framework in Copy Frameworks */, - ); - name = "Copy Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -201,9 +178,6 @@ 75FB3E751F9F7841005B6F20 /* Purchase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Purchase.swift; sourceTree = ""; }; 8078FAA71EC4F2FB004B5B3F /* Lucky.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Lucky.swift; sourceTree = ""; }; 900A1E801DBAC8CB0069B1A8 /* Info.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Info.swift; sourceTree = ""; }; - 90CB406A213F4DDD0044E445 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Quick.framework; sourceTree = ""; }; - 90CB406B213F4DDD0044E445 /* Commandant.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Commandant.framework; sourceTree = ""; }; - 90CB406C213F4DDD0044E445 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Nimble.framework; sourceTree = ""; }; B55B3D9121ED9B8C0009A1A5 /* SearchResultFormatterSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultFormatterSpec.swift; sourceTree = ""; }; B576FDF221E03B780016B39D /* MasStoreSearchSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MasStoreSearchSpec.swift; sourceTree = ""; }; B576FDF421E1078F0016B39D /* MASErrorTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MASErrorTestCase.swift; sourceTree = ""; }; @@ -214,6 +188,7 @@ B576FDFF21E113610016B39D /* NetworkSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkSession.swift; sourceTree = ""; }; B576FE0121E1139E0016B39D /* URLSession+NetworkSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLSession+NetworkSession.swift"; sourceTree = ""; }; B576FE0321E113E90016B39D /* NetworkManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkManager.swift; sourceTree = ""; }; + B576FE0721E114A80016B39D /* NetworkResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkResult.swift; sourceTree = ""; }; B576FE0B21E116590016B39D /* NetworkManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkManagerTests.swift; sourceTree = ""; }; B576FE0D21E1D6310016B39D /* String+PercentEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+PercentEncoding.swift"; sourceTree = ""; }; B576FE1121E1D82D0016B39D /* NetworkSessionMockFromFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkSessionMockFromFile.swift; sourceTree = ""; }; @@ -221,6 +196,7 @@ B576FE1521E1D8CB0016B39D /* String+FileExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+FileExtension.swift"; sourceTree = ""; }; B576FE1A21E28E8A0016B39D /* NetworkSessionMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkSessionMock.swift; sourceTree = ""; }; B576FE1C21E28EF70016B39D /* URLSessionDataTaskMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLSessionDataTaskMock.swift; sourceTree = ""; }; + B576FE2721E423E60016B39D /* Dictionary+StringOrEmpty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Dictionary+StringOrEmpty.swift"; sourceTree = ""; }; B576FE2921E4240B0016B39D /* AppInfoFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppInfoFormatter.swift; sourceTree = ""; }; B576FE2B21E42A230016B39D /* OutputListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutputListener.swift; sourceTree = ""; }; B576FE2D21E5A8010016B39D /* Strongify.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Strongify.swift; sourceTree = ""; }; @@ -283,6 +259,7 @@ F80B27B52611116A00A285C9 /* AppListFormatterSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppListFormatterSpec.swift; sourceTree = ""; }; F80B27B92611118E00A285C9 /* AppListFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppListFormatter.swift; sourceTree = ""; }; F8242D8020746A510026DF35 /* StoreAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoreAccount.swift; sourceTree = ""; }; + F83213A42173EF75008BA8A0 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; F83213A52173EF75008BA8A0 /* StoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreFoundation.framework; path = /System/Library/PrivateFrameworks/StoreFoundation.framework; sourceTree = ""; }; F83213A62173EF75008BA8A0 /* CommerceKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CommerceKit.framework; path = /System/Library/PrivateFrameworks/CommerceKit.framework; sourceTree = ""; }; F85DA8AD240C313900FE5650 /* MasAppLibrarySpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasAppLibrarySpec.swift; sourceTree = ""; }; @@ -301,14 +278,18 @@ F8FB719D20F2EC4500F56FDC /* CKPurchaseController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKPurchaseController.h; sourceTree = ""; }; F8FB719E20F2EC4500F56FDC /* CKServiceInterface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKServiceInterface.h; sourceTree = ""; }; F8FB719F20F2EC4500F56FDC /* CKSoftwareMap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKSoftwareMap.h; sourceTree = ""; }; + F8FB71A020F2EC4500F56FDC /* CKUpdateController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKUpdateController.h; sourceTree = ""; }; + F8FB71A120F2EC4500F56FDC /* ISStoreURLOperationDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ISStoreURLOperationDelegate.h; sourceTree = ""; }; F8FB71A320F2EC4500F56FDC /* CKSoftwareProduct.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKSoftwareProduct.h; sourceTree = ""; }; F8FB71A420F2EC4500F56FDC /* CKUpdate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKUpdate.h; sourceTree = ""; }; F8FB71A520F2EC4500F56FDC /* ISAccountService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ISAccountService.h; sourceTree = ""; }; F8FB71A620F2EC4500F56FDC /* ISAuthenticationContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ISAuthenticationContext.h; sourceTree = ""; }; + F8FB71A720F2EC4500F56FDC /* ISOperationDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ISOperationDelegate.h; sourceTree = ""; }; F8FB71A820F2EC4500F56FDC /* ISServiceProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ISServiceProxy.h; sourceTree = ""; }; F8FB71A920F2EC4500F56FDC /* ISServiceRemoteObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ISServiceRemoteObject.h; sourceTree = ""; }; F8FB71AA20F2EC4500F56FDC /* ISStoreAccount.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ISStoreAccount.h; sourceTree = ""; }; F8FB71AB20F2EC4500F56FDC /* ISStoreClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ISStoreClient.h; sourceTree = ""; }; + F8FB71AC20F2EC4500F56FDC /* ISURLOperationDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ISURLOperationDelegate.h; sourceTree = ""; }; F8FB71AD20F2EC4500F56FDC /* SSDownload.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SSDownload.h; sourceTree = ""; }; F8FB71AE20F2EC4500F56FDC /* SSDownloadMetadata.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SSDownloadMetadata.h; sourceTree = ""; }; F8FB71AF20F2EC4500F56FDC /* SSDownloadPhase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SSDownloadPhase.h; sourceTree = ""; }; @@ -334,8 +315,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F83213A22173DC13008BA8A0 /* Commandant.framework in Frameworks */, - C56C4FF5262A50F5004F37EB /* Version in Frameworks */, + C56F16EC2637C2C600EAC548 /* Commandant in Frameworks */, + C56F16E92637C2B300EAC548 /* Version in Frameworks */, B5552928219A1BB900ACB4CA /* CommerceKit.framework in Frameworks */, B5552929219A1BC700ACB4CA /* StoreFoundation.framework in Frameworks */, ); @@ -345,27 +326,15 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B537017421A0F85B00538F78 /* Commandant.framework in Frameworks */, + C56F16DA26376C4B00EAC548 /* Quick in Frameworks */, + C56F16D226376B3800EAC548 /* Nimble in Frameworks */, F8FB715B20F2B41400F56FDC /* MasKit.framework in Frameworks */, - B555292F219A219100ACB4CA /* Nimble.framework in Frameworks */, - B555292E219A218E00ACB4CA /* Quick.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 90CB4068213F4DDD0044E445 /* Carthage */ = { - isa = PBXGroup; - children = ( - 90CB406B213F4DDD0044E445 /* Commandant.framework */, - 90CB406C213F4DDD0044E445 /* Nimble.framework */, - 90CB406A213F4DDD0044E445 /* Quick.framework */, - ); - name = Carthage; - path = Carthage/Build/Mac; - sourceTree = ""; - }; B55B3D9021ED9B6A0009A1A5 /* Formatters */ = { isa = PBXGroup; children = ( @@ -379,6 +348,7 @@ isa = PBXGroup; children = ( B576FE0321E113E90016B39D /* NetworkManager.swift */, + B576FE0721E114A80016B39D /* NetworkResult.swift */, B576FDFF21E113610016B39D /* NetworkSession.swift */, B576FE0121E1139E0016B39D /* URLSession+NetworkSession.swift */, ); @@ -437,6 +407,7 @@ B576FE1F21E290720016B39D /* Extensions */ = { isa = PBXGroup; children = ( + B576FE2721E423E60016B39D /* Dictionary+StringOrEmpty.swift */, B576FE0D21E1D6310016B39D /* String+PercentEncoding.swift */, ); path = Extensions; @@ -556,7 +527,6 @@ ED031A6F1B5127C00097692E = { isa = PBXGroup; children = ( - 90CB4068213F4DDD0044E445 /* Carthage */, EDFC76381B642A2E00D0DBD7 /* Frameworks */, ED031A7A1B5127C00097692E /* mas */, F8FB715320F2B41400F56FDC /* MasKit */, @@ -626,6 +596,7 @@ EDFC76381B642A2E00D0DBD7 /* Frameworks */ = { isa = PBXGroup; children = ( + F83213A42173EF75008BA8A0 /* Cocoa.framework */, F83213A62173EF75008BA8A0 /* CommerceKit.framework */, F83213A52173EF75008BA8A0 /* StoreFoundation.framework */, ); @@ -689,6 +660,8 @@ F8FB719D20F2EC4500F56FDC /* CKPurchaseController.h */, F8FB719E20F2EC4500F56FDC /* CKServiceInterface.h */, F8FB719F20F2EC4500F56FDC /* CKSoftwareMap.h */, + F8FB71A020F2EC4500F56FDC /* CKUpdateController.h */, + F8FB71A120F2EC4500F56FDC /* ISStoreURLOperationDelegate.h */, F8FB71B320F2EC7900F56FDC /* module.modulemap */, ); path = CommerceKit; @@ -702,10 +675,12 @@ F8FB71A520F2EC4500F56FDC /* ISAccountService.h */, F8FB71A620F2EC4500F56FDC /* ISAuthenticationContext.h */, B578F060224FB5BD00D2086A /* ISAuthenticationResponse.h */, + F8FB71A720F2EC4500F56FDC /* ISOperationDelegate.h */, F8FB71A820F2EC4500F56FDC /* ISServiceProxy.h */, F8FB71A920F2EC4500F56FDC /* ISServiceRemoteObject.h */, F8FB71AA20F2EC4500F56FDC /* ISStoreAccount.h */, F8FB71AB20F2EC4500F56FDC /* ISStoreClient.h */, + F8FB71AC20F2EC4500F56FDC /* ISURLOperationDelegate.h */, F8FB71B420F2EC8800F56FDC /* module.modulemap */, F8FB71AD20F2EC4500F56FDC /* SSDownload.h */, F8FB71AE20F2EC4500F56FDC /* SSDownloadMetadata.h */, @@ -733,13 +708,17 @@ F832138E2173D3E1008BA8A0 /* CKSoftwareMap.h in Headers */, F83213922173D5AB008BA8A0 /* CKSoftwareProduct.h in Headers */, F83213932173D5AB008BA8A0 /* CKUpdate.h in Headers */, + F832138F2173D3E1008BA8A0 /* CKUpdateController.h in Headers */, F83213942173D5AB008BA8A0 /* ISAccountService.h in Headers */, F83213952173D5AB008BA8A0 /* ISAuthenticationContext.h in Headers */, B578F061224FB5BD00D2086A /* ISAuthenticationResponse.h in Headers */, + F83213962173D5AB008BA8A0 /* ISOperationDelegate.h in Headers */, F83213972173D5AB008BA8A0 /* ISServiceProxy.h in Headers */, F83213982173D5AB008BA8A0 /* ISServiceRemoteObject.h in Headers */, F83213992173D5AB008BA8A0 /* ISStoreAccount.h in Headers */, F832139A2173D5AB008BA8A0 /* ISStoreClient.h in Headers */, + F83213902173D3E1008BA8A0 /* ISStoreURLOperationDelegate.h in Headers */, + F832139B2173D5AB008BA8A0 /* ISURLOperationDelegate.h in Headers */, F8FB716220F2B41400F56FDC /* MasKit.h in Headers */, F832139C2173D5B2008BA8A0 /* SSDownload.h in Headers */, F832139D2173D5B2008BA8A0 /* SSDownloadMetadata.h in Headers */, @@ -769,6 +748,8 @@ F83213882173D2EB008BA8A0 /* PBXTargetDependency */, ); name = mas; + packageProductDependencies = ( + ); productName = "mas-cli"; productReference = ED031A781B5127C00097692E /* mas */; productType = "com.apple.product-type.tool"; @@ -781,7 +762,6 @@ F8FB714E20F2B41400F56FDC /* Sources */, B576FE3121E96E6C0016B39D /* 🚨 Lint */, F8FB714F20F2B41400F56FDC /* Frameworks */, - F83213A72173F58B008BA8A0 /* Copy Frameworks */, F8FB715020F2B41400F56FDC /* Resources */, ); buildRules = ( @@ -790,7 +770,8 @@ ); name = MasKit; packageProductDependencies = ( - C56C4FF4262A50F5004F37EB /* Version */, + C56F16E82637C2B300EAC548 /* Version */, + C56F16EB2637C2C600EAC548 /* Commandant */, ); productName = MasKit; productReference = F8FB715220F2B41400F56FDC /* MasKit.framework */; @@ -803,7 +784,6 @@ F8FB715620F2B41400F56FDC /* Sources */, F8FB715720F2B41400F56FDC /* Frameworks */, F8FB715820F2B41400F56FDC /* Resources */, - B5552935219A23EE00ACB4CA /* Copy Carthage Frameworks */, ); buildRules = ( ); @@ -811,6 +791,10 @@ F8FB715D20F2B41400F56FDC /* PBXTargetDependency */, ); name = MasKitTests; + packageProductDependencies = ( + C56F16D126376B3800EAC548 /* Nimble */, + C56F16D926376C4B00EAC548 /* Quick */, + ); productName = MasKitTests; productReference = F8FB715A20F2B41400F56FDC /* MasKitTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -853,7 +837,10 @@ ); mainGroup = ED031A6F1B5127C00097692E; packageReferences = ( - C56C4FF0262A4ED0004F37EB /* XCRemoteSwiftPackageReference "Version" */, + C56F16D026376B3800EAC548 /* XCRemoteSwiftPackageReference "Nimble" */, + C56F16D826376C4B00EAC548 /* XCRemoteSwiftPackageReference "Quick" */, + C56F16E72637C2B300EAC548 /* XCRemoteSwiftPackageReference "Version" */, + C56F16EA2637C2C600EAC548 /* XCRemoteSwiftPackageReference "Commandant" */, ); productRefGroup = ED031A791B5127C00097692E /* Products */; projectDirPath = ""; @@ -930,6 +917,7 @@ B594B12721D5825800F3AC59 /* AppLibrary.swift in Sources */, F85DA8B2240CBAFE00FE5650 /* CKSoftwareMap+SoftwareMap.swift in Sources */, B594B12B21D5837200F3AC59 /* CKSoftwareProduct+SoftwareProduct.swift in Sources */, + B576FE2821E423E60016B39D /* Dictionary+StringOrEmpty.swift in Sources */, F8FB716A20F2B4DD00F56FDC /* Downloader.swift in Sources */, B588CE0221DC89490047D305 /* ExternalCommand.swift in Sources */, B594B14C21D8983700F3AC59 /* Home.swift in Sources */, @@ -942,6 +930,7 @@ F8FB717B20F2B4DD00F56FDC /* MASError.swift in Sources */, B594B15221D89A8B00F3AC59 /* MasStoreSearch.swift in Sources */, B576FE0421E113E90016B39D /* NetworkManager.swift in Sources */, + B576FE0821E114A80016B39D /* NetworkResult.swift in Sources */, B576FE0021E113610016B39D /* NetworkSession.swift in Sources */, B5DBF80D21DEE4E600F3B151 /* Open.swift in Sources */, B576FDF721E107AA0016B39D /* OpenSystemCommand.swift in Sources */, @@ -1160,10 +1149,6 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "mas/mas-Info.plist"; INSTALL_PATH = /bin; @@ -1189,10 +1174,6 @@ CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "mas/mas-Info.plist"; INSTALL_PATH = /bin; @@ -1216,7 +1197,6 @@ F8FB716320F2B41400F56FDC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -1231,10 +1211,7 @@ DYLIB_COMPATIBILITY_VERSION = 7.0; DYLIB_CURRENT_VERSION = 7.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MasKit/SupportingFiles/Info.plist; @@ -1255,7 +1232,6 @@ F8FB716420F2B41400F56FDC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -1270,10 +1246,7 @@ DYLIB_COMPATIBILITY_VERSION = 7.0; DYLIB_CURRENT_VERSION = 7.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MasKit/SupportingFiles/Info.plist; @@ -1306,10 +1279,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MasKitTests/SupportingFiles/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1341,10 +1311,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MasKitTests/SupportingFiles/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1404,7 +1371,23 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - C56C4FF0262A4ED0004F37EB /* XCRemoteSwiftPackageReference "Version" */ = { + C56F16D026376B3800EAC548 /* XCRemoteSwiftPackageReference "Nimble" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Quick/Nimble.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 9.0.1; + }; + }; + C56F16D826376C4B00EAC548 /* XCRemoteSwiftPackageReference "Quick" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Quick/Quick.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 3.1.2; + }; + }; + C56F16E72637C2B300EAC548 /* XCRemoteSwiftPackageReference "Version" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/mxcl/Version.git"; requirement = { @@ -1412,14 +1395,37 @@ minimumVersion = 2.0.0; }; }; + C56F16EA2637C2C600EAC548 /* XCRemoteSwiftPackageReference "Commandant" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Carthage/Commandant.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 0.18.0; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - C56C4FF4262A50F5004F37EB /* Version */ = { + C56F16D126376B3800EAC548 /* Nimble */ = { isa = XCSwiftPackageProductDependency; - package = C56C4FF0262A4ED0004F37EB /* XCRemoteSwiftPackageReference "Version" */; + package = C56F16D026376B3800EAC548 /* XCRemoteSwiftPackageReference "Nimble" */; + productName = Nimble; + }; + C56F16D926376C4B00EAC548 /* Quick */ = { + isa = XCSwiftPackageProductDependency; + package = C56F16D826376C4B00EAC548 /* XCRemoteSwiftPackageReference "Quick" */; + productName = Quick; + }; + C56F16E82637C2B300EAC548 /* Version */ = { + isa = XCSwiftPackageProductDependency; + package = C56F16E72637C2B300EAC548 /* XCRemoteSwiftPackageReference "Version" */; productName = Version; }; + C56F16EB2637C2C600EAC548 /* Commandant */ = { + isa = XCSwiftPackageProductDependency; + package = C56F16EA2637C2C600EAC548 /* XCRemoteSwiftPackageReference "Commandant" */; + productName = Commandant; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = ED031A701B5127C00097692E /* Project object */; diff --git a/mas.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mas.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5c4f7c3..e66dde2 100644 --- a/mas.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/mas.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,6 +1,51 @@ { "object": { "pins": [ + { + "package": "Commandant", + "repositoryURL": "https://github.com/Carthage/Commandant.git", + "state": { + "branch": null, + "revision": "a1671cf728db837cf5ec1980a80d276bbba748f6", + "version": "0.18.0" + } + }, + { + "package": "CwlCatchException", + "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git", + "state": { + "branch": null, + "revision": "f809deb30dc5c9d9b78c872e553261a61177721a", + "version": "2.0.0" + } + }, + { + "package": "CwlPreconditionTesting", + "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git", + "state": { + "branch": null, + "revision": "02b7a39a99c4da27abe03cab2053a9034379639f", + "version": "2.0.0" + } + }, + { + "package": "Nimble", + "repositoryURL": "https://github.com/Quick/Nimble.git", + "state": { + "branch": null, + "revision": "7a54aaf19a8ef16f67787c260fda81ead7ba4d67", + "version": "9.0.1" + } + }, + { + "package": "Quick", + "repositoryURL": "https://github.com/Quick/Quick.git", + "state": { + "branch": null, + "revision": "8cce6acd38f965f5baa3167b939f86500314022b", + "version": "3.1.2" + } + }, { "package": "Version", "repositoryURL": "https://github.com/mxcl/Version.git", diff --git a/script/bootstrap b/script/bootstrap index e14dd62..a0e34f5 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -17,9 +17,6 @@ main() { # Install Homebrew tools rm -f Brewfile.lock.json brew bundle install --no-upgrade --verbose - - # Download and build project dependencies - carthage bootstrap --platform macOS --cache-builds } main diff --git a/script/bottle b/script/bottle index 97e8c0b..f68bb4b 100755 --- a/script/bottle +++ b/script/bottle @@ -65,11 +65,6 @@ if command -v mas >/dev/null; then script/uninstall || true # ignore failure fi -# Purge the Carthage cache to avoid this error from Homebrew sandboxing: -# A shell task (/usr/bin/env git checkout --quiet --force 0.15.0 (launched in /Users/ben/Library/Caches/org.carthage.CarthageKit/dependencies/Commandant)) failed with exit code 128: -# fatal: Unable to create '/Users/ben/Library/Caches/org.carthage.CarthageKit/dependencies/Commandant/./index.lock': Operation not permitted -rm -rf ~/Library/Caches/org.carthage.CarthageKit - ################################################################################ # # Build the formula for the current macOS version and architecture. diff --git a/script/brew_formula_update b/script/brew_formula_update index 2c3d569..dd4db2b 100755 --- a/script/brew_formula_update +++ b/script/brew_formula_update @@ -32,11 +32,6 @@ else REVISION=$(git rev-parse "$VERSION") fi -# Purge the Carthage cache to avoid this error from Homebrew sandboxing: -# A shell task (/usr/bin/env git checkout --quiet --force 0.15.0 (launched in /Users/ben/Library/Caches/org.carthage.CarthageKit/dependencies/Commandant)) failed with exit code 128: -# fatal: Unable to create '/Users/ben/Library/Caches/org.carthage.CarthageKit/dependencies/Commandant/./index.lock': Operation not permitted -rm -rf ~/Library/Caches/org.carthage.CarthageKit - echo "Checking to see if this update can be a simple bump." diff "Homebrew/mas.rb" "$BREW_CORE_PATH/mas.rb" diff --git a/script/brew_release_validate b/script/brew_release_validate index 108a414..bc4f767 100755 --- a/script/brew_release_validate +++ b/script/brew_release_validate @@ -7,11 +7,6 @@ # https://github.com/Homebrew/homebrew-core/blob/master/CONTRIBUTING.md#to-contribute-a-fix-to-the-foo-formula # -# Purge the Carthage cache to avoid this error from Homebrew sandboxing: -# A shell task (/usr/bin/env git checkout --quiet --force 0.15.0 (launched in /Users/ben/Library/Caches/org.carthage.CarthageKit/dependencies/Commandant)) failed with exit code 128: -# fatal: Unable to create '/Users/ben/Library/Caches/org.carthage.CarthageKit/dependencies/Commandant/./index.lock': Operation not permitted -rm -rf ~/Library/Caches/org.carthage.CarthageKit - brew uninstall --force mas brew install --build-from-source mas brew test mas diff --git a/script/build b/script/build index a0b3cba..605027e 100755 --- a/script/build +++ b/script/build @@ -19,11 +19,6 @@ main() { xcodebuild -version script/clean - carthage build \ - --platform macOS \ - --cache-builds \ - --configuration "$CONFIG" - archive } diff --git a/script/clean b/script/clean index 2fbaedb..d083f9f 100755 --- a/script/clean +++ b/script/clean @@ -10,7 +10,6 @@ BUILD_DIR=build INSTALL_DIR=/tmp/mas-cli.dst main() { - rm -rf Carthage/Build rm -rf ${BUILD_DIR:?} rm -rf ${INSTALL_DIR:?} }