From 39001b0ffac9c6a1cc8aacc08e91cf4706ab5b7a Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Fri, 5 Oct 2018 13:50:21 -0700 Subject: [PATCH] Disable Swift 3 @objc inference --- Metaballs.xcodeproj/project.pbxproj | 4 ++-- MetaballsKit/Metaballs.swift | 3 +-- MetaballsSaver/MetaballsSaverView.swift | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Metaballs.xcodeproj/project.pbxproj b/Metaballs.xcodeproj/project.pbxproj index f256a67..8d2b242 100644 --- a/Metaballs.xcodeproj/project.pbxproj +++ b/Metaballs.xcodeproj/project.pbxproj @@ -675,7 +675,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.Metaballs; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.2; }; name = Debug; @@ -690,7 +690,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.Metaballs; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.2; }; name = Release; diff --git a/MetaballsKit/Metaballs.swift b/MetaballsKit/Metaballs.swift index 058ee96..00fabee 100644 --- a/MetaballsKit/Metaballs.swift +++ b/MetaballsKit/Metaballs.swift @@ -260,8 +260,7 @@ public class Field { // MARK: - Notifications - @objc - func preferencesDidChange(note: Notification) { + @objc func preferencesDidChange(note: Notification) { guard let userInfo = note.userInfo else { return } var didChange = false if let style = userInfo["colorStyle"] as? ColorStyle { diff --git a/MetaballsSaver/MetaballsSaverView.swift b/MetaballsSaver/MetaballsSaverView.swift index ab4dbbe..6fe05fb 100644 --- a/MetaballsSaver/MetaballsSaverView.swift +++ b/MetaballsSaver/MetaballsSaverView.swift @@ -11,7 +11,7 @@ import MetaballsKit import MetalKit import ScreenSaver -@objc public class MetaballsSaverView: ScreenSaverView, RendererDelegate { +public class MetaballsSaverView: ScreenSaverView, RendererDelegate { private static func defaultParameters() -> Parameters { var p = Parameters() let defaults = UserDefaults.standard