From 5c9bf4cc5cbd212c6d378ab9f8a08228dc54f7ed Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 17 Dec 2018 21:06:58 -0800 Subject: [PATCH] Remove plcrashreporter. --- .gitmodules | 4 +- NetNewsWire.xcodeproj/project.pbxproj | 208 ++++++++++++++++++++++++++ submodules/plcrashreporter | 1 - 3 files changed, 209 insertions(+), 4 deletions(-) delete mode 160000 submodules/plcrashreporter diff --git a/.gitmodules b/.gitmodules index 5245b19b7..90e08626d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,6 +16,4 @@ [submodule "submodules/RSDatabase"] path = submodules/RSDatabase url = https://github.com/brentsimmons/RSDatabase -[submodule "submodules/plcrashreporter"] - path = submodules/plcrashreporter - url = https://opensource.plausible.coop/stash/scm/plcr/plcrashreporter.git + diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index bbd29fd41..53efbe71e 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -495,6 +495,97 @@ remoteGlobalIDString = 848934F51F62484F00CEBD24; remoteInfo = Account; }; + 848B932921C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 05E731F30EFA1AAB005EDFB7; + remoteInfo = "CrashReporter-MacOSX-Static"; + }; + 848B932B21C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = "CrashReporter-MacOSX"; + }; + 848B932D21C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 058812B91040582D009128FB; + remoteInfo = "CrashReporter-iOS"; + }; + 848B932F21C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 05CD31520EE936A9000FDE88; + remoteInfo = "CrashReporter-iOS-Device"; + }; + 848B933121C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 05CD31630EE93905000FDE88; + remoteInfo = "CrashReporter-iOS-Simulator"; + }; + 848B933321C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 05E731E30EFA1A3E005EDFB7; + remoteInfo = plcrashutil; + }; + 848B933521C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 05CD32690EE93DC3000FDE88; + remoteInfo = "Tests-MacOSX"; + }; + 848B933721C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 05CD32A90EE94062000FDE88; + remoteInfo = "Tests-iOS-Simulator"; + }; + 848B933921C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 05CD33240EE94439000FDE88; + remoteInfo = "Tests-iOS-Device"; + }; + 848B933B21C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 05F40CE70EF7AB80008050CF; + remoteInfo = DemoCrash; + }; + 848B933D21C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 052A45CF136353FB00987004; + remoteInfo = "DemoCrash-iOS-Device"; + }; + 848B933F21C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 052A464F136355FD00987004; + remoteInfo = "DemoCrash-iOS-Simulator"; + }; + 848B934121C8B1770038DC0D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 050DE24D0F61B80B00152ED3; + remoteInfo = "Fuzz Testing"; + }; 849C64721ED37A5D003D8FC0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 849C64581ED37A5D003D8FC0 /* Project object */; @@ -799,6 +890,7 @@ 847752FE2008879500D93690 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; 847FA120202BA34100BB56C8 /* SidebarContextualMenuDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarContextualMenuDelegate.swift; sourceTree = ""; }; 848B930921C8B0BF0038DC0D /* Subscribe-to-Feed-MAS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Subscribe-to-Feed-MAS-Info.plist"; sourceTree = ""; }; + 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CrashReporter.xcodeproj; path = submodules/plcrashreporter/CrashReporter.xcodeproj; sourceTree = ""; }; 848D578D21543519005FFAD5 /* PasteboardFeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteboardFeed.swift; sourceTree = ""; }; 848F6AE41FC29CFA002D422E /* FaviconDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FaviconDownloader.swift; sourceTree = ""; }; 849A97421ED9EAA9007D329B /* AddFolderWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddFolderWindowController.swift; sourceTree = ""; }; @@ -1204,6 +1296,26 @@ path = Commands; sourceTree = ""; }; + 848B931721C8B1770038DC0D /* Products */ = { + isa = PBXGroup; + children = ( + 848B932A21C8B1770038DC0D /* libCrashReporter-MacOSX-Static.a */, + 848B932C21C8B1770038DC0D /* CrashReporter.framework */, + 848B932E21C8B1770038DC0D /* CrashReporter.framework */, + 848B933021C8B1770038DC0D /* libCrashReporter-iphoneos.a */, + 848B933221C8B1770038DC0D /* libCrashReporter-iphonesimulator.a */, + 848B933421C8B1770038DC0D /* plcrashutil */, + 848B933621C8B1770038DC0D /* Tests-MacOSX.xctest */, + 848B933821C8B1770038DC0D /* Tests-iOS-Simulator.xctest */, + 848B933A21C8B1770038DC0D /* Tests-iOS-Device.xctest */, + 848B933C21C8B1770038DC0D /* DemoCrash.app */, + 848B933E21C8B1770038DC0D /* DemoCrash-iOS-Device.app */, + 848B934021C8B1770038DC0D /* DemoCrash-iOS-Simulator.app */, + 848B934221C8B1770038DC0D /* Fuzz Testing */, + ); + name = Products; + sourceTree = ""; + }; 848F6AE31FC29CFA002D422E /* Favicons */ = { isa = PBXGroup; children = ( @@ -1428,6 +1540,7 @@ 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */, 84C37F8F20DD8CFD00CA8CF5 /* RSTree.xcodeproj */, 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */, + 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */, ); sourceTree = ""; usesTabs = 1; @@ -1939,6 +2052,10 @@ ProductGroup = 841D4D5F2106B3E100DD04E6 /* Products */; ProjectRef = 841D4D5E2106B3E100DD04E6 /* ArticlesDatabase.xcodeproj */; }, + { + ProductGroup = 848B931721C8B1770038DC0D /* Products */; + ProjectRef = 848B931621C8B1770038DC0D /* CrashReporter.xcodeproj */; + }, { ProductGroup = 84C37F2320DD8CCD00CA8CF5 /* Products */; ProjectRef = 84C37F2220DD8CCD00CA8CF5 /* DB5.xcodeproj */; @@ -2021,6 +2138,97 @@ remoteRef = 846E773B1F6EF5D700A165E2 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 848B932A21C8B1770038DC0D /* libCrashReporter-MacOSX-Static.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCrashReporter-MacOSX-Static.a"; + remoteRef = 848B932921C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B932C21C8B1770038DC0D /* CrashReporter.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = CrashReporter.framework; + remoteRef = 848B932B21C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B932E21C8B1770038DC0D /* CrashReporter.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = CrashReporter.framework; + remoteRef = 848B932D21C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B933021C8B1770038DC0D /* libCrashReporter-iphoneos.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCrashReporter-iphoneos.a"; + remoteRef = 848B932F21C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B933221C8B1770038DC0D /* libCrashReporter-iphonesimulator.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCrashReporter-iphonesimulator.a"; + remoteRef = 848B933121C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B933421C8B1770038DC0D /* plcrashutil */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = plcrashutil; + remoteRef = 848B933321C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B933621C8B1770038DC0D /* Tests-MacOSX.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Tests-MacOSX.xctest"; + remoteRef = 848B933521C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B933821C8B1770038DC0D /* Tests-iOS-Simulator.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Tests-iOS-Simulator.xctest"; + remoteRef = 848B933721C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B933A21C8B1770038DC0D /* Tests-iOS-Device.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Tests-iOS-Device.xctest"; + remoteRef = 848B933921C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B933C21C8B1770038DC0D /* DemoCrash.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = DemoCrash.app; + remoteRef = 848B933B21C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B933E21C8B1770038DC0D /* DemoCrash-iOS-Device.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = "DemoCrash-iOS-Device.app"; + remoteRef = 848B933D21C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B934021C8B1770038DC0D /* DemoCrash-iOS-Simulator.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = "DemoCrash-iOS-Simulator.app"; + remoteRef = 848B933F21C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 848B934221C8B1770038DC0D /* Fuzz Testing */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = "Fuzz Testing"; + remoteRef = 848B934121C8B1770038DC0D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 84C37F2820DD8CCE00CA8CF5 /* DB5.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; diff --git a/submodules/plcrashreporter b/submodules/plcrashreporter deleted file mode 160000 index 05d34741d..000000000 --- a/submodules/plcrashreporter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 05d34741d3a90bbed51214983110943831ae5943