diff --git a/DemoApp/AppDelegate.swift b/DemoApp.AppKit/AppDelegate.swift similarity index 100% rename from DemoApp/AppDelegate.swift rename to DemoApp.AppKit/AppDelegate.swift diff --git a/DemoApp.UIKit/DemoApp.UIKit/Assets.xcassets/AccentColor.colorset/Contents.json b/DemoApp.AppKit/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from DemoApp.UIKit/DemoApp.UIKit/Assets.xcassets/AccentColor.colorset/Contents.json rename to DemoApp.AppKit/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/DemoApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/DemoApp.AppKit/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from DemoApp/Assets.xcassets/AppIcon.appiconset/Contents.json rename to DemoApp.AppKit/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/DemoApp.UIKit/DemoApp.UIKit/Assets.xcassets/Contents.json b/DemoApp.AppKit/Assets.xcassets/Contents.json similarity index 100% rename from DemoApp.UIKit/DemoApp.UIKit/Assets.xcassets/Contents.json rename to DemoApp.AppKit/Assets.xcassets/Contents.json diff --git a/DemoApp/Base.lproj/MainMenu.xib b/DemoApp.AppKit/Base.lproj/MainMenu.xib similarity index 100% rename from DemoApp/Base.lproj/MainMenu.xib rename to DemoApp.AppKit/Base.lproj/MainMenu.xib diff --git a/DemoApp/DemoApp.AppKit.xcodeproj/project.pbxproj b/DemoApp.AppKit/DemoApp.AppKit.xcodeproj/project.pbxproj similarity index 100% rename from DemoApp/DemoApp.AppKit.xcodeproj/project.pbxproj rename to DemoApp.AppKit/DemoApp.AppKit.xcodeproj/project.pbxproj diff --git a/DemoApp/DemoApp.AppKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/DemoApp.AppKit/DemoApp.AppKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from DemoApp/DemoApp.AppKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to DemoApp.AppKit/DemoApp.AppKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/DemoApp/DemoApp.AppKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DemoApp.AppKit/DemoApp.AppKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from DemoApp/DemoApp.AppKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to DemoApp.AppKit/DemoApp.AppKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/DemoApp/DemoApp.entitlements b/DemoApp.AppKit/DemoApp.entitlements similarity index 100% rename from DemoApp/DemoApp.entitlements rename to DemoApp.AppKit/DemoApp.entitlements diff --git a/DemoApp/EditorViewController.swift b/DemoApp.AppKit/EditorViewController.swift similarity index 100% rename from DemoApp/EditorViewController.swift rename to DemoApp.AppKit/EditorViewController.swift diff --git a/DemoApp/Model/MessageLineAnnotation.swift b/DemoApp.AppKit/Model/MessageLineAnnotation.swift similarity index 100% rename from DemoApp/Model/MessageLineAnnotation.swift rename to DemoApp.AppKit/Model/MessageLineAnnotation.swift diff --git a/DemoApp/View/AnnotationLabelView.swift b/DemoApp.AppKit/View/AnnotationLabelView.swift similarity index 100% rename from DemoApp/View/AnnotationLabelView.swift rename to DemoApp.AppKit/View/AnnotationLabelView.swift diff --git a/DemoApp.UIKit/DemoApp.UIKit/AppDelegate.swift b/DemoApp.UIKit/AppDelegate.swift similarity index 100% rename from DemoApp.UIKit/DemoApp.UIKit/AppDelegate.swift rename to DemoApp.UIKit/AppDelegate.swift diff --git a/DemoApp/Assets.xcassets/AccentColor.colorset/Contents.json b/DemoApp.UIKit/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from DemoApp/Assets.xcassets/AccentColor.colorset/Contents.json rename to DemoApp.UIKit/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/DemoApp.UIKit/DemoApp.UIKit/Assets.xcassets/AppIcon.appiconset/Contents.json b/DemoApp.UIKit/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from DemoApp.UIKit/DemoApp.UIKit/Assets.xcassets/AppIcon.appiconset/Contents.json rename to DemoApp.UIKit/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/DemoApp/Assets.xcassets/Contents.json b/DemoApp.UIKit/Assets.xcassets/Contents.json similarity index 100% rename from DemoApp/Assets.xcassets/Contents.json rename to DemoApp.UIKit/Assets.xcassets/Contents.json diff --git a/DemoApp.UIKit/DemoApp.UIKit/Base.lproj/LaunchScreen.storyboard b/DemoApp.UIKit/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from DemoApp.UIKit/DemoApp.UIKit/Base.lproj/LaunchScreen.storyboard rename to DemoApp.UIKit/Base.lproj/LaunchScreen.storyboard diff --git a/DemoApp.UIKit/DemoApp.UIKit/Base.lproj/Main.storyboard b/DemoApp.UIKit/Base.lproj/Main.storyboard similarity index 100% rename from DemoApp.UIKit/DemoApp.UIKit/Base.lproj/Main.storyboard rename to DemoApp.UIKit/Base.lproj/Main.storyboard diff --git a/DemoApp.UIKit/DemoApp.UIKit.xcodeproj/project.pbxproj b/DemoApp.UIKit/DemoApp.UIKit.xcodeproj/project.pbxproj index 7ff13b5..4cad00c 100644 --- a/DemoApp.UIKit/DemoApp.UIKit.xcodeproj/project.pbxproj +++ b/DemoApp.UIKit/DemoApp.UIKit.xcodeproj/project.pbxproj @@ -46,22 +46,6 @@ /* Begin PBXGroup section */ 3E8504B12C991A98004DC5CC = { - isa = PBXGroup; - children = ( - 3E8504BC2C991A98004DC5CC /* DemoApp.UIKit */, - 3E8504BB2C991A98004DC5CC /* Products */, - ); - sourceTree = ""; - }; - 3E8504BB2C991A98004DC5CC /* Products */ = { - isa = PBXGroup; - children = ( - 3E8504BA2C991A98004DC5CC /* DemoApp.UIKit.app */, - ); - name = Products; - sourceTree = ""; - }; - 3E8504BC2C991A98004DC5CC /* DemoApp.UIKit */ = { isa = PBXGroup; children = ( 3EB326C52C991D3C00F5C862 /* View */, @@ -73,8 +57,16 @@ 3E8504C62C991A99004DC5CC /* Assets.xcassets */, 3E8504C82C991A99004DC5CC /* LaunchScreen.storyboard */, 3E8504CB2C991A99004DC5CC /* Info.plist */, + 3E8504BB2C991A98004DC5CC /* Products */, ); - path = DemoApp.UIKit; + sourceTree = ""; + }; + 3E8504BB2C991A98004DC5CC /* Products */ = { + isa = PBXGroup; + children = ( + 3E8504BA2C991A98004DC5CC /* DemoApp.UIKit.app */, + ); + name = Products; sourceTree = ""; }; 3EB326C52C991D3C00F5C862 /* View */ = { @@ -320,9 +312,9 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = QT93JJ48BC; + DEVELOPMENT_TEAM = 67RAULRX93; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = DemoApp.UIKit/Info.plist; + INFOPLIST_FILE = Info.plist; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -353,9 +345,9 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = QT93JJ48BC; + DEVELOPMENT_TEAM = 67RAULRX93; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = DemoApp.UIKit/Info.plist; + INFOPLIST_FILE = Info.plist; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; diff --git a/DemoApp.UIKit/DemoApp.UIKit/Info.plist b/DemoApp.UIKit/Info.plist similarity index 100% rename from DemoApp.UIKit/DemoApp.UIKit/Info.plist rename to DemoApp.UIKit/Info.plist diff --git a/DemoApp.UIKit/DemoApp.UIKit/Model/MessageLineAnnotation.swift b/DemoApp.UIKit/Model/MessageLineAnnotation.swift similarity index 100% rename from DemoApp.UIKit/DemoApp.UIKit/Model/MessageLineAnnotation.swift rename to DemoApp.UIKit/Model/MessageLineAnnotation.swift diff --git a/DemoApp.UIKit/DemoApp.UIKit/SceneDelegate.swift b/DemoApp.UIKit/SceneDelegate.swift similarity index 100% rename from DemoApp.UIKit/DemoApp.UIKit/SceneDelegate.swift rename to DemoApp.UIKit/SceneDelegate.swift diff --git a/DemoApp.UIKit/DemoApp.UIKit/View/AnnotationLabelView.swift b/DemoApp.UIKit/View/AnnotationLabelView.swift similarity index 100% rename from DemoApp.UIKit/DemoApp.UIKit/View/AnnotationLabelView.swift rename to DemoApp.UIKit/View/AnnotationLabelView.swift diff --git a/DemoApp.UIKit/DemoApp.UIKit/ViewController.swift b/DemoApp.UIKit/ViewController.swift similarity index 100% rename from DemoApp.UIKit/DemoApp.UIKit/ViewController.swift rename to DemoApp.UIKit/ViewController.swift diff --git a/DemoApp.xcworkspace/contents.xcworkspacedata b/DemoApp.xcworkspace/contents.xcworkspacedata index 9b8b5b9..1b2e3d0 100644 --- a/DemoApp.xcworkspace/contents.xcworkspacedata +++ b/DemoApp.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:DemoApp.AppKit/DemoApp.AppKit.xcodeproj">