Skip to content
This repository has been archived by the owner on Dec 23, 2023. It is now read-only.

Commit

Permalink
Convert to swift 4
Browse files Browse the repository at this point in the history
  • Loading branch information
@sendyhalim
sendyhalim committed Jul 7, 2018
1 parent 62cb266 commit 323a6ea
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 16 deletions.
34 changes: 27 additions & 7 deletions Yomu.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,18 +682,18 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = "Sendy Halim";
TargetAttributes = {
798454C51D05CF3500BB7262 = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 4QCP9AS6BP;
LastSwiftMigration = 0800;
LastSwiftMigration = 0940;
ProvisioningStyle = Automatic;
};
798454D41D05CF3600BB7262 = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
LastSwiftMigration = 0940;
TestTargetID = 798454C51D05CF3500BB7262;
};
};
Expand Down Expand Up @@ -999,14 +999,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
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_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -1047,14 +1055,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
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_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -1094,7 +1110,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.sendyhalim.Yomu;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -1113,7 +1130,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.sendyhalim.Yomu;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -1133,7 +1151,8 @@
PRODUCT_BUNDLE_IDENTIFIER = com.sendyhalim.YomuTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Yomu.app/Contents/MacOS/Yomu";
};
name = Debug;
Expand All @@ -1153,7 +1172,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.sendyhalim.YomuTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Yomu.app/Contents/MacOS/Yomu";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion Yomu.xcodeproj/xcshareddata/xcschemes/Yomu Development.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0940"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Yomu.xcodeproj/xcshareddata/xcschemes/Yomu.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0940"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
6 changes: 3 additions & 3 deletions Yomu/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
var mainWindow: NSWindow!

func applicationDidFinishLaunching(_ aNotification: Notification) {
mainWindow = NSApplication.shared().windows.first!
mainWindow.titleVisibility = NSWindowTitleVisibility.hidden
mainWindow = NSApplication.shared.windows.first!
mainWindow.titleVisibility = NSWindow.TitleVisibility.hidden
mainWindow.titlebarAppearsTransparent = true
mainWindow.styleMask = [NSFullSizeContentViewWindowMask, mainWindow.styleMask]
mainWindow.setFrame(NSScreen.main()!.frame, display: true)
mainWindow.setFrame(NSScreen.main!.frame, display: true)
}

func applicationWillTerminate(_ aNotification: Notification) {
Expand Down
2 changes: 1 addition & 1 deletion Yomu/Utils/Config.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public struct Config {
return icon
}

let _icon = bundle.image(forResource: name)!
let _icon = bundle.image(forResource: NSImage.Name(rawValue: name))!
iconByName[name] = _icon

return _icon
Expand Down
6 changes: 3 additions & 3 deletions Yomu/Views/Implementations/ActionButton.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ class ActionButton: NSButton {
paragraphStyle.alignment = .center

attributedTitle = NSAttributedString(string: title, attributes: [
NSForegroundColorAttributeName: Config.style.actionButtonColor,
NSParagraphStyleAttributeName: paragraphStyle,
NSFontAttributeName: NSFont.systemFont(ofSize: 13, weight: NSFontWeightThin)
NSAttributedStringKey.foregroundColor: Config.style.actionButtonColor,
NSAttributedStringKey.paragraphStyle: paragraphStyle,
NSAttributedStringKey.font: NSFont.systemFont(ofSize: 13, weight: NSFont.Weight.thin)
])
}
}

0 comments on commit 323a6ea

Please sign in to comment.