renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Ranchero-Software/NetNewsWire

Browse Source
This commit is contained in:
Maurice Parker
2023-02-07 15:30:29 -08:00
parent 724ac6e216 5d4a12084d
commit 93d803ac7d
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
NetNewsWire.xcodeproj/project.pbxproj
View File

@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {
/* Begin PBXBuildFile section */
@@ -3550,6 +3550,7 @@
};
5170CA5A279E468000702605 /* Delete Unnecessary Frameworks */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -4579,6 +4580,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 1768140A2564BB8300D98635 /* NetNewsWire_iOSwidgetextension_target.xcconfig */;
buildSettings = {
OTHER_LDFLAGS = (
"$(inherited)",
"-Xlinker",
"-no_application_extension",
);
};
name = Debug;
};
@@ -4586,6 +4592,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 1768140A2564BB8300D98635 /* NetNewsWire_iOSwidgetextension_target.xcconfig */;
buildSettings = {
OTHER_LDFLAGS = (
"$(inherited)",
"-Xlinker",
"-no_application_extension",
);
};
name = Release;
};
@@ -4607,6 +4618,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 51314617235A797400387FDC /* NetNewsWire_iOSintentextension_target.xcconfig */;
buildSettings = {
OTHER_LDFLAGS = (
"$(inherited)",
"-Xlinker",
"-no_application_extension",
);
};
name = Debug;
};
@@ -4614,6 +4630,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 51314617235A797400387FDC /* NetNewsWire_iOSintentextension_target.xcconfig */;
buildSettings = {
OTHER_LDFLAGS = (
"$(inherited)",
"-Xlinker",
"-no_application_extension",
);
};
name = Release;
};
@@ -4621,6 +4642,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 515D4FCE2325B3D000EE1167 /* NetNewsWire_iOSshareextension_target.xcconfig */;
buildSettings = {
OTHER_LDFLAGS = (
"$(inherited)",
"-Xlinker",
"-no_application_extension",
);
};
name = Debug;
};
@@ -4628,6 +4654,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 515D4FCE2325B3D000EE1167 /* NetNewsWire_iOSshareextension_target.xcconfig */;
buildSettings = {
OTHER_LDFLAGS = (
"$(inherited)",
"-Xlinker",
"-no_application_extension",
);
};
name = Release;
};

4
Shared/ArticleStyles/ArticleThemeDownloader.swift
View File

@@ -77,6 +77,10 @@ public class ArticleThemeDownloader: Logging {
private func findThemeFile(in searchPath: String) -> String? {
if let directoryContents = FileManager.default.enumerator(atPath: searchPath) {
while let file = directoryContents.nextObject() as? String {
if file.hasPrefix("__MACOSX/") {
logger.debug("Ignoring theme file in __MACOSX folder.")
continue
}
if file.hasSuffix(".nnwtheme") {
return file
}