Reorganize DemoApp project structure

- Move DemoApp AppKit and UIKit projects into their own directories at the top level - Update project file references and build settings to reflect new locations - No changes to actual source code
krzyzanowskim · Dec 14, 2024 · fd18449 · fd18449
1 parent 602d6c0
commit fd18449
Show file tree

Hide file tree

Showing 25 changed files with 14 additions and 22 deletions.
diff --git a/DemoApp/AppDelegate.swift → DemoApp.AppKit/AppDelegate.swift b/DemoApp/AppDelegate.swift → DemoApp.AppKit/AppDelegate.swift
diff --git a/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json b/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...moApp.UIKit/Assets.xcassets/Contents.json → DemoApp.AppKit/Assets.xcassets/Contents.json b/...moApp.UIKit/Assets.xcassets/Contents.json → DemoApp.AppKit/Assets.xcassets/Contents.json
diff --git a/DemoApp/Base.lproj/MainMenu.xib → DemoApp.AppKit/Base.lproj/MainMenu.xib b/DemoApp/Base.lproj/MainMenu.xib → DemoApp.AppKit/Base.lproj/MainMenu.xib
diff --git a/.../DemoApp.AppKit.xcodeproj/project.pbxproj → .../DemoApp.AppKit.xcodeproj/project.pbxproj b/.../DemoApp.AppKit.xcodeproj/project.pbxproj → .../DemoApp.AppKit.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/DemoApp/DemoApp.entitlements → DemoApp.AppKit/DemoApp.entitlements b/DemoApp/DemoApp.entitlements → DemoApp.AppKit/DemoApp.entitlements
diff --git a/DemoApp/EditorViewController.swift → DemoApp.AppKit/EditorViewController.swift b/DemoApp/EditorViewController.swift → DemoApp.AppKit/EditorViewController.swift
diff --git a/DemoApp/Model/MessageLineAnnotation.swift → ....AppKit/Model/MessageLineAnnotation.swift b/DemoApp/Model/MessageLineAnnotation.swift → ....AppKit/Model/MessageLineAnnotation.swift
diff --git a/DemoApp/View/AnnotationLabelView.swift → ...App.AppKit/View/AnnotationLabelView.swift b/DemoApp/View/AnnotationLabelView.swift → ...App.AppKit/View/AnnotationLabelView.swift
diff --git a/...App.UIKit/DemoApp.UIKit/AppDelegate.swift → DemoApp.UIKit/AppDelegate.swift b/...App.UIKit/DemoApp.UIKit/AppDelegate.swift → DemoApp.UIKit/AppDelegate.swift
diff --git a/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json b/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/DemoApp/Assets.xcassets/Contents.json → DemoApp.UIKit/Assets.xcassets/Contents.json b/DemoApp/Assets.xcassets/Contents.json → DemoApp.UIKit/Assets.xcassets/Contents.json
diff --git a/....UIKit/Base.lproj/LaunchScreen.storyboard → ....UIKit/Base.lproj/LaunchScreen.storyboard b/....UIKit/Base.lproj/LaunchScreen.storyboard → ....UIKit/Base.lproj/LaunchScreen.storyboard
diff --git a/.../DemoApp.UIKit/Base.lproj/Main.storyboard → DemoApp.UIKit/Base.lproj/Main.storyboard b/.../DemoApp.UIKit/Base.lproj/Main.storyboard → DemoApp.UIKit/Base.lproj/Main.storyboard
diff --git 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 = "<group>";
-		};
-		3E8504BB2C991A98004DC5CC /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				3E8504BA2C991A98004DC5CC /* DemoApp.UIKit.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		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 = "<group>";
+		};
+		3E8504BB2C991A98004DC5CC /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				3E8504BA2C991A98004DC5CC /* DemoApp.UIKit.app */,
+			);
+			name = Products;
 			sourceTree = "<group>";
 		};
 		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 → DemoApp.UIKit/Info.plist b/DemoApp.UIKit/DemoApp.UIKit/Info.plist → DemoApp.UIKit/Info.plist
diff --git a/...p.UIKit/Model/MessageLineAnnotation.swift → ...p.UIKit/Model/MessageLineAnnotation.swift b/...p.UIKit/Model/MessageLineAnnotation.swift → ...p.UIKit/Model/MessageLineAnnotation.swift
diff --git a/...p.UIKit/DemoApp.UIKit/SceneDelegate.swift → DemoApp.UIKit/SceneDelegate.swift b/...p.UIKit/DemoApp.UIKit/SceneDelegate.swift → DemoApp.UIKit/SceneDelegate.swift
diff --git a/...oApp.UIKit/View/AnnotationLabelView.swift → DemoApp.UIKit/View/AnnotationLabelView.swift b/...oApp.UIKit/View/AnnotationLabelView.swift → DemoApp.UIKit/View/AnnotationLabelView.swift
diff --git a/....UIKit/DemoApp.UIKit/ViewController.swift → DemoApp.UIKit/ViewController.swift b/....UIKit/DemoApp.UIKit/ViewController.swift → DemoApp.UIKit/ViewController.swift
diff --git a/DemoApp.xcworkspace/contents.xcworkspacedata b/DemoApp.xcworkspace/contents.xcworkspacedata