From c40b7d8c053ba06fd7368058d0192898e4e031eb Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 28 Jun 2020 21:05:49 -0500 Subject: [PATCH] Tweak the project settings to get previews working --- .../{NetNewsWire.swift => MainApp.swift} | 4 ++-- Multiplatform/Shared/SwiftUIView.swift | 21 ------------------- NetNewsWire.xcodeproj/project.pbxproj | 14 +++++++------ .../xcschemes/Multiplatform iOS.xcscheme | 6 +++--- 4 files changed, 13 insertions(+), 32 deletions(-) rename Multiplatform/Shared/{NetNewsWire.swift => MainApp.swift} (94%) delete mode 100644 Multiplatform/Shared/SwiftUIView.swift diff --git a/Multiplatform/Shared/NetNewsWire.swift b/Multiplatform/Shared/MainApp.swift similarity index 94% rename from Multiplatform/Shared/NetNewsWire.swift rename to Multiplatform/Shared/MainApp.swift index 7e19c529c..7c56ca5aa 100644 --- a/Multiplatform/Shared/NetNewsWire.swift +++ b/Multiplatform/Shared/MainApp.swift @@ -1,5 +1,5 @@ // -// NetNewsWire.swift +// MainApp.swift // Shared // // Created by Maurice Parker on 6/27/20. @@ -9,7 +9,7 @@ import SwiftUI @main -struct NetNewsWire: App { +struct MainApp: App { #if os(macOS) @NSApplicationDelegateAdaptor(AppDelegate.self) private var delegate diff --git a/Multiplatform/Shared/SwiftUIView.swift b/Multiplatform/Shared/SwiftUIView.swift deleted file mode 100644 index fb44eb7f7..000000000 --- a/Multiplatform/Shared/SwiftUIView.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// SwiftUIView.swift -// NetNewsWire -// -// Created by Maurice Parker on 6/28/20. -// Copyright © 2020 Ranchero Software. All rights reserved. -// - -import SwiftUI - -struct SwiftUIView: View { - var body: some View { - Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) - } -} - -struct SwiftUIView_Previews: PreviewProvider { - static var previews: some View { - SwiftUIView() - } -} diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 0fcb16ccd..c2cb8a790 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -251,8 +251,8 @@ 51BC4B00247277E0000A6ED8 /* URL-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51BC4ADD247277DF000A6ED8 /* URL-Extensions.swift */; }; 51BC4B01247277E0000A6ED8 /* URL-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51BC4ADD247277DF000A6ED8 /* URL-Extensions.swift */; }; 51BEB22D2451E8340066DEDD /* TwitterEnterDetailTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51BEB22C2451E8340066DEDD /* TwitterEnterDetailTableViewController.swift */; }; - 51C0515E24A77DF800194D5E /* NetNewsWire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C0513624A77DF700194D5E /* NetNewsWire.swift */; }; - 51C0515F24A77DF800194D5E /* NetNewsWire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C0513624A77DF700194D5E /* NetNewsWire.swift */; }; + 51C0515E24A77DF800194D5E /* MainApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C0513624A77DF700194D5E /* MainApp.swift */; }; + 51C0515F24A77DF800194D5E /* MainApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C0513624A77DF700194D5E /* MainApp.swift */; }; 51C0516224A77DF800194D5E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 51C0513824A77DF800194D5E /* Assets.xcassets */; }; 51C0516324A77DF800194D5E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 51C0513824A77DF800194D5E /* Assets.xcassets */; }; 51C266EA238C334800F53014 /* ContextMenuPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51C266E9238C334800F53014 /* ContextMenuPreviewViewController.swift */; }; @@ -1811,7 +1811,7 @@ 51BB7C302335ACDE008E8144 /* page.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = page.html; sourceTree = ""; }; 51BC4ADD247277DF000A6ED8 /* URL-Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URL-Extensions.swift"; sourceTree = ""; }; 51BEB22C2451E8340066DEDD /* TwitterEnterDetailTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwitterEnterDetailTableViewController.swift; sourceTree = ""; }; - 51C0513624A77DF700194D5E /* NetNewsWire.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetNewsWire.swift; sourceTree = ""; }; + 51C0513624A77DF700194D5E /* MainApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainApp.swift; sourceTree = ""; }; 51C0513824A77DF800194D5E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 51C0513D24A77DF800194D5E /* NetNewsWire.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NetNewsWire.app; sourceTree = BUILT_PRODUCTS_DIR; }; 51C0513F24A77DF800194D5E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -2572,7 +2572,7 @@ 51C0519524A77E8B00194D5E /* Shared */ = { isa = PBXGroup; children = ( - 51C0513624A77DF700194D5E /* NetNewsWire.swift */, + 51C0513624A77DF700194D5E /* MainApp.swift */, 51E499D724A912C200B667CB /* SceneModel.swift */, 51E49A0224A91FF600B667CB /* SceneNavigationView.swift */, 51E4992524A80AAB00B667CB /* AppAssets.swift */, @@ -4646,7 +4646,7 @@ 51E4991924A8090A00B667CB /* CacheCleaner.swift in Sources */, 51E498F724A8085D00B667CB /* SearchTimelineFeedDelegate.swift in Sources */, 51E4993524A867E800B667CB /* AppNotifications.swift in Sources */, - 51C0515E24A77DF800194D5E /* NetNewsWire.swift in Sources */, + 51C0515E24A77DF800194D5E /* MainApp.swift in Sources */, 51E4993D24A870F800B667CB /* UserNotificationManager.swift in Sources */, 51E4991524A808FF00B667CB /* ArticleStringFormatter.swift in Sources */, 51E4995724A8734D00B667CB /* ExtensionPoint.swift in Sources */, @@ -4720,7 +4720,7 @@ 51E4991824A8090A00B667CB /* CacheCleaner.swift in Sources */, 51E498CD24A8085D00B667CB /* SearchTimelineFeedDelegate.swift in Sources */, 51E4996124A875F400B667CB /* ArticleRenderer.swift in Sources */, - 51C0515F24A77DF800194D5E /* NetNewsWire.swift in Sources */, + 51C0515F24A77DF800194D5E /* MainApp.swift in Sources */, 51E4992D24A8676300B667CB /* FetchRequestOperation.swift in Sources */, 51E4992424A8098400B667CB /* SmartFeedPasteboardWriter.swift in Sources */, 51E4991424A808FF00B667CB /* ArticleStringFormatter.swift in Sources */, @@ -5598,6 +5598,7 @@ }; 51C0516524A77DF800194D5E /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 51C0519724A7808F00194D5E /* NetNewsWire_multiplatform_iOSapp_target.xcconfig */; buildSettings = { }; name = Release; @@ -5611,6 +5612,7 @@ }; 51C0516724A77DF800194D5E /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 51C0519824A7808F00194D5E /* NetNewsWire_multiplatform_macOSapp_target.xcconfig */; buildSettings = { }; name = Release; diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/Multiplatform iOS.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/Multiplatform iOS.xcscheme index fb13f1bad..eafbe066c 100644 --- a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/Multiplatform iOS.xcscheme +++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/Multiplatform iOS.xcscheme @@ -15,7 +15,7 @@ @@ -45,7 +45,7 @@ @@ -62,7 +62,7 @@