Skip to content

Commit

Permalink
update sparkle version + update to Swift 5
Browse files Browse the repository at this point in the history
  • Loading branch information
raphaelhanneken committed Nov 16, 2020
1 parent 2566a8d commit 9ba01c6
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "sparkle-project/Sparkle" "1.14.0"
github "sparkle-project/Sparkle" "1.24.0"
19 changes: 13 additions & 6 deletions Icns Composer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -334,6 +339,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = IcnsComposer;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -346,14 +352,15 @@
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;
};
20FA7A791B14E9D900E7B8E7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = IcnsComposer;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -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;
};
Expand Down
2 changes: 1 addition & 1 deletion Icns Composer/DragDropImageView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Icns Composer/MainWindowController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
1 change: 1 addition & 0 deletions Icns Composer/NSImageExtensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 9ba01c6

Please sign in to comment.