From c84b1286a06812c635ce5c6f4f17486c35b0f9f4 Mon Sep 17 00:00:00 2001 From: Pedro Date: Tue, 20 May 2025 16:28:00 +0200 Subject: [PATCH 1/2] Remove ServiceContextModule dependency --- Package.resolved | 31 ++++++++++++------- Package.swift | 2 -- .../LoggerServiceContextKey.swift | 16 ---------- .../XCFrameworkMetadataProvider.swift | 9 ++++-- .../Mocks/AssertionsTesting.swift | 1 - .../AssertionsTesting.swift | 1 - .../XCFrameworkMetadataProviderTests.swift | 1 - 7 files changed, 26 insertions(+), 35 deletions(-) delete mode 100644 Sources/XcodeMetadata/LoggerServiceContextKey.swift diff --git a/Package.resolved b/Package.resolved index 363cdd53..5472260a 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "d4f68e752993519aee6ad2c355139fa210271f229b5503b0a029f07f61d7b15c", + "originHash" : "81601743f024016fa9ffed7e529536371c1454a0d1da820033e0a40acbd8b2fe", "pins" : [ { "identity" : "aexml", @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/tuist/FileSystem.git", "state" : { - "revision" : "eb33ba606c2d988a6f7247e3fc23faa681d75028", - "version" : "0.7.16" + "revision" : "f59c05363f2968d734d4901b011b1264eb82f6b5", + "version" : "0.9.2" } }, { @@ -42,8 +42,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/p-x9/MachOKit", "state" : { - "revision" : "62d22e1ecef3dda702c039f03dd83f674ad59bfc", - "version" : "0.30.0" + "revision" : "b4b752d9d2cf3975ee05620c66284a3414fcf56e", + "version" : "0.32.0" } }, { @@ -51,8 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Kolos65/Mockable.git", "state" : { - "revision" : "68f3ed6c4b62afab27a84425494cb61421a61ac1", - "version" : "0.3.1" + "revision" : "118a0b8934e585b80952586db30bcb72aef45a74", + "version" : "0.3.2" } }, { @@ -118,6 +118,15 @@ "version" : "1.0.0" } }, + { + "identity" : "swift-fileio", + "kind" : "remoteSourceControl", + "location" : "https://github.com/p-x9/swift-fileio.git", + "state" : { + "revision" : "23349fe1eb23c6ca2876d461a46ff60c0fa92f9c", + "version" : "0.9.0" + } + }, { "identity" : "swift-log", "kind" : "remoteSourceControl", @@ -132,8 +141,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio", "state" : { - "revision" : "0f54d58bb5db9e064f332e8524150de379d1e51c", - "version" : "2.82.1" + "revision" : "34d486b01cd891297ac615e40d5999536a1e138d", + "version" : "2.83.0" } }, { @@ -168,8 +177,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/tuist/XcodeProj", "state" : { - "revision" : "128d90e4633a8e6941586dea75426e177dfb92e6", - "version" : "9.0.0" + "revision" : "6783abd2ec171e254f3d4aedb2efa1cc73fea414", + "version" : "9.4.1" } }, { diff --git a/Package.swift b/Package.swift index 0ef5b6b5..9fc5577d 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,6 @@ let targets: [Target] = [ .target( name: "XcodeMetadata", dependencies: [ - .product(name: "ServiceContextModule", package: "swift-service-context"), .product(name: "FileSystem", package: "FileSystem"), .product(name: "Mockable", package: "Mockable"), .product(name: "MachOKitC", package: "MachOKit"), @@ -83,7 +82,6 @@ let package = Package( .package(url: "https://github.com/tuist/XcodeProj", .upToNextMajor(from: "9.4.1")), .package(url: "https://github.com/tuist/Command.git", from: "0.13.0"), .package(url: "https://github.com/tuist/FileSystem.git", .upToNextMajor(from: "0.9.2")), - .package(url: "https://github.com/apple/swift-service-context", .upToNextMajor(from: "1.2.0")), .package(url: "https://github.com/Kolos65/Mockable.git", .upToNextMajor(from: "0.3.2")), .package(url: "https://github.com/p-x9/MachOKit", .upToNextMajor(from: "0.32.0")), .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.4.3"), diff --git a/Sources/XcodeMetadata/LoggerServiceContextKey.swift b/Sources/XcodeMetadata/LoggerServiceContextKey.swift deleted file mode 100644 index 6d17f7f3..00000000 --- a/Sources/XcodeMetadata/LoggerServiceContextKey.swift +++ /dev/null @@ -1,16 +0,0 @@ -import Logging -import ServiceContextModule - -private enum LoggerServiceContextKey: ServiceContextKey { - typealias Value = Logger -} - -extension ServiceContext { - var logger: Logger? { - get { - self[LoggerServiceContextKey.self] - } set { - self[LoggerServiceContextKey.self] = newValue - } - } -} diff --git a/Sources/XcodeMetadata/Providers/XCFrameworkMetadataProvider.swift b/Sources/XcodeMetadata/Providers/XCFrameworkMetadataProvider.swift index da38de01..df3c0f8b 100644 --- a/Sources/XcodeMetadata/Providers/XCFrameworkMetadataProvider.swift +++ b/Sources/XcodeMetadata/Providers/XCFrameworkMetadataProvider.swift @@ -2,8 +2,8 @@ import FileSystem import Foundation import Mockable import Path -import ServiceContextModule import XcodeGraph +import Logging // MARK: - Provider Errors @@ -65,11 +65,14 @@ public final class XCFrameworkMetadataProvider: PrecompiledMetadataProvider, XCFrameworkMetadataProviding { private let fileSystem: FileSysteming + private let logger: Logger? public init( - fileSystem: FileSysteming = FileSystem() + fileSystem: FileSysteming = FileSystem(), + logger: Logger? = nil ) { self.fileSystem = fileSystem + self.logger = logger super.init() } @@ -184,7 +187,7 @@ public final class XCFrameworkMetadataProvider: PrecompiledMetadataProvider, let relativeArchitectureBinaryPath = binaryPath.components.suffix(3).joined( separator: "/" ) - ServiceContext.current?.logger? + logger? .warning( "\(xcframeworkPath.basename) is missing architecture \(relativeArchitectureBinaryPath) defined in the Info.plist" ) diff --git a/Tests/XcodeGraphMapperTests/Mocks/AssertionsTesting.swift b/Tests/XcodeGraphMapperTests/Mocks/AssertionsTesting.swift index 0b0ece2d..a2d961a7 100644 --- a/Tests/XcodeGraphMapperTests/Mocks/AssertionsTesting.swift +++ b/Tests/XcodeGraphMapperTests/Mocks/AssertionsTesting.swift @@ -1,6 +1,5 @@ import Foundation import Path -import ServiceContextModule import Testing enum AssertionsTesting { diff --git a/Tests/XcodeMetadataTests/AssertionsTesting.swift b/Tests/XcodeMetadataTests/AssertionsTesting.swift index d2f75e87..978f2d63 100644 --- a/Tests/XcodeMetadataTests/AssertionsTesting.swift +++ b/Tests/XcodeMetadataTests/AssertionsTesting.swift @@ -1,6 +1,5 @@ import Foundation import Path -import ServiceContextModule import Testing enum AssertionsTesting { diff --git a/Tests/XcodeMetadataTests/XCFrameworkMetadataProviderTests.swift b/Tests/XcodeMetadataTests/XCFrameworkMetadataProviderTests.swift index 15390de0..ce11fa77 100644 --- a/Tests/XcodeMetadataTests/XCFrameworkMetadataProviderTests.swift +++ b/Tests/XcodeMetadataTests/XCFrameworkMetadataProviderTests.swift @@ -1,5 +1,4 @@ import Path -import ServiceContextModule import Testing import XcodeGraph @testable import XcodeMetadata From a7486c15dbdd2b56995c43d558e0c6d56ab0773a Mon Sep 17 00:00:00 2001 From: Pedro Date: Tue, 20 May 2025 16:30:15 +0200 Subject: [PATCH 2/2] Fix linting issue --- .../XcodeMetadata/Providers/XCFrameworkMetadataProvider.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/XcodeMetadata/Providers/XCFrameworkMetadataProvider.swift b/Sources/XcodeMetadata/Providers/XCFrameworkMetadataProvider.swift index df3c0f8b..ee954f25 100644 --- a/Sources/XcodeMetadata/Providers/XCFrameworkMetadataProvider.swift +++ b/Sources/XcodeMetadata/Providers/XCFrameworkMetadataProvider.swift @@ -1,9 +1,9 @@ import FileSystem import Foundation +import Logging import Mockable import Path import XcodeGraph -import Logging // MARK: - Provider Errors