diff --git a/Account/Package.swift b/Account/Package.swift index 03b611491..8a53ae40e 100644 --- a/Account/Package.swift +++ b/Account/Package.swift @@ -7,6 +7,7 @@ let package = Package( products: [ .library( name: "Account", + type: .dynamic, targets: ["Account"]), ], dependencies: [ diff --git a/Articles/Package.swift b/Articles/Package.swift index 530fa9d38..9a996999d 100644 --- a/Articles/Package.swift +++ b/Articles/Package.swift @@ -7,6 +7,7 @@ let package = Package( products: [ .library( name: "Articles", + type: .dynamic, targets: ["Articles"]), ], dependencies: [ diff --git a/ArticlesDatabase/Package.swift b/ArticlesDatabase/Package.swift index 4ded3d659..a8d1df496 100644 --- a/ArticlesDatabase/Package.swift +++ b/ArticlesDatabase/Package.swift @@ -9,6 +9,7 @@ let package = Package( products: [ .library( name: "ArticlesDatabase", + type: .dynamic, targets: ["ArticlesDatabase"]), ], dependencies: [ diff --git a/Mac/Resources/Assets.xcassets/shareExtension.imageset/Contents.json b/Mac/Resources/Assets.xcassets/shareExtension.imageset/Contents.json deleted file mode 100644 index c3628e3ae..000000000 --- a/Mac/Resources/Assets.xcassets/shareExtension.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "filename" : "Icon-MacOS-32x32@1x.png.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Icon-MacOS-32x32@2x.png.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Mac/Resources/Assets.xcassets/shareExtension.imageset/Icon-MacOS-32x32@1x.png.png b/Mac/Resources/Assets.xcassets/shareExtension.imageset/Icon-MacOS-32x32@1x.png.png deleted file mode 100644 index 084985da6..000000000 Binary files a/Mac/Resources/Assets.xcassets/shareExtension.imageset/Icon-MacOS-32x32@1x.png.png and /dev/null differ diff --git a/Mac/Resources/Assets.xcassets/shareExtension.imageset/Icon-MacOS-32x32@2x.png.png b/Mac/Resources/Assets.xcassets/shareExtension.imageset/Icon-MacOS-32x32@2x.png.png deleted file mode 100644 index 0c1d6e3b4..000000000 Binary files a/Mac/Resources/Assets.xcassets/shareExtension.imageset/Icon-MacOS-32x32@2x.png.png and /dev/null differ diff --git a/Mac/ShareExtension/Base.lproj/ShareViewController.xib b/Mac/ShareExtension/Base.lproj/ShareViewController.xib index f1388f882..cf4532e48 100644 --- a/Mac/ShareExtension/Base.lproj/ShareViewController.xib +++ b/Mac/ShareExtension/Base.lproj/ShareViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -15,11 +15,11 @@ - + - + @@ -55,7 +55,7 @@ Gw - + @@ -76,7 +76,7 @@ Gw - + @@ -84,7 +84,7 @@ Gw - + @@ -92,7 +92,7 @@ Gw - + @@ -109,7 +109,7 @@ Gw - + @@ -143,6 +143,6 @@ Gw - + diff --git a/Mac/ShareExtension/Info.plist b/Mac/ShareExtension/Info.plist index 1b695cba7..595e87d25 100644 --- a/Mac/ShareExtension/Info.plist +++ b/Mac/ShareExtension/Info.plist @@ -15,7 +15,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIconFile - icon + icon.icns CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/Mac/ShareExtension/icon.icns b/Mac/ShareExtension/icon.icns index 84ae85cdf..93bdf5f27 100644 Binary files a/Mac/ShareExtension/icon.icns and b/Mac/ShareExtension/icon.icns differ diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 405f0127b..7b851b19d 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -220,6 +220,17 @@ 513146B3235A81A400387FDC /* AddWebFeedIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513146B1235A81A400387FDC /* AddWebFeedIntentHandler.swift */; }; 51314704235C41FC00387FDC /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 51314707235C41FC00387FDC /* Intents.intentdefinition */; }; 51314705235C41FC00387FDC /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 51314707235C41FC00387FDC /* Intents.intentdefinition */; }; + 513277442590FBB60064F1E7 /* Account in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 514C16CD24D2E63F009A3AFA /* Account */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 5132775E2590FC640064F1E7 /* Articles in Frameworks */ = {isa = PBXBuildFile; productRef = 5132775D2590FC640064F1E7 /* Articles */; }; + 5132775F2590FC640064F1E7 /* Articles in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 5132775D2590FC640064F1E7 /* Articles */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 513277612590FC640064F1E7 /* ArticlesDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 513277602590FC640064F1E7 /* ArticlesDatabase */; }; + 513277622590FC640064F1E7 /* ArticlesDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 513277602590FC640064F1E7 /* ArticlesDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 513277642590FC640064F1E7 /* SyncDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 513277632590FC640064F1E7 /* SyncDatabase */; }; + 513277652590FC640064F1E7 /* SyncDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 513277632590FC640064F1E7 /* SyncDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 513277662590FC780064F1E7 /* Secrets in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51C4CFF524D37DD500AF9874 /* Secrets */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 5132778C2590FF1E0064F1E7 /* RSCore in Frameworks */ = {isa = PBXBuildFile; productRef = 5132778B2590FF1E0064F1E7 /* RSCore */; }; + 5132778D2590FF1E0064F1E7 /* RSCore in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 5132778B2590FF1E0064F1E7 /* RSCore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 5132779F2591034D0064F1E7 /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5132779E2591034D0064F1E7 /* icon.icns */; }; 51333D1624685D2E00EB5C91 /* AddRedditFeedWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51333D1524685D2E00EB5C91 /* AddRedditFeedWindowController.swift */; }; 51333D1724685D2E00EB5C91 /* AddRedditFeedWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51333D1524685D2E00EB5C91 /* AddRedditFeedWindowController.swift */; }; 51333D3B2468615D00EB5C91 /* AddRedditFeedSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 51333D392468615D00EB5C91 /* AddRedditFeedSheet.xib */; }; @@ -727,9 +738,7 @@ 51EF0F7A22771B890050506E /* ColorHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51EF0F78227716380050506E /* ColorHash.swift */; }; 51EF0F7E2277A57D0050506E /* MasterTimelineAccessibilityCellLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51EF0F7D2277A57D0050506E /* MasterTimelineAccessibilityCellLayout.swift */; }; 51EF0F802277A8330050506E /* MasterTimelineCellLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51EF0F7F2277A8330050506E /* MasterTimelineCellLayout.swift */; }; - 51EFDA1A24E6159C0085C3D6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 849C64671ED37A5D003D8FC0 /* Assets.xcassets */; }; 51EFDA1B24E6D16A0085C3D6 /* SafariExt.js in Resources */ = {isa = PBXBuildFile; fileRef = 515D4FCB2325815A00EE1167 /* SafariExt.js */; }; - 51EFDA1D24E6E27E0085C3D6 /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 51EFDA1C24E6E27E0085C3D6 /* icon.icns */; }; 51F85BEB22724CB600C787DC /* About.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 51F85BEA22724CB600C787DC /* About.rtf */; }; 51F85BEF2272520B00C787DC /* Thanks.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 51F85BEE2272520B00C787DC /* Thanks.rtf */; }; 51F85BF12272524100C787DC /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 51F85BF02272524100C787DC /* Credits.rtf */; }; @@ -1218,6 +1227,17 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; + 513277512590FC000064F1E7 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 5132778D2590FF1E0064F1E7 /* RSCore in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; 513C5CF1232571C2003D4054 /* Embed App Extensions */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -1340,8 +1360,13 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + 513277442590FBB60064F1E7 /* Account in Embed Frameworks */, + 5132775F2590FC640064F1E7 /* Articles in Embed Frameworks */, 51A737C624DB19B50015FA66 /* RSWeb in Embed Frameworks */, 51A737C024DB197F0015FA66 /* RSDatabase in Embed Frameworks */, + 513277662590FC780064F1E7 /* Secrets in Embed Frameworks */, + 513277652590FC640064F1E7 /* SyncDatabase in Embed Frameworks */, + 513277622590FC640064F1E7 /* ArticlesDatabase in Embed Frameworks */, 51A737AF24DB19730015FA66 /* RSCore in Embed Frameworks */, 51A737C924DB19CC0015FA66 /* RSParser in Embed Frameworks */, 514C16DF24D2EF15009A3AFA /* RSTree in Embed Frameworks */, @@ -1479,6 +1504,7 @@ 513146B1235A81A400387FDC /* AddWebFeedIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddWebFeedIntentHandler.swift; sourceTree = ""; }; 51314706235C41FC00387FDC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Base; path = Base.lproj/Intents.intentdefinition; sourceTree = ""; }; 51314714235C420900387FDC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Intents.strings; sourceTree = ""; }; + 5132779E2591034D0064F1E7 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = ""; }; 51333D1524685D2E00EB5C91 /* AddRedditFeedWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddRedditFeedWindowController.swift; sourceTree = ""; }; 51333D3A2468615D00EB5C91 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Mac/Base.lproj/AddRedditFeedSheet.xib; sourceTree = SOURCE_ROOT; }; 51386A8D25673276005F3762 /* AccountCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountCell.swift; sourceTree = ""; }; @@ -1725,7 +1751,6 @@ 51EF0F78227716380050506E /* ColorHash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorHash.swift; sourceTree = ""; }; 51EF0F7D2277A57D0050506E /* MasterTimelineAccessibilityCellLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterTimelineAccessibilityCellLayout.swift; sourceTree = ""; }; 51EF0F7F2277A8330050506E /* MasterTimelineCellLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterTimelineCellLayout.swift; sourceTree = ""; }; - 51EFDA1C24E6E27E0085C3D6 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = ""; }; 51F805D32428499E0022C792 /* NetNewsWire-dev.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "NetNewsWire-dev.entitlements"; sourceTree = ""; }; 51F805ED24284C1C0022C792 /* NetNewsWire-dev.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "NetNewsWire-dev.entitlements"; sourceTree = ""; }; 51F85BEA22724CB600C787DC /* About.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = About.rtf; sourceTree = ""; }; @@ -1990,6 +2015,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 5132778C2590FF1E0064F1E7 /* RSCore in Frameworks */, 511B148924E5DBDD00C919BD /* Account in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2093,9 +2119,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 513277642590FC640064F1E7 /* SyncDatabase in Frameworks */, 17192ADA2567B3D500AAEACA /* RSSparkle in Frameworks */, 51A737C524DB19B50015FA66 /* RSWeb in Frameworks */, 514C16DE24D2EF15009A3AFA /* RSTree in Frameworks */, + 5132775E2590FC640064F1E7 /* Articles in Frameworks */, + 513277612590FC640064F1E7 /* ArticlesDatabase in Frameworks */, 51C4CFF624D37DD500AF9874 /* Secrets in Frameworks */, 51A737AE24DB19730015FA66 /* RSCore in Frameworks */, 51A737C824DB19CC0015FA66 /* RSParser in Frameworks */, @@ -2344,7 +2373,7 @@ 510C415D24E5CDE3008226FD /* ShareExtension */ = { isa = PBXGroup; children = ( - 51EFDA1C24E6E27E0085C3D6 /* icon.icns */, + 5132779E2591034D0064F1E7 /* icon.icns */, 510C416024E5CDE3008226FD /* ShareViewController.swift */, 510C416224E5CDE3008226FD /* ShareViewController.xib */, 510C416524E5CDE3008226FD /* Info.plist */, @@ -3638,6 +3667,8 @@ 510C415824E5CDE3008226FD /* Sources */, 510C415924E5CDE3008226FD /* Frameworks */, 510C415A24E5CDE3008226FD /* Resources */, + 513277512590FC000064F1E7 /* Embed Frameworks */, + 51327793259101E50064F1E7 /* Delete Unnecessary Frameworks */, ); buildRules = ( ); @@ -3646,6 +3677,7 @@ name = "NetNewsWire Share Extension"; packageProductDependencies = ( 511B148824E5DBDD00C919BD /* Account */, + 5132778B2590FF1E0064F1E7 /* RSCore */, ); productName = ShareExtension; productReference = 510C415C24E5CDE3008226FD /* NetNewsWire Share Extension.appex */; @@ -3891,6 +3923,9 @@ 51A737C724DB19CC0015FA66 /* RSParser */, 17192AD92567B3D500AAEACA /* RSSparkle */, 519CA8E425841DB700EB079A /* CrashReporter */, + 5132775D2590FC640064F1E7 /* Articles */, + 513277602590FC640064F1E7 /* ArticlesDatabase */, + 513277632590FC640064F1E7 /* SyncDatabase */, ); productName = NetNewsWire; productReference = 849C64601ED37A5D003D8FC0 /* NetNewsWire.app */; @@ -4055,8 +4090,7 @@ buildActionMask = 2147483647; files = ( 510C416424E5CDE3008226FD /* ShareViewController.xib in Resources */, - 51EFDA1D24E6E27E0085C3D6 /* icon.icns in Resources */, - 51EFDA1A24E6159C0085C3D6 /* Assets.xcassets in Resources */, + 5132779F2591034D0064F1E7 /* icon.icns in Resources */, 51EFDA1B24E6D16A0085C3D6 /* SafariExt.js in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -4308,6 +4342,24 @@ shellPath = /bin/sh; shellScript = "if ! command -v swiftgen &> /dev/null\nthen\n echo \"swiftgen could not be found\"\n exit\nfi\n\nswiftgen run strings -t structured-swift5 \"$PROJECT_DIR/Widget/Resources/en.lproj/Localizable.strings\" \"$PROJECT_DIR/Widget/Resources/Localizable.stringsdict\" --output \"$PROJECT_DIR/Widget/Resources/Localized.swift\";\n"; }; + 51327793259101E50064F1E7 /* Delete Unnecessary Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Delete Unnecessary Frameworks"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Delete the framework that Xcode should have never included\n# https://forums.swift.org/t/is-this-an-xcode-bug-or-somehow-related-to-spm/33987\nrm -rf \"${TARGET_BUILD_DIR}/NetNewsWire Share Extension.appex/Contents/Frameworks\"\n"; + }; 515D50802326D02600EE1167 /* Run Script: Verify No Build Settings */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 8; @@ -6050,6 +6102,23 @@ isa = XCSwiftPackageProductDependency; productName = Account; }; + 5132775D2590FC640064F1E7 /* Articles */ = { + isa = XCSwiftPackageProductDependency; + productName = Articles; + }; + 513277602590FC640064F1E7 /* ArticlesDatabase */ = { + isa = XCSwiftPackageProductDependency; + productName = ArticlesDatabase; + }; + 513277632590FC640064F1E7 /* SyncDatabase */ = { + isa = XCSwiftPackageProductDependency; + productName = SyncDatabase; + }; + 5132778B2590FF1E0064F1E7 /* RSCore */ = { + isa = XCSwiftPackageProductDependency; + package = 5102AE4324D17E820050839C /* XCRemoteSwiftPackageReference "RSCore" */; + productName = RSCore; + }; 5138E93924D33E5600AFF0FE /* RSTree */ = { isa = XCSwiftPackageProductDependency; package = 510ECA4024D1DCD0001C31A6 /* XCRemoteSwiftPackageReference "RSTree" */; diff --git a/Secrets/Package.swift b/Secrets/Package.swift index e50fe906a..2e30c6a8a 100644 --- a/Secrets/Package.swift +++ b/Secrets/Package.swift @@ -7,6 +7,7 @@ let package = Package( products: [ .library( name: "Secrets", + type: .dynamic, targets: ["Secrets"]), ], dependencies: [ diff --git a/SyncDatabase/Package.swift b/SyncDatabase/Package.swift index 181b20880..b78824b86 100644 --- a/SyncDatabase/Package.swift +++ b/SyncDatabase/Package.swift @@ -7,6 +7,7 @@ let package = Package( products: [ .library( name: "SyncDatabase", + type: .dynamic, targets: ["SyncDatabase"]), ], dependencies: [ diff --git a/xcconfig/NetNewsWire_shareextension_target.xcconfig b/xcconfig/NetNewsWire_shareextension_target.xcconfig index a21e5171b..fa2973248 100644 --- a/xcconfig/NetNewsWire_shareextension_target.xcconfig +++ b/xcconfig/NetNewsWire_shareextension_target.xcconfig @@ -39,5 +39,6 @@ INFOPLIST_FILE = Mac/ShareExtension/Info.plist LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks PRODUCT_BUNDLE_IDENTIFIER = $(ORGANIZATION_IDENTIFIER).NetNewsWire-Evergreen.Mac.ShareExtension PRODUCT_NAME = $(TARGET_NAME) +ASSETCATALOG_COMPILER_APPICON_NAME = SDKROOT = macosx