From bde24c4bfd537650818089b44faafff05aa067b3 Mon Sep 17 00:00:00 2001 From: Alan Francis Date: Sun, 11 Jun 2023 09:37:06 +0100 Subject: [PATCH] End of Step 6: Remove the Preview content and add entitlements --- JustOneThing.xcodeproj/project.pbxproj | 36 +++++-------------- JustOneThing/JustOneThing.entitlements | 10 +++--- .../Preview Assets.xcassets/Contents.json | 6 ---- .../JustOneThingWatch Watch App.entitlements | 8 +++++ .../Preview Assets.xcassets/Contents.json | 6 ---- 5 files changed, 22 insertions(+), 44 deletions(-) delete mode 100644 JustOneThing/Preview Content/Preview Assets.xcassets/Contents.json create mode 100644 JustOneThingWatch Watch App/JustOneThingWatch Watch App.entitlements delete mode 100644 JustOneThingWatch Watch App/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/JustOneThing.xcodeproj/project.pbxproj b/JustOneThing.xcodeproj/project.pbxproj index 0981483..60725aa 100644 --- a/JustOneThing.xcodeproj/project.pbxproj +++ b/JustOneThing.xcodeproj/project.pbxproj @@ -10,12 +10,10 @@ 5407E5022A2A8AE200EF00B8 /* JustOneThingApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5483903A2A2A773900BF5624 /* JustOneThingApp.swift */; }; 5407E5032A2A8AE700EF00B8 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5483903C2A2A773900BF5624 /* ContentView.swift */; }; 5407E5042A2A8AEA00EF00B8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5483903E2A2A773A00BF5624 /* Assets.xcassets */; }; - 5431ED772A2A77CA00515680 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5431ED762A2A77CA00515680 /* Preview Assets.xcassets */; }; 5431ED7A2A2A77CA00515680 /* JustOneThingWatch Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 5431ED6D2A2A77C900515680 /* JustOneThingWatch Watch App.app */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 5483903B2A2A773900BF5624 /* JustOneThingApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5483903A2A2A773900BF5624 /* JustOneThingApp.swift */; }; 5483903D2A2A773900BF5624 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5483903C2A2A773900BF5624 /* ContentView.swift */; }; 5483903F2A2A773A00BF5624 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5483903E2A2A773A00BF5624 /* Assets.xcassets */; }; - 548390432A2A773A00BF5624 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 548390422A2A773A00BF5624 /* Preview Assets.xcassets */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -43,14 +41,13 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 5407E5062A35B96E00EF00B8 /* JustOneThingWatch Watch App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "JustOneThingWatch Watch App.entitlements"; sourceTree = ""; }; 5431ED6D2A2A77C900515680 /* JustOneThingWatch Watch App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "JustOneThingWatch Watch App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5431ED762A2A77CA00515680 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 548390372A2A773900BF5624 /* JustOneThing.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JustOneThing.app; sourceTree = BUILT_PRODUCTS_DIR; }; 5483903A2A2A773900BF5624 /* JustOneThingApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JustOneThingApp.swift; sourceTree = ""; }; 5483903C2A2A773900BF5624 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 5483903E2A2A773A00BF5624 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 548390402A2A773A00BF5624 /* JustOneThing.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = JustOneThing.entitlements; sourceTree = ""; }; - 548390422A2A773A00BF5624 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -84,19 +81,11 @@ 5431ED6E2A2A77C900515680 /* JustOneThingWatch Watch App */ = { isa = PBXGroup; children = ( - 5431ED752A2A77CA00515680 /* Preview Content */, + 5407E5062A35B96E00EF00B8 /* JustOneThingWatch Watch App.entitlements */, ); path = "JustOneThingWatch Watch App"; sourceTree = ""; }; - 5431ED752A2A77CA00515680 /* Preview Content */ = { - isa = PBXGroup; - children = ( - 5431ED762A2A77CA00515680 /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; 5483902E2A2A773900BF5624 = { isa = PBXGroup; children = ( @@ -120,19 +109,10 @@ isa = PBXGroup; children = ( 548390402A2A773A00BF5624 /* JustOneThing.entitlements */, - 548390412A2A773A00BF5624 /* Preview Content */, ); path = JustOneThing; sourceTree = ""; }; - 548390412A2A773A00BF5624 /* Preview Content */ = { - isa = PBXGroup; - children = ( - 548390422A2A773A00BF5624 /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -215,7 +195,6 @@ buildActionMask = 2147483647; files = ( 5407E5042A2A8AEA00EF00B8 /* Assets.xcassets in Resources */, - 5431ED772A2A77CA00515680 /* Preview Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -223,7 +202,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 548390432A2A773A00BF5624 /* Preview Assets.xcassets in Resources */, 5483903F2A2A773A00BF5624 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -266,9 +244,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = "JustOneThingWatch Watch App/JustOneThingWatch Watch App.entitlements"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"JustOneThingWatch Watch App/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = 37UC5MW6PT; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -296,9 +275,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = "JustOneThingWatch Watch App/JustOneThingWatch Watch App.entitlements"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"JustOneThingWatch Watch App/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = 37UC5MW6PT; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -440,7 +420,7 @@ CODE_SIGN_ENTITLEMENTS = JustOneThing/JustOneThing.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"JustOneThing/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = 37UC5MW6PT; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; @@ -481,7 +461,7 @@ CODE_SIGN_ENTITLEMENTS = JustOneThing/JustOneThing.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"JustOneThing/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = 37UC5MW6PT; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; diff --git a/JustOneThing/JustOneThing.entitlements b/JustOneThing/JustOneThing.entitlements index f2ef3ae..e51d803 100644 --- a/JustOneThing/JustOneThing.entitlements +++ b/JustOneThing/JustOneThing.entitlements @@ -2,9 +2,11 @@ - com.apple.security.app-sandbox - - com.apple.security.files.user-selected.read-only - + com.apple.security.app-sandbox + + com.apple.security.application-groups + + com.apple.security.files.user-selected.read-only + diff --git a/JustOneThing/Preview Content/Preview Assets.xcassets/Contents.json b/JustOneThing/Preview Content/Preview Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/JustOneThing/Preview Content/Preview Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/JustOneThingWatch Watch App/JustOneThingWatch Watch App.entitlements b/JustOneThingWatch Watch App/JustOneThingWatch Watch App.entitlements new file mode 100644 index 0000000..2eb7e33 --- /dev/null +++ b/JustOneThingWatch Watch App/JustOneThingWatch Watch App.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.application-groups + + + diff --git a/JustOneThingWatch Watch App/Preview Content/Preview Assets.xcassets/Contents.json b/JustOneThingWatch Watch App/Preview Content/Preview Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/JustOneThingWatch Watch App/Preview Content/Preview Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -}