Fix warnings and errors

SteveBarnegren · Sep 11, 2021 · 9e0e29b · 9e0e29b
1 parent f0a1ce8
commit 9e0e29b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 26 deletions.
diff --git a/PhysicsDemo.xcodeproj/project.pbxproj b/PhysicsDemo.xcodeproj/project.pbxproj
@@ -586,15 +586,13 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = VAA3W4LPY2;
 				ENABLE_HARDENED_RUNTIME = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/Mac",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = PhysicsDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = stevebarnegren.PhysicsDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -610,15 +608,13 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = VAA3W4LPY2;
 				ENABLE_HARDENED_RUNTIME = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/Mac",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = PhysicsDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = stevebarnegren.PhysicsDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -639,7 +635,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = stevebarnegren.PhysicsDemoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -661,7 +657,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = stevebarnegren.PhysicsDemoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/PhysicsDemo/Input Handlers/InputHandler.swift b/PhysicsDemo/Input Handlers/InputHandler.swift
@@ -13,7 +13,7 @@ struct InputHandlerContext {
     let simulationSize: Vector2D
 }
 
-protocol InputHandlerDelegate: class {
+protocol InputHandlerDelegate: AnyObject {
     func inputHandlerDidFinish(handler: InputHandler)
 }
 

diff --git a/PhysicsDemo/Input Handlers/InputHandlerAddPolyline.swift b/PhysicsDemo/Input Handlers/InputHandlerAddPolyline.swift
@@ -67,8 +67,6 @@ class InputHandlerAddPolyline: InputHandler {
             enterPressed(simulation: simulation)
         case .esc:
             escapePressed()
-        default:
-            break
         }
     }
 

diff --git a/PhysicsDemo/MainView.swift b/PhysicsDemo/MainView.swift
@@ -9,7 +9,7 @@
 import Foundation
 import AppKit
 
-protocol KeyHandler: class {
+protocol KeyHandler: AnyObject {
     func keyDown(with event: NSEvent)
     func flagsChanged(with event: NSEvent)
     func cancelOperation(_ sender: Any?)

diff --git a/PhysicsDemo/SimulationView.swift b/PhysicsDemo/SimulationView.swift
@@ -12,7 +12,7 @@ import SBSwiftUtils
 
 private let lineThickness = 2.0
 
-protocol SimulationViewDelegate: class {
+protocol SimulationViewDelegate: AnyObject {
     func mouseDown(at location: Vector2D)
     func mouseDragged(to location: Vector2D)
     func mouseUp(at location: Vector2D)

diff --git a/PhysicsDemo/UIVariable/UIVariableViewDouble.swift b/PhysicsDemo/UIVariable/UIVariableViewDouble.swift
@@ -26,9 +26,9 @@ class UIVariableViewDouble: NSView {
         titleLabel = NSTextField(labelWithString: variable.name)
         titleLabel.alignment = .center
         addSubview(titleLabel)
-        titleLabel.pinToSuperviewLeft(margin: 0)
-        titleLabel.pinToSuperviewRight(margin: 0)
-        titleLabel.pinToSuperviewTop(margin: 0)
+        titleLabel.pinToSuperviewLeft(0)
+        titleLabel.pinToSuperviewRight(0)
+        titleLabel.pinToSuperviewTop(0)
 
         // Slider
         slider = NSSlider(value: variable.get(),
@@ -38,18 +38,18 @@ class UIVariableViewDouble: NSView {
                           action: #selector(sliderValueChanged))
         addSubview(slider)
         slider.pinBelowView(titleLabel, separation: 8)
-        slider.pinToSuperviewLeft(margin: 0)
-        slider.pinToSuperviewRight(margin: 0)
+        slider.pinToSuperviewLeft(0)
+        slider.pinToSuperviewRight(0)
         slider.pinWidth(500, priority: UILayoutPriority(251))
 
         // Readout
         readoutLabel = NSTextField(labelWithString: "")
         readoutLabel.alignment = .center
         addSubview(readoutLabel)
         readoutLabel.pinBelowView(slider)
-        readoutLabel.pinToSuperviewLeft(margin: 0)
-        readoutLabel.pinToSuperviewRight(margin: 0)
-        readoutLabel.pinToSuperviewBottom(margin: 0)
+        readoutLabel.pinToSuperviewLeft(0)
+        readoutLabel.pinToSuperviewRight(0)
+        readoutLabel.pinToSuperviewBottom(0)
 
         updateReadoutLabel()
     }

diff --git a/PhysicsDemo/UIVariable/VariablesPanelView.swift b/PhysicsDemo/UIVariable/VariablesPanelView.swift
@@ -37,11 +37,11 @@ class VariablesPanelView: NSView {
             if let last = lastView {
                 newView.pinBelowView(last)
             } else {
-                newView.pinToSuperviewTop(margin: 0)
+                newView.pinToSuperviewTop(0)
             }
 
-            newView.pinToSuperviewLeft(margin: 0)
-            newView.pinToSuperviewRight(margin: 0)
+            newView.pinToSuperviewLeft(0)
+            newView.pinToSuperviewRight(0)
             lastView = newView
         }