From 30abbbdb5577f03d76c40ebec6f32ceaf69e2f54 Mon Sep 17 00:00:00 2001 From: Javier Cicchelli Date: Fri, 4 Oct 2024 21:38:15 +0200 Subject: [PATCH] Implemented the new setup for the Piper target. --- Piper.xcodeproj/project.pbxproj | 18 ++++++++++++------ .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../Catalogs}/Assets.xcassets/Contents.json | 0 .../Catalogs/Previews.xcassets}/Contents.json | 0 .../Entitlements}/Piper.entitlements | 0 Piper/{ => Sources/App}/PiperApp.swift | 3 ++- Piper/{ => Sources/Logic/Models}/Item.swift | 3 ++- Piper/{ => Sources/UI/Views}/ContentView.swift | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) rename Piper/{ => Resources/Catalogs}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename Piper/{ => Resources/Catalogs}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename Piper/{ => Resources/Catalogs}/Assets.xcassets/Contents.json (100%) rename Piper/{Preview Content/Preview Assets.xcassets => Resources/Catalogs/Previews.xcassets}/Contents.json (100%) rename Piper/{ => Resources/Entitlements}/Piper.entitlements (100%) rename Piper/{ => Sources/App}/PiperApp.swift (90%) rename Piper/{ => Sources/Logic/Models}/Item.swift (76%) rename Piper/{ => Sources/UI/Views}/ContentView.swift (95%) diff --git a/Piper.xcodeproj/project.pbxproj b/Piper.xcodeproj/project.pbxproj index bd37e63..f484ae7 100644 --- a/Piper.xcodeproj/project.pbxproj +++ b/Piper.xcodeproj/project.pbxproj @@ -170,8 +170,10 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = 1; + CLASSPREFIX = ""; LastSwiftUpdateCheck = 1600; LastUpgradeCheck = 1600; + ORGANIZATIONNAME = "Röck+Cöde"; TargetAttributes = { 46D4BE762CB06ED300FCFB84 = { CreatedOnToolsVersion = 16.0; @@ -392,15 +394,17 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = Piper/Piper.entitlements; + CODE_SIGN_ENTITLEMENTS = Piper/Resources/Entitlements/Piper.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"Piper/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = Piper/Resources/Catalogs/Previews.xcassets; DEVELOPMENT_TEAM = 7FMNM89WKG; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_CFBundleDisplayName = Piper; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -408,7 +412,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.rock-n-code.app.Piper"; + PRODUCT_BUNDLE_IDENTIFIER = "com.rock-n-code.piper.app.macos"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -420,15 +424,17 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = Piper/Piper.entitlements; + CODE_SIGN_ENTITLEMENTS = Piper/Resources/Entitlements/Piper.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"Piper/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = Piper/Resources/Catalogs/Previews.xcassets; DEVELOPMENT_TEAM = 7FMNM89WKG; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_CFBundleDisplayName = Piper; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -436,7 +442,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.rock-n-code.app.Piper"; + PRODUCT_BUNDLE_IDENTIFIER = "com.rock-n-code.piper.app.macos"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; diff --git a/Piper/Assets.xcassets/AccentColor.colorset/Contents.json b/Piper/Resources/Catalogs/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from Piper/Assets.xcassets/AccentColor.colorset/Contents.json rename to Piper/Resources/Catalogs/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/Piper/Assets.xcassets/AppIcon.appiconset/Contents.json b/Piper/Resources/Catalogs/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Piper/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Piper/Resources/Catalogs/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Piper/Assets.xcassets/Contents.json b/Piper/Resources/Catalogs/Assets.xcassets/Contents.json similarity index 100% rename from Piper/Assets.xcassets/Contents.json rename to Piper/Resources/Catalogs/Assets.xcassets/Contents.json diff --git a/Piper/Preview Content/Preview Assets.xcassets/Contents.json b/Piper/Resources/Catalogs/Previews.xcassets/Contents.json similarity index 100% rename from Piper/Preview Content/Preview Assets.xcassets/Contents.json rename to Piper/Resources/Catalogs/Previews.xcassets/Contents.json diff --git a/Piper/Piper.entitlements b/Piper/Resources/Entitlements/Piper.entitlements similarity index 100% rename from Piper/Piper.entitlements rename to Piper/Resources/Entitlements/Piper.entitlements diff --git a/Piper/PiperApp.swift b/Piper/Sources/App/PiperApp.swift similarity index 90% rename from Piper/PiperApp.swift rename to Piper/Sources/App/PiperApp.swift index 8328c48..b783cb0 100644 --- a/Piper/PiperApp.swift +++ b/Piper/Sources/App/PiperApp.swift @@ -1,8 +1,9 @@ // // PiperApp.swift -// Piper +// Piper ~ App // // Created by Javier Cicchelli on 04/10/2024. +// Copyright © 2024 Röck+Cöde. All rights reserved. // import SwiftUI diff --git a/Piper/Item.swift b/Piper/Sources/Logic/Models/Item.swift similarity index 76% rename from Piper/Item.swift rename to Piper/Sources/Logic/Models/Item.swift index 22a78a3..f2fca05 100644 --- a/Piper/Item.swift +++ b/Piper/Sources/Logic/Models/Item.swift @@ -1,8 +1,9 @@ // // Item.swift -// Piper +// Piper ~ App // // Created by Javier Cicchelli on 04/10/2024. +// Copyright © 2024 Röck+Cöde. All rights reserved. // import Foundation diff --git a/Piper/ContentView.swift b/Piper/Sources/UI/Views/ContentView.swift similarity index 95% rename from Piper/ContentView.swift rename to Piper/Sources/UI/Views/ContentView.swift index 4c252ad..64a5ef2 100644 --- a/Piper/ContentView.swift +++ b/Piper/Sources/UI/Views/ContentView.swift @@ -1,8 +1,9 @@ // // ContentView.swift -// Piper +// Piper ~ App // // Created by Javier Cicchelli on 04/10/2024. +// Copyright © 2024 Röck+Cöde. All rights reserved. // import SwiftUI