Skip to content

Migrate code to Swift 4 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Veo1oeV wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate code to Swift 4 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions Dino/Dino.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,18 +211,18 @@
TargetAttributes = {
186582BF1DE3B86D000BDDD7 = {
CreatedOnToolsVersion = 8.1;
DevelopmentTeam = ZET9SZ3EH2;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
};
186582D01DE3B86E000BDDD7 = {
CreatedOnToolsVersion = 8.1;
DevelopmentTeam = ZET9SZ3EH2;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
TestTargetID = 186582BF1DE3B86D000BDDD7;
};
186582DB1DE3B86E000BDDD7 = {
CreatedOnToolsVersion = 8.1;
DevelopmentTeam = ZET9SZ3EH2;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
TestTargetID = 186582BF1DE3B86D000BDDD7;
};
Expand Down Expand Up @@ -425,12 +425,13 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = ZET9SZ3EH2;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Dino/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yuhuili.Dino;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -439,12 +440,13 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = ZET9SZ3EH2;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Dino/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yuhuili.Dino;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -454,12 +456,13 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = ZET9SZ3EH2;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = DinoTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yuhuili.DinoTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Dino.app/Contents/MacOS/Dino";
};
name = Debug;
Expand All @@ -470,12 +473,13 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = ZET9SZ3EH2;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = DinoTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yuhuili.DinoTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Dino.app/Contents/MacOS/Dino";
};
name = Release;
Expand All @@ -485,12 +489,13 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = ZET9SZ3EH2;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = DinoUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yuhuili.DinoUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TEST_TARGET_NAME = Dino;
};
name = Debug;
Expand All @@ -500,12 +505,13 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = ZET9SZ3EH2;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = DinoUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yuhuili.DinoUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TEST_TARGET_NAME = Dino;
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion Dino/Dino/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
func applicationDidFinishLaunching(_ aNotification: Notification) {
// Insert code here to initialize your application
if #available(OSX 10.12.2, *) {
NSApplication.shared().isAutomaticCustomizeTouchBarMenuItemEnabled = true
NSApplication.shared.isAutomaticCustomizeTouchBarMenuItemEnabled = true
}
}

Expand Down
16 changes: 9 additions & 7 deletions Dino/Dino/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ViewController: NSViewController {
setupMainTapReceiverButton()
}

func tap() {
@objc func tap() {
dinoSKView.dinoScene.jump()
}

Expand Down Expand Up @@ -105,9 +105,9 @@ extension ViewController: NSTouchBarDelegate {
return touchBar
}

func touchBar(_ touchBar: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItemIdentifier) -> NSTouchBarItem? {
func touchBar(_ touchBar: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItem.Identifier) -> NSTouchBarItem? {
switch identifier {
case NSTouchBarItemIdentifier.dinoItem:
case NSTouchBarItem.Identifier.dinoItem:
let customViewItem = NSCustomTouchBarItem(identifier: identifier)
customViewItem.view = dinoView
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1, execute: {
Expand All @@ -121,12 +121,14 @@ extension ViewController: NSTouchBarDelegate {
}
}

extension NSTouchBarCustomizationIdentifier {
static let dinoBar = NSTouchBarCustomizationIdentifier("com.yuhuili.Dino.DinoBar")
@available(OSX 10.12.2, *)
extension NSTouchBar.CustomizationIdentifier {
static let dinoBar = "com.yuhuili.Dino.DinoBar"
}

extension NSTouchBarItemIdentifier {
static let dinoItem = NSTouchBarItemIdentifier("com.yuhuili.Dino.DinoBar.main")
@available(OSX 10.12.2, *)
extension NSTouchBarItem.Identifier {
static let dinoItem = NSTouchBarItem.Identifier("com.yuhuili.Dino.DinoBar.main")
}


Expand Down