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

Convert RSCore to Swift 4. Build still broken.

This commit is contained in:
Brent Simmons 2017-07-08 12:29:10 -07:00
parent 1e856b7924
commit ea387a228f
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Frameworks/RSCore/RSCore.xcodeproj/project.pbxproj
View File

@ -755,7 +755,6 @@
PRODUCT_NAME = RSCore;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
@ -783,7 +782,6 @@
PRODUCT_NAME = RSCore;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
@ -855,7 +853,9 @@
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
SWIFT_VERSION = 4.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
@ -920,7 +920,9 @@
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
SWIFT_VERSION = 4.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
@ -946,7 +948,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
@ -970,7 +971,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
name = Release;
};
@ -991,7 +991,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
@ -1008,7 +1007,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};

2
Frameworks/RSCore/RSCore/DiskSaver.swift
View File

@ -53,7 +53,7 @@ public final class DiskSaver: NSObject {
coalescedSaveTimer = Timer.scheduledTimer(timeInterval: coalescedSaveInterval, target: self, selector: #selector(saveToDisk), userInfo: nil, repeats: false)
}
public dynamic func saveToDisk() {
@objc public dynamic func saveToDisk() {
invalidateSaveTimer()
if !dirty {

7
Frameworks/RSCore/RSCore/NSWindow-Extensions.swift
View File

@ -11,9 +11,10 @@ import Cocoa
public extension NSWindow {
public func makeFirstResponderUnlessDescendantIsFirstResponder(_ responder: NSResponder) {
if !firstResponder.hasAncestor(responder) {
makeFirstResponder(responder)
if let fr = firstResponder, fr.hasAncestor(responder) {
return
}
makeFirstResponder(responder)
}
}

2
Frameworks/RSCore/RSCore/RSToolbarItem.swift
View File

@ -45,7 +45,7 @@ private extension RSToolbarItem {
}
}
if let appDelegate = NSApplication.shared().delegate {
if let appDelegate = NSApplication.shared.delegate {
if let validated = validateWithResponder(appDelegate) {
return validated
}