From 2bd50e1c191229adadcc860971aa3fe37720dc7b Mon Sep 17 00:00:00 2001 From: Bartosz Polaczyk Date: Tue, 7 Jun 2022 08:19:36 -0400 Subject: [PATCH] Delete old override for .h --- .../XCRemoteCache/Commands/Postbuild/Postbuild.swift | 4 ++++ .../Dependencies/FingerprintSyncer.swift | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/Sources/XCRemoteCache/Commands/Postbuild/Postbuild.swift b/Sources/XCRemoteCache/Commands/Postbuild/Postbuild.swift index 00150cd..4c56246 100644 --- a/Sources/XCRemoteCache/Commands/Postbuild/Postbuild.swift +++ b/Sources/XCRemoteCache/Commands/Postbuild/Postbuild.swift @@ -259,6 +259,10 @@ class Postbuild { } } else { try fingerprintSyncer.delete(sourceDir: moduleSwiftProductURL) + try fingerprintSyncer.delete(sourceDir: objcHeaderSwiftProductURL) + if let objcPublic = objcHeaderSwiftPublicPathURL { + try fingerprintSyncer.delete(sourceDir: objcPublic) + } } } } diff --git a/Sources/XCRemoteCache/Dependencies/FingerprintSyncer.swift b/Sources/XCRemoteCache/Dependencies/FingerprintSyncer.swift index f37898c..b6c5857 100644 --- a/Sources/XCRemoteCache/Dependencies/FingerprintSyncer.swift +++ b/Sources/XCRemoteCache/Dependencies/FingerprintSyncer.swift @@ -32,6 +32,8 @@ protocol FingerprintSyncer { func delete(sourceDir: URL) throws /// Sets a fingerprint override for a singe file placed func decorate(file: URL, fingerprint: String) throws + /// Deletes fingerprint override for a file (if already created) + func delete(file: URL) throws } class FileFingerprintSyncer: FingerprintSyncer { @@ -88,4 +90,13 @@ class FileFingerprintSyncer: FingerprintSyncer { let fingerprintFile = file.appendingPathExtension(fingerprintExtension) try dirAccessor.write(toPath: fingerprintFile.path, contents: fingerprintData) } + + func delete(file: URL) throws { + guard case .file = try dirAccessor.itemType(atPath: file.path) else { + // no file to decorate (no module was generated) + return + } + let overrideURL = file.appendingPathExtension(fingerprintExtension) + try dirAccessor.removeItem(atPath: overrideURL.path) + } }