From 889fc3c6a9b4c9753583dceb4b00c2ef9de07f94 Mon Sep 17 00:00:00 2001 From: Simon Bihel Date: Fri, 15 Mar 2024 15:54:28 +0000 Subject: [PATCH] Rename targets to avoid conflicts with native AppKit --- Project.swift | 24 +++++++++---------- Targets/App/Sources/App.swift | 2 +- .../Sources/AppKit.swift | 0 .../Tests/AppKitTests.swift | 0 .../Sources/ContentView.swift | 0 .../Sources/CredentialsView.swift | 0 .../Sources/SelectiveDisclosureView.swift | 0 .../Sources/ShareView.swift | 0 .../Tests/AppUITests.swift | 0 9 files changed, 13 insertions(+), 13 deletions(-) rename Targets/{AppKit => AppAppKit}/Sources/AppKit.swift (100%) rename Targets/{AppKit => AppAppKit}/Tests/AppKitTests.swift (100%) rename Targets/{AppUI => AppUIKit}/Sources/ContentView.swift (100%) rename Targets/{AppUI => AppUIKit}/Sources/CredentialsView.swift (100%) rename Targets/{AppUI => AppUIKit}/Sources/SelectiveDisclosureView.swift (100%) rename Targets/{AppUI => AppUIKit}/Sources/ShareView.swift (100%) rename Targets/{AppUI => AppUIKit}/Tests/AppUITests.swift (100%) diff --git a/Project.swift b/Project.swift index 8c1d9e4..c6b81ab 100644 --- a/Project.swift +++ b/Project.swift @@ -32,54 +32,54 @@ let project = Project( "Resources/**" ], dependencies: [ - .target(name: "AppKit"), - .target(name: "AppUI"), + .target(name: "AppAppKit"), + .target(name: "AppUIKit"), ] ), .target( - name: "AppKit", + name: "AppAppKit", destinations: [.iPhone], product: .framework, bundleId: "com.spruceid.wallet.kit", deploymentTargets: .iOS("16.0"), infoPlist: .default, - sources: ["Targets/AppKit/Sources/**"], + sources: ["Targets/AppAppKit/Sources/**"], dependencies: [ ] ), .target( - name: "AppKitTests", + name: "AppAppKitTests", destinations: [.iPhone], product: .unitTests, bundleId: "com.spruceid.wallet.kittests", deploymentTargets: .iOS("16.0"), infoPlist: .default, - sources: ["Targets/AppKit/Tests/**"], + sources: ["Targets/AppAppKit/Tests/**"], dependencies: [ - .target(name: "AppKit") + .target(name: "AppAppKit") ] ), .target( - name: "AppUI", + name: "AppUIKit", destinations: [.iPhone], product: .framework, bundleId: "com.spruceid.wallet.ui", deploymentTargets: .iOS("16.0"), infoPlist: .default, - sources: ["Targets/AppUI/Sources/**"], + sources: ["Targets/AppUIKit/Sources/**"], dependencies: [ .package(product: "SpruceIDWalletSdk", type: .runtime), ] ), .target( - name: "AppUITests", + name: "AppUIKitTests", destinations: [.iPhone], product: .unitTests, bundleId: "com.spruceid.wallet.uitests", deploymentTargets: .iOS("16.0"), infoPlist: .default, - sources: ["Targets/AppUI/Tests/**"], + sources: ["Targets/AppUIKit/Tests/**"], dependencies: [ - .target(name: "AppUI") + .target(name: "AppUIKit") ] ) ], diff --git a/Targets/App/Sources/App.swift b/Targets/App/Sources/App.swift index 2cb10af..a409f8c 100644 --- a/Targets/App/Sources/App.swift +++ b/Targets/App/Sources/App.swift @@ -1,5 +1,5 @@ import SwiftUI -import AppUI +import AppUIKit @main struct AppApp: App { diff --git a/Targets/AppKit/Sources/AppKit.swift b/Targets/AppAppKit/Sources/AppKit.swift similarity index 100% rename from Targets/AppKit/Sources/AppKit.swift rename to Targets/AppAppKit/Sources/AppKit.swift diff --git a/Targets/AppKit/Tests/AppKitTests.swift b/Targets/AppAppKit/Tests/AppKitTests.swift similarity index 100% rename from Targets/AppKit/Tests/AppKitTests.swift rename to Targets/AppAppKit/Tests/AppKitTests.swift diff --git a/Targets/AppUI/Sources/ContentView.swift b/Targets/AppUIKit/Sources/ContentView.swift similarity index 100% rename from Targets/AppUI/Sources/ContentView.swift rename to Targets/AppUIKit/Sources/ContentView.swift diff --git a/Targets/AppUI/Sources/CredentialsView.swift b/Targets/AppUIKit/Sources/CredentialsView.swift similarity index 100% rename from Targets/AppUI/Sources/CredentialsView.swift rename to Targets/AppUIKit/Sources/CredentialsView.swift diff --git a/Targets/AppUI/Sources/SelectiveDisclosureView.swift b/Targets/AppUIKit/Sources/SelectiveDisclosureView.swift similarity index 100% rename from Targets/AppUI/Sources/SelectiveDisclosureView.swift rename to Targets/AppUIKit/Sources/SelectiveDisclosureView.swift diff --git a/Targets/AppUI/Sources/ShareView.swift b/Targets/AppUIKit/Sources/ShareView.swift similarity index 100% rename from Targets/AppUI/Sources/ShareView.swift rename to Targets/AppUIKit/Sources/ShareView.swift diff --git a/Targets/AppUI/Tests/AppUITests.swift b/Targets/AppUIKit/Tests/AppUITests.swift similarity index 100% rename from Targets/AppUI/Tests/AppUITests.swift rename to Targets/AppUIKit/Tests/AppUITests.swift