From 9ba01c6f3103b4c7aacab3f95623059b27078539 Mon Sep 17 00:00:00 2001 From: Raphael Hanneken Date: Mon, 16 Nov 2020 14:18:25 +0100 Subject: [PATCH] update sparkle version + update to Swift 5 --- Cartfile.resolved | 2 +- Icns Composer.xcodeproj/project.pbxproj | 19 +++++++++++++------ Icns Composer/DragDropImageView.swift | 2 +- Icns Composer/MainWindowController.swift | 2 +- Icns Composer/NSImageExtensions.swift | 1 + 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 786ca55..e9e96c1 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "sparkle-project/Sparkle" "1.14.0" +github "sparkle-project/Sparkle" "1.24.0" diff --git a/Icns Composer.xcodeproj/project.pbxproj b/Icns Composer.xcodeproj/project.pbxproj index 378573d..4115d31 100644 --- a/Icns Composer.xcodeproj/project.pbxproj +++ b/Icns Composer.xcodeproj/project.pbxproj @@ -152,21 +152,20 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = "Raphael Hanneken"; TargetAttributes = { 20FA7A5C1B14E9D900E7B8E7 = { CreatedOnToolsVersion = 6.3.2; - LastSwiftMigration = 0900; + LastSwiftMigration = 1220; }; }; }; buildConfigurationList = 20FA7A581B14E9D900E7B8E7 /* Build configuration list for PBXProject "Icns Composer" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -239,14 +238,17 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -294,14 +296,17 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -334,6 +339,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = IcnsComposer; + CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -346,7 +352,7 @@ PRODUCT_BUNDLE_IDENTIFIER = io.raphaelhanneken.icnscomposer; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -354,6 +360,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = IcnsComposer; + CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -367,7 +374,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Icns Composer/DragDropImageView.swift b/Icns Composer/DragDropImageView.swift index 33bb463..9138603 100644 --- a/Icns Composer/DragDropImageView.swift +++ b/Icns Composer/DragDropImageView.swift @@ -87,7 +87,7 @@ class DragDropImageView: NSImageView, NSDraggingSource { // Provide the components of the dragging image. draggingItem.imageComponentsProvider = { - let component = NSDraggingImageComponent(key : NSDraggingItem.ImageComponentKey.icon) + let component = NSDraggingImageComponent(key: NSDraggingItem.ImageComponentKey.icon) component.contents = image component.frame = NSRect(origin: NSPoint(), size: draggingFrame.size) diff --git a/Icns Composer/MainWindowController.swift b/Icns Composer/MainWindowController.swift index 58d9937..8576fe5 100644 --- a/Icns Composer/MainWindowController.swift +++ b/Icns Composer/MainWindowController.swift @@ -13,7 +13,7 @@ class MainWindowController: NSWindowController, NSWindowDelegate { var iconset = Iconset() override var windowNibName: NSNib.Name { - return NSNib.Name("MainWindow") + return "MainWindow" } override func windowDidLoad() { diff --git a/Icns Composer/NSImageExtensions.swift b/Icns Composer/NSImageExtensions.swift index fec279b..b3ba3f8 100644 --- a/Icns Composer/NSImageExtensions.swift +++ b/Icns Composer/NSImageExtensions.swift @@ -82,6 +82,7 @@ extension NSImage { return nil } + // swiftlint:disable identifier_name let x = floor((resized.width - size.width) / 2) let y = floor((resized.height - size.height) / 2) let frame = NSRect(x: x, y: y, width: width, height: height)