From e08b12e62532aee5f9317a3523ff44a0c3fc0f51 Mon Sep 17 00:00:00 2001 From: Alex Guretzki Date: Mon, 10 Feb 2025 13:21:56 +0100 Subject: [PATCH 1/2] removing false duplicates for platform --- Package.resolved | 4 ++-- .../PADPackageFileAnalyzer/SwiftPackageFileAnalyzer.swift | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index 3f6f92d..7e368e4 100644 --- a/Package.resolved +++ b/Package.resolved @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/nicklockwood/SwiftFormat", "state" : { - "revision" : "4e92b81311f528cfdca8015d629c650d0aff94ce", - "version" : "0.55.4" + "revision" : "468a7d32dedc8d352c191594b3b45d9fd8ba291b", + "version" : "0.55.5" } }, { diff --git a/Sources/PublicModules/PADPackageFileAnalyzer/SwiftPackageFileAnalyzer.swift b/Sources/PublicModules/PADPackageFileAnalyzer/SwiftPackageFileAnalyzer.swift index 6592a6e..0b9c75c 100644 --- a/Sources/PublicModules/PADPackageFileAnalyzer/SwiftPackageFileAnalyzer.swift +++ b/Sources/PublicModules/PADPackageFileAnalyzer/SwiftPackageFileAnalyzer.swift @@ -176,7 +176,8 @@ private extension SwiftPackageFileAnalyzer { listOfChanges += consistent.compactMap { platformName in guard let newPlatform = new.first(where: { $0.name == platformName }), - let oldPlatform = old.first(where: { $0.name == platformName }) + let oldPlatform = old.first(where: { $0.name == platformName }), + newPlatform.description != oldPlatform.description else { return nil } return "Changed from \(oldPlatform.description) to \(newPlatform.description)" From 318f4434b8cd843bad6d48e8c14ef33ab91a6d6b Mon Sep 17 00:00:00 2001 From: Alex Guretzki Date: Mon, 10 Feb 2025 13:33:31 +0100 Subject: [PATCH 2/2] adapting tests --- .../SwiftPackageFileAnalyzerTests.swift | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Tests/UnitTests/SwiftPackageFileAnalyzerTests.swift b/Tests/UnitTests/SwiftPackageFileAnalyzerTests.swift index ee3a4e1..08d7f0d 100644 --- a/Tests/UnitTests/SwiftPackageFileAnalyzerTests.swift +++ b/Tests/UnitTests/SwiftPackageFileAnalyzerTests.swift @@ -71,7 +71,11 @@ class SwiftPackageFileAnalyzerTests: XCTestCase { packageDescription = SwiftPackageDescription( defaultLocalization: "en-us", name: "New Name", - platforms: [.init(name: "iOS", version: "15.0"), .init(name: "visionOS", version: "1.0")], + platforms: [ + .init(name: "iOS", version: "15.0"), + .init(name: "macOS", version: "10.0"), + .init(name: "visionOS", version: "1.0") + ], products: [ .init(name: "New Library", targets: ["New Target"]), .init(name: "Some Library", targets: ["Some Target", "New Target"]) @@ -98,7 +102,11 @@ class SwiftPackageFileAnalyzerTests: XCTestCase { packageDescription = SwiftPackageDescription( defaultLocalization: "nl-nl", name: "Old Name", - platforms: [.init(name: "iOS", version: "12.0"), .init(name: "macOS", version: "10.0")], + platforms: [ + .init(name: "iOS", version: "12.0"), + .init(name: "macOS", version: "10.0"), + .init(name: "driverKit", version: "1.0") + ], products: [ .init(name: "Old Library", targets: ["Old Target"]), .init(name: "Some Library", targets: ["Some Target", "Old Target"]) @@ -166,14 +174,14 @@ class SwiftPackageFileAnalyzerTests: XCTestCase { ), .init( changeType: .modification( - oldDescription: "platforms: [.iOS(12.0), .macOS(10.0)]", - newDescription: "platforms: [.iOS(15.0), .visionOS(1.0)]" + oldDescription: "platforms: [.iOS(12.0), .macOS(10.0), .driverKit(1.0)]", + newDescription: "platforms: [.iOS(15.0), .macOS(10.0), .visionOS(1.0)]" ), parentPath: "Package.swift", listOfChanges: [ "Added .visionOS(1.0)", "Changed from .iOS(12.0) to .iOS(15.0)", - "Removed .macOS(10.0)" + "Removed .driverKit(1.0)" ] ), .init(