FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1617 from Wevah/ios-candidate 

Update to latest RSCore
This commit is contained in:
Brent Simmons 2020-01-12 21:01:10 -08:00 committed by GitHub
parent 685e569387 e94985e7f2
commit e8da92d3f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/Account/AccountManager.swift
View File

@ -389,7 +389,7 @@ private struct AccountSpecifier {
init?(folderPath: String) {
if !FileManager.default.rs_fileIsFolder(folderPath) {
if !FileManager.default.isFolder(atPath: folderPath) {
return nil
}

2
Shared/ArticleStyles/ArticleStyle.swift
View File

@ -37,7 +37,7 @@ struct ArticleStyle: Equatable {
self.path = path
let isFolder = FileManager.default.rs_fileIsFolder(path)
let isFolder = FileManager.default.isFolder(atPath: path)
if isFolder {

5
Shared/ArticleStyles/ArticleStylesManager.swift
View File

@ -133,8 +133,8 @@ final class ArticleStylesManager {
private func allStylePaths(_ folder: String) -> [String] {
let filepaths = FileManager.default.rs_filepaths(inFolder: folder)
return filepaths.filter { fileAtPathIsStyle($0) }
let filepaths = FileManager.default.filePaths(inFolder: folder)
return filepaths?.filter { fileAtPathIsStyle($0) } ?? []
}
private func fileAtPathIsStyle(_ f: String) -> Bool {
@ -174,7 +174,6 @@ private func pathIsPathForStyleName(_ styleName: String, path: String) -> Bool {
}
private func pathForStyleName(_ styleName: String, folder: String) -> String? {
for onePath in allStylePaths(folder) {
if pathIsPathForStyleName(styleName, path: onePath) {
return onePath

2
Shared/Data/ArticleStringFormatter.swift
View File

@ -100,7 +100,7 @@ struct ArticleStringFormatter {
}
static func dateString(_ date: Date) -> String {
if NSCalendar.rs_dateIsToday(date) {
if Calendar.dateIsToday(date) {
return timeFormatter.string(from: date)
}
return dateFormatter.string(from: date)

2
submodules/RSCore

@ -1 +1 @@
Subproject commit 806d1fdc16511a9469bf2a18348caf9f20ff8cdc
Subproject commit 070f40e9b39ac428d09eafeb8b47ce8dde78ced8