From 50d0067732aae95f397af09a5c3eef6b671d41e0 Mon Sep 17 00:00:00 2001 From: Alan Francis Date: Sun, 11 Jun 2023 20:44:09 +0100 Subject: [PATCH] End of Step 8: Shared Widget files extracted. --- JustOneThing.xcodeproj/project.pbxproj | 84 ++++++------ .../xcschemes/JustOneThing.xcscheme | 77 +++++++++++ .../JustOneThingWatch Watch App.xcscheme | 91 +++++++++++++ .../xcschemes/MacWidgetExtension.xcscheme | 113 ++++++++++++++++ .../xcschemes/PhoneWidgetExtension.xcscheme | 112 ++++++++++++++++ .../xcschemes/WatchWidgetExtension.xcscheme | 124 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 38 +++++- .../AppIcon.appiconset/Contents.json | 58 -------- .../AccentColor.colorset/Contents.json | 11 -- PhoneWidget/Assets.xcassets/Contents.json | 6 - .../WidgetBackground.colorset/Contents.json | 11 -- PhoneWidget/Info.plist | 11 -- .../AccentColor.colorset/Contents.json | 11 -- .../AppIcon.appiconset/Contents.json | 13 -- WatchWidget/Assets.xcassets/Contents.json | 6 - .../WidgetBackground.colorset/Contents.json | 11 -- WatchWidget/Info.plist | 11 -- WatchWidget/WatchWidget.intentdefinition | 59 --------- {MacWidget => WidgetShared}/Info.plist | 0 .../Widget.intentdefinition | 0 .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../WidgetAssets.xcassets}/Contents.json | 0 .../WidgetBackground.colorset/Contents.json | 0 24 files changed, 591 insertions(+), 256 deletions(-) create mode 100644 JustOneThing.xcodeproj/xcshareddata/xcschemes/JustOneThing.xcscheme create mode 100644 JustOneThing.xcodeproj/xcshareddata/xcschemes/JustOneThingWatch Watch App.xcscheme create mode 100644 JustOneThing.xcodeproj/xcshareddata/xcschemes/MacWidgetExtension.xcscheme create mode 100644 JustOneThing.xcodeproj/xcshareddata/xcschemes/PhoneWidgetExtension.xcscheme create mode 100644 JustOneThing.xcodeproj/xcshareddata/xcschemes/WatchWidgetExtension.xcscheme delete mode 100644 MacWidget/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 PhoneWidget/Assets.xcassets/AccentColor.colorset/Contents.json delete mode 100644 PhoneWidget/Assets.xcassets/Contents.json delete mode 100644 PhoneWidget/Assets.xcassets/WidgetBackground.colorset/Contents.json delete mode 100644 PhoneWidget/Info.plist delete mode 100644 WatchWidget/Assets.xcassets/AccentColor.colorset/Contents.json delete mode 100644 WatchWidget/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 WatchWidget/Assets.xcassets/Contents.json delete mode 100644 WatchWidget/Assets.xcassets/WidgetBackground.colorset/Contents.json delete mode 100644 WatchWidget/Info.plist delete mode 100644 WatchWidget/WatchWidget.intentdefinition rename {MacWidget => WidgetShared}/Info.plist (100%) rename MacWidget/MacWidget.intentdefinition => WidgetShared/Widget.intentdefinition (100%) rename {MacWidget/Assets.xcassets => WidgetShared/WidgetAssets.xcassets}/AccentColor.colorset/Contents.json (100%) rename {PhoneWidget/Assets.xcassets => WidgetShared/WidgetAssets.xcassets}/AppIcon.appiconset/Contents.json (100%) rename {MacWidget/Assets.xcassets => WidgetShared/WidgetAssets.xcassets}/Contents.json (100%) rename {MacWidget/Assets.xcassets => WidgetShared/WidgetAssets.xcassets}/WidgetBackground.colorset/Contents.json (100%) diff --git a/JustOneThing.xcodeproj/project.pbxproj b/JustOneThing.xcodeproj/project.pbxproj index 29b54c5..bcb748f 100644 --- a/JustOneThing.xcodeproj/project.pbxproj +++ b/JustOneThing.xcodeproj/project.pbxproj @@ -11,30 +11,29 @@ 5407E5032A2A8AE700EF00B8 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5483903C2A2A773900BF5624 /* ContentView.swift */; }; 5407E5042A2A8AEA00EF00B8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5483903E2A2A773A00BF5624 /* Assets.xcassets */; }; 5431ED7A2A2A77CA00515680 /* JustOneThingWatch Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 5431ED6D2A2A77C900515680 /* JustOneThingWatch Watch App.app */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 5472018C2A36563A005B2FCC /* WidgetAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 54928C372A35F8B800095445 /* WidgetAssets.xcassets */; }; + 5472018E2A36563B005B2FCC /* Widget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 54928C1C2A35F89900095445 /* Widget.intentdefinition */; }; + 547201902A36563C005B2FCC /* Widget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 54928C1C2A35F89900095445 /* Widget.intentdefinition */; }; + 547201912A36563C005B2FCC /* WidgetAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 54928C372A35F8B800095445 /* WidgetAssets.xcassets */; }; + 547201932A365868005B2FCC /* Widget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 54928C1C2A35F89900095445 /* Widget.intentdefinition */; }; 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 */; }; 54928C162A35F89900095445 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54928C152A35F89900095445 /* WidgetKit.framework */; }; 54928C182A35F89900095445 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54928C172A35F89900095445 /* SwiftUI.framework */; }; 54928C1B2A35F89900095445 /* MacWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54928C1A2A35F89900095445 /* MacWidget.swift */; }; - 54928C1E2A35F89A00095445 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 54928C1D2A35F89A00095445 /* Assets.xcassets */; }; - 54928C212A35F89A00095445 /* MacWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 54928C1C2A35F89900095445 /* MacWidget.intentdefinition */; }; - 54928C222A35F89A00095445 /* MacWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 54928C1C2A35F89900095445 /* MacWidget.intentdefinition */; }; - 54928C252A35F89A00095445 /* MacWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 54928C132A35F89900095445 /* MacWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 54928C212A35F89A00095445 /* Widget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 54928C1C2A35F89900095445 /* Widget.intentdefinition */; }; + 54928C222A35F89A00095445 /* Widget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 54928C1C2A35F89900095445 /* Widget.intentdefinition */; }; + 54928C252A35F89A00095445 /* MacWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 54928C132A35F89900095445 /* MacWidgetExtension.appex */; platformFilters = (macos, ); settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 54928C2F2A35F8B800095445 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54928C152A35F89900095445 /* WidgetKit.framework */; }; 54928C302A35F8B800095445 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54928C172A35F89900095445 /* SwiftUI.framework */; }; 54928C332A35F8B800095445 /* PhoneWidgetBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54928C322A35F8B800095445 /* PhoneWidgetBundle.swift */; }; 54928C352A35F8B800095445 /* PhoneWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54928C342A35F8B800095445 /* PhoneWidget.swift */; }; - 54928C382A35F8B800095445 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 54928C372A35F8B800095445 /* Assets.xcassets */; }; - 54928C3A2A35F8B800095445 /* PhoneWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 54928C362A35F8B800095445 /* PhoneWidget.intentdefinition */; }; - 54928C3B2A35F8B800095445 /* PhoneWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 54928C362A35F8B800095445 /* PhoneWidget.intentdefinition */; }; - 54928C3E2A35F8B800095445 /* PhoneWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 54928C2E2A35F8B800095445 /* PhoneWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 54928C382A35F8B800095445 /* WidgetAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 54928C372A35F8B800095445 /* WidgetAssets.xcassets */; }; + 54928C3E2A35F8B800095445 /* PhoneWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 54928C2E2A35F8B800095445 /* PhoneWidgetExtension.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 54928C472A35F8CB00095445 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54928C152A35F89900095445 /* WidgetKit.framework */; }; 54928C482A35F8CB00095445 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54928C172A35F89900095445 /* SwiftUI.framework */; }; 54928C4B2A35F8CB00095445 /* WatchWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54928C4A2A35F8CB00095445 /* WatchWidget.swift */; }; - 54928C4E2A35F8CC00095445 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 54928C4D2A35F8CC00095445 /* Assets.xcassets */; }; - 54928C502A35F8CC00095445 /* WatchWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 54928C4C2A35F8CB00095445 /* WatchWidget.intentdefinition */; }; - 54928C512A35F8CC00095445 /* WatchWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 54928C4C2A35F8CB00095445 /* WatchWidget.intentdefinition */; }; 54928C542A35F8CC00095445 /* WatchWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 54928C462A35F8CB00095445 /* WatchWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ @@ -118,21 +117,15 @@ 54928C152A35F89900095445 /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; }; 54928C172A35F89900095445 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; }; 54928C1A2A35F89900095445 /* MacWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacWidget.swift; sourceTree = ""; }; - 54928C1C2A35F89900095445 /* MacWidget.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = MacWidget.intentdefinition; sourceTree = ""; }; - 54928C1D2A35F89A00095445 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 54928C1F2A35F89A00095445 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 54928C1C2A35F89900095445 /* Widget.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = Widget.intentdefinition; sourceTree = ""; }; 54928C202A35F89A00095445 /* MacWidget.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MacWidget.entitlements; sourceTree = ""; }; 54928C2E2A35F8B800095445 /* PhoneWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = PhoneWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 54928C322A35F8B800095445 /* PhoneWidgetBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneWidgetBundle.swift; sourceTree = ""; }; 54928C342A35F8B800095445 /* PhoneWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneWidget.swift; sourceTree = ""; }; - 54928C362A35F8B800095445 /* PhoneWidget.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = PhoneWidget.intentdefinition; sourceTree = ""; }; - 54928C372A35F8B800095445 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 54928C372A35F8B800095445 /* WidgetAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = WidgetAssets.xcassets; sourceTree = ""; }; 54928C392A35F8B800095445 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 54928C462A35F8CB00095445 /* WatchWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WatchWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 54928C4A2A35F8CB00095445 /* WatchWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchWidget.swift; sourceTree = ""; }; - 54928C4C2A35F8CB00095445 /* WatchWidget.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = WatchWidget.intentdefinition; sourceTree = ""; }; - 54928C4D2A35F8CC00095445 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 54928C4F2A35F8CC00095445 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -198,12 +191,23 @@ path = "JustOneThingWatch Watch App"; sourceTree = ""; }; + 5472018B2A3655E4005B2FCC /* WidgetShared */ = { + isa = PBXGroup; + children = ( + 54928C372A35F8B800095445 /* WidgetAssets.xcassets */, + 54928C392A35F8B800095445 /* Info.plist */, + 54928C1C2A35F89900095445 /* Widget.intentdefinition */, + ); + path = WidgetShared; + sourceTree = ""; + }; 5483902E2A2A773900BF5624 = { isa = PBXGroup; children = ( 5407E5012A2A8A5100EF00B8 /* AppShared */, 548390392A2A773900BF5624 /* JustOneThing */, 5431ED6E2A2A77C900515680 /* JustOneThingWatch Watch App */, + 5472018B2A3655E4005B2FCC /* WidgetShared */, 54928C192A35F89900095445 /* MacWidget */, 54928C312A35F8B800095445 /* PhoneWidget */, 54928C492A35F8CB00095445 /* WatchWidget */, @@ -245,9 +249,6 @@ isa = PBXGroup; children = ( 54928C1A2A35F89900095445 /* MacWidget.swift */, - 54928C1C2A35F89900095445 /* MacWidget.intentdefinition */, - 54928C1D2A35F89A00095445 /* Assets.xcassets */, - 54928C1F2A35F89A00095445 /* Info.plist */, 54928C202A35F89A00095445 /* MacWidget.entitlements */, ); path = MacWidget; @@ -258,9 +259,6 @@ children = ( 54928C322A35F8B800095445 /* PhoneWidgetBundle.swift */, 54928C342A35F8B800095445 /* PhoneWidget.swift */, - 54928C362A35F8B800095445 /* PhoneWidget.intentdefinition */, - 54928C372A35F8B800095445 /* Assets.xcassets */, - 54928C392A35F8B800095445 /* Info.plist */, ); path = PhoneWidget; sourceTree = ""; @@ -269,9 +267,6 @@ isa = PBXGroup; children = ( 54928C4A2A35F8CB00095445 /* WatchWidget.swift */, - 54928C4C2A35F8CB00095445 /* WatchWidget.intentdefinition */, - 54928C4D2A35F8CC00095445 /* Assets.xcassets */, - 54928C4F2A35F8CC00095445 /* Info.plist */, ); path = WatchWidget; sourceTree = ""; @@ -441,7 +436,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 54928C1E2A35F89A00095445 /* Assets.xcassets in Resources */, + 5472018C2A36563A005B2FCC /* WidgetAssets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -449,7 +444,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 54928C382A35F8B800095445 /* Assets.xcassets in Resources */, + 54928C382A35F8B800095445 /* WidgetAssets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -457,7 +452,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 54928C4E2A35F8CC00095445 /* Assets.xcassets in Resources */, + 547201912A36563C005B2FCC /* WidgetAssets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -469,8 +464,8 @@ buildActionMask = 2147483647; files = ( 5407E5032A2A8AE700EF00B8 /* ContentView.swift in Sources */, - 54928C512A35F8CC00095445 /* WatchWidget.intentdefinition in Sources */, 5407E5022A2A8AE200EF00B8 /* JustOneThingApp.swift in Sources */, + 547201932A365868005B2FCC /* Widget.intentdefinition in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -480,8 +475,7 @@ files = ( 5483903D2A2A773900BF5624 /* ContentView.swift in Sources */, 5483903B2A2A773900BF5624 /* JustOneThingApp.swift in Sources */, - 54928C222A35F89A00095445 /* MacWidget.intentdefinition in Sources */, - 54928C3B2A35F8B800095445 /* PhoneWidget.intentdefinition in Sources */, + 54928C222A35F89A00095445 /* Widget.intentdefinition in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -489,7 +483,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 54928C212A35F89A00095445 /* MacWidget.intentdefinition in Sources */, + 54928C212A35F89A00095445 /* Widget.intentdefinition in Sources */, 54928C1B2A35F89900095445 /* MacWidget.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -499,8 +493,8 @@ buildActionMask = 2147483647; files = ( 54928C352A35F8B800095445 /* PhoneWidget.swift in Sources */, - 54928C3A2A35F8B800095445 /* PhoneWidget.intentdefinition in Sources */, 54928C332A35F8B800095445 /* PhoneWidgetBundle.swift in Sources */, + 5472018E2A36563B005B2FCC /* Widget.intentdefinition in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -508,7 +502,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 54928C502A35F8CC00095445 /* WatchWidget.intentdefinition in Sources */, + 547201902A36563C005B2FCC /* Widget.intentdefinition in Sources */, 54928C4B2A35F8CB00095445 /* WatchWidget.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -524,11 +518,15 @@ }; 54928C242A35F89A00095445 /* PBXTargetDependency */ = { isa = PBXTargetDependency; + platformFilters = ( + macos, + ); target = 54928C122A35F89900095445 /* MacWidgetExtension */; targetProxy = 54928C232A35F89A00095445 /* PBXContainerItemProxy */; }; 54928C3D2A35F8B800095445 /* PBXTargetDependency */ = { isa = PBXTargetDependency; + platformFilter = ios; target = 54928C2D2A35F8B800095445 /* PhoneWidgetExtension */; targetProxy = 54928C3C2A35F8B800095445 /* PBXContainerItemProxy */; }; @@ -807,7 +805,7 @@ DEVELOPMENT_TEAM = 37UC5MW6PT; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = MacWidget/Info.plist; + INFOPLIST_FILE = WidgetShared/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = MacWidget; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( @@ -837,7 +835,7 @@ DEVELOPMENT_TEAM = 37UC5MW6PT; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = MacWidget/Info.plist; + INFOPLIST_FILE = WidgetShared/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = MacWidget; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( @@ -865,7 +863,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 37UC5MW6PT; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = PhoneWidget/Info.plist; + INFOPLIST_FILE = WidgetShared/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = PhoneWidget; INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 16.4; @@ -894,7 +892,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 37UC5MW6PT; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = PhoneWidget/Info.plist; + INFOPLIST_FILE = WidgetShared/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = PhoneWidget; INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 16.4; @@ -924,7 +922,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 37UC5MW6PT; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = WatchWidget/Info.plist; + INFOPLIST_FILE = WidgetShared/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = WatchWidget; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( @@ -954,7 +952,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 37UC5MW6PT; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = WatchWidget/Info.plist; + INFOPLIST_FILE = WidgetShared/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = WatchWidget; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/JustOneThing.xcodeproj/xcshareddata/xcschemes/JustOneThing.xcscheme b/JustOneThing.xcodeproj/xcshareddata/xcschemes/JustOneThing.xcscheme new file mode 100644 index 0000000..c0d6b1f --- /dev/null +++ b/JustOneThing.xcodeproj/xcshareddata/xcschemes/JustOneThing.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JustOneThing.xcodeproj/xcshareddata/xcschemes/JustOneThingWatch Watch App.xcscheme b/JustOneThing.xcodeproj/xcshareddata/xcschemes/JustOneThingWatch Watch App.xcscheme new file mode 100644 index 0000000..960b8fb --- /dev/null +++ b/JustOneThing.xcodeproj/xcshareddata/xcschemes/JustOneThingWatch Watch App.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JustOneThing.xcodeproj/xcshareddata/xcschemes/MacWidgetExtension.xcscheme b/JustOneThing.xcodeproj/xcshareddata/xcschemes/MacWidgetExtension.xcscheme new file mode 100644 index 0000000..bc22041 --- /dev/null +++ b/JustOneThing.xcodeproj/xcshareddata/xcschemes/MacWidgetExtension.xcscheme @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JustOneThing.xcodeproj/xcshareddata/xcschemes/PhoneWidgetExtension.xcscheme b/JustOneThing.xcodeproj/xcshareddata/xcschemes/PhoneWidgetExtension.xcscheme new file mode 100644 index 0000000..8735dcd --- /dev/null +++ b/JustOneThing.xcodeproj/xcshareddata/xcschemes/PhoneWidgetExtension.xcscheme @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JustOneThing.xcodeproj/xcshareddata/xcschemes/WatchWidgetExtension.xcscheme b/JustOneThing.xcodeproj/xcshareddata/xcschemes/WatchWidgetExtension.xcscheme new file mode 100644 index 0000000..233e43a --- /dev/null +++ b/JustOneThing.xcodeproj/xcshareddata/xcschemes/WatchWidgetExtension.xcscheme @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JustOneThing.xcodeproj/xcuserdata/acf.xcuserdatad/xcschemes/xcschememanagement.plist b/JustOneThing.xcodeproj/xcuserdata/acf.xcuserdatad/xcschemes/xcschememanagement.plist index adfa5ea..484c7bf 100644 --- a/JustOneThing.xcodeproj/xcuserdata/acf.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/JustOneThing.xcodeproj/xcuserdata/acf.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,27 +7,55 @@ JustOneThing.xcscheme_^#shared#^_ orderHint - 0 + 4 JustOneThingWatch Watch App.xcscheme_^#shared#^_ orderHint - 1 + 0 MacWidgetExtension.xcscheme_^#shared#^_ orderHint - 2 + 1 PhoneWidgetExtension.xcscheme_^#shared#^_ orderHint - 3 + 2 WatchWidgetExtension.xcscheme_^#shared#^_ orderHint - 4 + 3 + + + SuppressBuildableAutocreation + + 5431ED6C2A2A77C900515680 + + primary + + + 548390362A2A773900BF5624 + + primary + + + 54928C122A35F89900095445 + + primary + + + 54928C2D2A35F8B800095445 + + primary + + + 54928C452A35F8CB00095445 + + primary + diff --git a/MacWidget/Assets.xcassets/AppIcon.appiconset/Contents.json b/MacWidget/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 3f00db4..0000000 --- a/MacWidget/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/PhoneWidget/Assets.xcassets/AccentColor.colorset/Contents.json b/PhoneWidget/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index eb87897..0000000 --- a/PhoneWidget/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/PhoneWidget/Assets.xcassets/Contents.json b/PhoneWidget/Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/PhoneWidget/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/PhoneWidget/Assets.xcassets/WidgetBackground.colorset/Contents.json b/PhoneWidget/Assets.xcassets/WidgetBackground.colorset/Contents.json deleted file mode 100644 index eb87897..0000000 --- a/PhoneWidget/Assets.xcassets/WidgetBackground.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/PhoneWidget/Info.plist b/PhoneWidget/Info.plist deleted file mode 100644 index 0f118fb..0000000 --- a/PhoneWidget/Info.plist +++ /dev/null @@ -1,11 +0,0 @@ - - - - - NSExtension - - NSExtensionPointIdentifier - com.apple.widgetkit-extension - - - diff --git a/WatchWidget/Assets.xcassets/AccentColor.colorset/Contents.json b/WatchWidget/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index eb87897..0000000 --- a/WatchWidget/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/WatchWidget/Assets.xcassets/AppIcon.appiconset/Contents.json b/WatchWidget/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 49c81cd..0000000 --- a/WatchWidget/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "platform" : "watchos", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/WatchWidget/Assets.xcassets/Contents.json b/WatchWidget/Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/WatchWidget/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/WatchWidget/Assets.xcassets/WidgetBackground.colorset/Contents.json b/WatchWidget/Assets.xcassets/WidgetBackground.colorset/Contents.json deleted file mode 100644 index eb87897..0000000 --- a/WatchWidget/Assets.xcassets/WidgetBackground.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/WatchWidget/Info.plist b/WatchWidget/Info.plist deleted file mode 100644 index 0f118fb..0000000 --- a/WatchWidget/Info.plist +++ /dev/null @@ -1,11 +0,0 @@ - - - - - NSExtension - - NSExtensionPointIdentifier - com.apple.widgetkit-extension - - - diff --git a/WatchWidget/WatchWidget.intentdefinition b/WatchWidget/WatchWidget.intentdefinition deleted file mode 100644 index bdb4045..0000000 --- a/WatchWidget/WatchWidget.intentdefinition +++ /dev/null @@ -1,59 +0,0 @@ - - - - - INEnums - - INIntentDefinitionModelVersion - 1.2 - INIntentDefinitionNamespace - 88xZPY - INIntentDefinitionSystemVersion - 20A294 - INIntentDefinitionToolsBuildVersion - 12A6144 - INIntentDefinitionToolsVersion - 12.0 - INIntents - - - INIntentCategory - information - INIntentDescriptionID - tVvJ9c - INIntentEligibleForWidgets - - INIntentIneligibleForSuggestions - - INIntentName - Configuration - INIntentResponse - - INIntentResponseCodes - - - INIntentResponseCodeName - success - INIntentResponseCodeSuccess - - - - INIntentResponseCodeName - failure - - - - INIntentTitle - Configuration - INIntentTitleID - gpCwrM - INIntentType - Custom - INIntentVerb - View - - - INTypes - - - diff --git a/MacWidget/Info.plist b/WidgetShared/Info.plist similarity index 100% rename from MacWidget/Info.plist rename to WidgetShared/Info.plist diff --git a/MacWidget/MacWidget.intentdefinition b/WidgetShared/Widget.intentdefinition similarity index 100% rename from MacWidget/MacWidget.intentdefinition rename to WidgetShared/Widget.intentdefinition diff --git a/MacWidget/Assets.xcassets/AccentColor.colorset/Contents.json b/WidgetShared/WidgetAssets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from MacWidget/Assets.xcassets/AccentColor.colorset/Contents.json rename to WidgetShared/WidgetAssets.xcassets/AccentColor.colorset/Contents.json diff --git a/PhoneWidget/Assets.xcassets/AppIcon.appiconset/Contents.json b/WidgetShared/WidgetAssets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from PhoneWidget/Assets.xcassets/AppIcon.appiconset/Contents.json rename to WidgetShared/WidgetAssets.xcassets/AppIcon.appiconset/Contents.json diff --git a/MacWidget/Assets.xcassets/Contents.json b/WidgetShared/WidgetAssets.xcassets/Contents.json similarity index 100% rename from MacWidget/Assets.xcassets/Contents.json rename to WidgetShared/WidgetAssets.xcassets/Contents.json diff --git a/MacWidget/Assets.xcassets/WidgetBackground.colorset/Contents.json b/WidgetShared/WidgetAssets.xcassets/WidgetBackground.colorset/Contents.json similarity index 100% rename from MacWidget/Assets.xcassets/WidgetBackground.colorset/Contents.json rename to WidgetShared/WidgetAssets.xcassets/WidgetBackground.colorset/Contents.json