diff --git a/Config/App.xcconfig b/Config/App.xcconfig new file mode 100644 index 0000000..95083ec --- /dev/null +++ b/Config/App.xcconfig @@ -0,0 +1,5 @@ +#include "Project.xcconfig" + +PRODUCT_BUNDLE_IDENTIFIER = $(APP_BUNDLE_ID_PREFIX).SecureStorageSample +INFOPLIST_KEY_CFBundleDisplayName = SecureStorage +SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES diff --git a/Config/Project.xcconfig b/Config/Project.xcconfig new file mode 100644 index 0000000..3ddcae4 --- /dev/null +++ b/Config/Project.xcconfig @@ -0,0 +1,7 @@ +// Shared project settings +DEVELOPMENT_TEAM = 6R7KLBPBLZ +MARKETING_VERSION = 1.0 +CURRENT_PROJECT_VERSION = 1 + +// Default Bundle ID Prefix +APP_BUNDLE_ID_PREFIX = com.mbrucedogs diff --git a/Config/Tests.xcconfig b/Config/Tests.xcconfig new file mode 100644 index 0000000..b3db9e5 --- /dev/null +++ b/Config/Tests.xcconfig @@ -0,0 +1,4 @@ +#include "Project.xcconfig" + +// Shared test settings +INFOPLIST_KEY_CFBundleDisplayName = $(PRODUCT_NAME) diff --git a/Config/WatchApp.xcconfig b/Config/WatchApp.xcconfig new file mode 100644 index 0000000..c5fb437 --- /dev/null +++ b/Config/WatchApp.xcconfig @@ -0,0 +1,8 @@ +#include "Project.xcconfig" + +PRODUCT_BUNDLE_IDENTIFIER = $(APP_BUNDLE_ID_PREFIX).SecureStorageSample.watchkitapp +INFOPLIST_KEY_CFBundleDisplayName = SecureStorage Watch +INFOPLIST_KEY_WKCompanionAppBundleIdentifier = $(APP_BUNDLE_ID_PREFIX).SecureStorageSample +SKIP_INSTALL = YES +WATCHOS_DEPLOYMENT_TARGET = 10.0 +SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES diff --git a/SecureStorageSample.xcodeproj/project.pbxproj b/SecureStorageSample.xcodeproj/project.pbxproj index 8babae3..582b354 100644 --- a/SecureStorageSample.xcodeproj/project.pbxproj +++ b/SecureStorageSample.xcodeproj/project.pbxproj @@ -10,6 +10,8 @@ EA179D562F17379800B1D54A /* LocalData in Frameworks */ = {isa = PBXBuildFile; productRef = EA179D552F17379800B1D54A /* LocalData */; }; EA238DF82F18328100AC8894 /* LocalData in Frameworks */ = {isa = PBXBuildFile; productRef = EA238DF72F18328100AC8894 /* LocalData */; }; EA238DFB2F1832C600AC8894 /* SharedKit in Frameworks */ = {isa = PBXBuildFile; productRef = EA238DFA2F1832C600AC8894 /* SharedKit */; }; + EA2390152F18361C00AC8894 /* SharedKit in Frameworks */ = {isa = PBXBuildFile; productRef = EA2390142F18361C00AC8894 /* SharedKit */; }; + EA2390172F18365300AC8894 /* SharedKit in Frameworks */ = {isa = PBXBuildFile; productRef = EA2390162F18365300AC8894 /* SharedKit */; }; EA65D70D2F17DDEB00C48466 /* SecureStorageSample Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = EA65D6E52F17DD6700C48466 /* SecureStorageSample Watch App.app */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; EA65D9442F17EAD800C48466 /* SharedKit in Frameworks */ = {isa = PBXBuildFile; productRef = EA65D7312F17DDEB00C48466 /* SharedKit */; }; EA65D9452F17EAD800C48466 /* SharedKit in Frameworks */ = {isa = PBXBuildFile; productRef = EA65D7312F17DDEB00C48466 /* SharedKit */; }; @@ -71,6 +73,10 @@ EA179D012F1722BB00B1D54A /* SecureStorageSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SecureStorageSample.app; sourceTree = BUILT_PRODUCTS_DIR; }; EA179D0E2F1722BC00B1D54A /* SecureStorageSampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecureStorageSampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; EA179D182F1722BC00B1D54A /* SecureStorageSampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecureStorageSampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + EA238E012F18330000AC8894 /* Project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = ""; }; + EA238E022F18330000AC8894 /* App.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = App.xcconfig; sourceTree = ""; }; + EA238E032F18330000AC8894 /* WatchApp.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WatchApp.xcconfig; sourceTree = ""; }; + EA238E042F18330000AC8894 /* Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Tests.xcconfig; sourceTree = ""; }; EA65D6E52F17DD6700C48466 /* SecureStorageSample Watch App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SecureStorageSample Watch App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; EA65D6F12F17DD6800C48466 /* SecureStorageSample Watch AppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SecureStorageSample Watch AppTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; EA65D6FB2F17DD6800C48466 /* SecureStorageSample Watch AppUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SecureStorageSample Watch AppUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -114,6 +120,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + EA2390152F18361C00AC8894 /* SharedKit in Frameworks */, EA238DFB2F1832C600AC8894 /* SharedKit in Frameworks */, EA65D9442F17EAD800C48466 /* SharedKit in Frameworks */, EA179D562F17379800B1D54A /* LocalData in Frameworks */, @@ -140,6 +147,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + EA2390172F18365300AC8894 /* SharedKit in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -169,6 +177,7 @@ EA65D6E62F17DD6700C48466 /* SecureStorageSample Watch App */, EA65D6F42F17DD6800C48466 /* SecureStorageSample Watch AppTests */, EA65D6FE2F17DD6800C48466 /* SecureStorageSample Watch AppUITests */, + EA238E052F18330000AC8894 /* Config */, EA65D70C2F17DDEB00C48466 /* Frameworks */, EA179D022F1722BB00B1D54A /* Products */, ); @@ -187,6 +196,17 @@ name = Products; sourceTree = ""; }; + EA238E052F18330000AC8894 /* Config */ = { + isa = PBXGroup; + children = ( + EA238E012F18330000AC8894 /* Project.xcconfig */, + EA238E022F18330000AC8894 /* App.xcconfig */, + EA238E032F18330000AC8894 /* WatchApp.xcconfig */, + EA238E042F18330000AC8894 /* Tests.xcconfig */, + ); + path = Config; + sourceTree = ""; + }; EA65D70C2F17DDEB00C48466 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -220,6 +240,7 @@ EA65D7312F17DDEB00C48466 /* SharedKit */, EA238DF72F18328100AC8894 /* LocalData */, EA238DFA2F1832C600AC8894 /* SharedKit */, + EA2390142F18361C00AC8894 /* SharedKit */, ); productName = SecureStorageSample; productReference = EA179D012F1722BB00B1D54A /* SecureStorageSample.app */; @@ -289,6 +310,7 @@ ); name = "SecureStorageSample Watch App"; packageProductDependencies = ( + EA2390162F18365300AC8894 /* SharedKit */, ); productName = "SecureStorageSample Watch App"; productReference = EA65D6E52F17DD6700C48466 /* SecureStorageSample Watch App.app */; @@ -385,7 +407,7 @@ minimizedProjectReferenceProxies = 1; packageReferences = ( EA238DF62F18328100AC8894 /* XCLocalSwiftPackageReference "../remotePackages/LocalData" */, - EA238DF92F1832C600AC8894 /* XCLocalSwiftPackageReference "Packages/SharedPackage" */, + EA2390132F18361C00AC8894 /* XCLocalSwiftPackageReference "localPackages/SharedPackage" */, ); preferredProjectObjectVersion = 77; productRefGroup = EA179D022F1722BB00B1D54A /* Products */; @@ -523,6 +545,7 @@ /* Begin XCBuildConfiguration section */ EA179D202F1722BC00B1D54A /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E012F18330000AC8894 /* Project.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; @@ -586,6 +609,7 @@ }; EA179D212F1722BC00B1D54A /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E012F18330000AC8894 /* Project.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; @@ -642,13 +666,12 @@ }; EA179D232F1722BC00B1D54A /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E022F18330000AC8894 /* App.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = SecureStorageSample/SecureStorageSample.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 6R7KLBPBLZ; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; @@ -661,8 +684,6 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.mbrucedogs.SecureStorageSample; PRODUCT_NAME = "$(TARGET_NAME)"; STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_APPROACHABLE_CONCURRENCY = YES; @@ -676,13 +697,12 @@ }; EA179D242F1722BC00B1D54A /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E022F18330000AC8894 /* App.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = SecureStorageSample/SecureStorageSample.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 6R7KLBPBLZ; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; @@ -695,8 +715,6 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.mbrucedogs.SecureStorageSample; PRODUCT_NAME = "$(TARGET_NAME)"; STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_APPROACHABLE_CONCURRENCY = YES; @@ -710,14 +728,12 @@ }; EA179D262F1722BC00B1D54A /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E042F18330000AC8894 /* Tests.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 26.0; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.mbrucedogs.SecureStorageSampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; STRING_CATALOG_GENERATE_SYMBOLS = NO; SWIFT_APPROACHABLE_CONCURRENCY = YES; @@ -731,14 +747,12 @@ }; EA179D272F1722BC00B1D54A /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E042F18330000AC8894 /* Tests.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 26.0; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.mbrucedogs.SecureStorageSampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; STRING_CATALOG_GENERATE_SYMBOLS = NO; SWIFT_APPROACHABLE_CONCURRENCY = YES; @@ -752,12 +766,10 @@ }; EA179D292F1722BC00B1D54A /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E042F18330000AC8894 /* Tests.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.mbrucedogs.SecureStorageSampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; STRING_CATALOG_GENERATE_SYMBOLS = NO; SWIFT_APPROACHABLE_CONCURRENCY = YES; @@ -771,12 +783,10 @@ }; EA179D2A2F1722BC00B1D54A /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E042F18330000AC8894 /* Tests.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.mbrucedogs.SecureStorageSampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; STRING_CATALOG_GENERATE_SYMBOLS = NO; SWIFT_APPROACHABLE_CONCURRENCY = YES; @@ -790,157 +800,115 @@ }; EA65D7042F17DD6800C48466 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E032F18330000AC8894 /* WatchApp.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 6R7KLBPBLZ; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_CFBundleDisplayName = SecureStorageSample; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.mbrucedogs.SecureStorageSample; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.mbrucedogs.SecureStorageSample.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; - SKIP_INSTALL = YES; - STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_APPROACHABLE_CONCURRENCY = YES; SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 10.0; + WATCHOS_DEPLOYMENT_TARGET = 11.0; }; name = Debug; }; EA65D7052F17DD6800C48466 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E032F18330000AC8894 /* WatchApp.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 6R7KLBPBLZ; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_CFBundleDisplayName = SecureStorageSample; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.mbrucedogs.SecureStorageSample; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.mbrucedogs.SecureStorageSample.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; - SKIP_INSTALL = YES; - STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_APPROACHABLE_CONCURRENCY = YES; SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 10.0; + WATCHOS_DEPLOYMENT_TARGET = 11.0; }; name = Release; }; EA65D7072F17DD6800C48466 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E042F18330000AC8894 /* Tests.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 6R7KLBPBLZ; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.mbrucedogs.SecureStorageSample-Watch-AppTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; - STRING_CATALOG_GENERATE_SYMBOLS = NO; SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SecureStorageSample Watch App.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/SecureStorageSample Watch App"; - WATCHOS_DEPLOYMENT_TARGET = 10.0; + WATCHOS_DEPLOYMENT_TARGET = 11.0; }; name = Debug; }; EA65D7082F17DD6800C48466 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E042F18330000AC8894 /* Tests.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 6R7KLBPBLZ; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.mbrucedogs.SecureStorageSample-Watch-AppTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; - STRING_CATALOG_GENERATE_SYMBOLS = NO; SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SecureStorageSample Watch App.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/SecureStorageSample Watch App"; - WATCHOS_DEPLOYMENT_TARGET = 10.0; + WATCHOS_DEPLOYMENT_TARGET = 11.0; }; name = Release; }; EA65D70A2F17DD6800C48466 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E042F18330000AC8894 /* Tests.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 6R7KLBPBLZ; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.mbrucedogs.SecureStorageSample-Watch-AppUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; - STRING_CATALOG_GENERATE_SYMBOLS = NO; SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; TEST_TARGET_NAME = "SecureStorageSample Watch App"; - WATCHOS_DEPLOYMENT_TARGET = 10.0; + WATCHOS_DEPLOYMENT_TARGET = 11.0; }; name = Debug; }; EA65D70B2F17DD6800C48466 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = EA238E042F18330000AC8894 /* Tests.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 6R7KLBPBLZ; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.mbrucedogs.SecureStorageSample-Watch-AppUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; - STRING_CATALOG_GENERATE_SYMBOLS = NO; SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; TEST_TARGET_NAME = "SecureStorageSample Watch App"; - WATCHOS_DEPLOYMENT_TARGET = 10.0; + WATCHOS_DEPLOYMENT_TARGET = 11.0; }; name = Release; }; @@ -1017,9 +985,9 @@ isa = XCLocalSwiftPackageReference; relativePath = ../remotePackages/LocalData; }; - EA238DF92F1832C600AC8894 /* XCLocalSwiftPackageReference "Packages/SharedPackage" */ = { + EA2390132F18361C00AC8894 /* XCLocalSwiftPackageReference "localPackages/SharedPackage" */ = { isa = XCLocalSwiftPackageReference; - relativePath = Packages/SharedPackage; + relativePath = localPackages/SharedPackage; }; /* End XCLocalSwiftPackageReference section */ @@ -1036,6 +1004,15 @@ isa = XCSwiftPackageProductDependency; productName = SharedKit; }; + EA2390142F18361C00AC8894 /* SharedKit */ = { + isa = XCSwiftPackageProductDependency; + productName = SharedKit; + }; + EA2390162F18365300AC8894 /* SharedKit */ = { + isa = XCSwiftPackageProductDependency; + package = EA2390132F18361C00AC8894 /* XCLocalSwiftPackageReference "localPackages/SharedPackage" */; + productName = SharedKit; + }; EA65D7312F17DDEB00C48466 /* SharedKit */ = { isa = XCSwiftPackageProductDependency; productName = SharedKit; diff --git a/SecureStorageSample/SecureStorageSampleApp.swift b/SecureStorageSample/SecureStorageSampleApp.swift index 6d4de84..fa36d30 100644 --- a/SecureStorageSample/SecureStorageSampleApp.swift +++ b/SecureStorageSample/SecureStorageSampleApp.swift @@ -7,6 +7,7 @@ import SwiftUI import LocalData +import SharedKit @main struct SecureStorageSampleApp: App { diff --git a/Packages/SharedPackage/Package.swift b/localPackages/SharedPackage/Package.swift similarity index 100% rename from Packages/SharedPackage/Package.swift rename to localPackages/SharedPackage/Package.swift diff --git a/Packages/SharedPackage/Sources/SharedKit/Constants/StorageKeyNames.swift b/localPackages/SharedPackage/Sources/SharedKit/Constants/StorageKeyNames.swift similarity index 100% rename from Packages/SharedPackage/Sources/SharedKit/Constants/StorageKeyNames.swift rename to localPackages/SharedPackage/Sources/SharedKit/Constants/StorageKeyNames.swift diff --git a/Packages/SharedPackage/Sources/SharedKit/Constants/StorageServiceIdentifiers.swift b/localPackages/SharedPackage/Sources/SharedKit/Constants/StorageServiceIdentifiers.swift similarity index 100% rename from Packages/SharedPackage/Sources/SharedKit/Constants/StorageServiceIdentifiers.swift rename to localPackages/SharedPackage/Sources/SharedKit/Constants/StorageServiceIdentifiers.swift diff --git a/Packages/SharedPackage/Sources/SharedKit/Models/UserProfile.swift b/localPackages/SharedPackage/Sources/SharedKit/Models/UserProfile.swift similarity index 100% rename from Packages/SharedPackage/Sources/SharedKit/Models/UserProfile.swift rename to localPackages/SharedPackage/Sources/SharedKit/Models/UserProfile.swift