Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -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"),
Expand Down
16 changes: 0 additions & 16 deletions Sources/XcodeMetadata/LoggerServiceContextKey.swift

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import FileSystem
import Foundation
import Logging
import Mockable
import Path
import ServiceContextModule
import XcodeGraph

// MARK: - Provider Errors
Expand Down Expand Up @@ -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()
}

Expand Down Expand Up @@ -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"
)
Expand Down
1 change: 0 additions & 1 deletion Tests/XcodeGraphMapperTests/Mocks/AssertionsTesting.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Foundation
import Path
import ServiceContextModule
import Testing

enum AssertionsTesting {
Expand Down
1 change: 0 additions & 1 deletion Tests/XcodeMetadataTests/AssertionsTesting.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Foundation
import Path
import ServiceContextModule
import Testing

enum AssertionsTesting {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Path
import ServiceContextModule
import Testing
import XcodeGraph
@testable import XcodeMetadata
Expand Down