eryn/metaballs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable Swift 3 @objc inference

Browse source
This commit is contained in:
Eryn Wells 2018-10-05 13:50:21 -07:00
parent cb516f6cf1
commit 39001b0ffa
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Metaballs.xcodeproj/project.pbxproj
View file

@ -675,7 +675,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.Metaballs; PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.Metaballs;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On; SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2; SWIFT_VERSION = 4.2;
}; };
name = Debug; name = Debug;
@ -690,7 +690,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.Metaballs; PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.Metaballs;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On; SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2; SWIFT_VERSION = 4.2;
}; };
name = Release; name = Release;

3
MetaballsKit/Metaballs.swift
View file

@ -260,8 +260,7 @@ public class Field {
// MARK: - Notifications // MARK: - Notifications
@objc @objc func preferencesDidChange(note: Notification) {
func preferencesDidChange(note: Notification) {
guard let userInfo = note.userInfo else { return } guard let userInfo = note.userInfo else { return }
var didChange = false var didChange = false
if let style = userInfo["colorStyle"] as? ColorStyle { if let style = userInfo["colorStyle"] as? ColorStyle {

2
MetaballsSaver/MetaballsSaverView.swift
View file

@ -11,7 +11,7 @@ import MetaballsKit
import MetalKit import MetalKit
import ScreenSaver import ScreenSaver
@objc public class MetaballsSaverView: ScreenSaverView, RendererDelegate { public class MetaballsSaverView: ScreenSaverView, RendererDelegate {
private static func defaultParameters() -> Parameters { private static func defaultParameters() -> Parameters {
var p = Parameters() var p = Parameters()
let defaults = UserDefaults.standard let defaults = UserDefaults.standard