1
1
mirror of https://github.com/exyte/Macaw.git synced 2024-09-11 05:05:23 +03:00

Update Example-macOS to Swift 4.2 and latest Macaw API

This commit is contained in:
Yuri Strot 2019-02-11 14:23:41 +07:00
parent ccb125d872
commit 1200a87e2d
3 changed files with 8 additions and 7 deletions

View File

@ -220,6 +220,7 @@
TargetAttributes = {
A753C9E31F3DB18A006615A4 = {
CreatedOnToolsVersion = 8.3.3;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
};
};
@ -280,7 +281,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Example-macOS/Pods-Example-macOS-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-Example-macOS/Pods-Example-macOS-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Macaw/Macaw.framework",
"${BUILT_PRODUCTS_DIR}/SWXMLHash/SWXMLHash.framework",
);
@ -291,7 +292,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example-macOS/Pods-Example-macOS-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example-macOS/Pods-Example-macOS-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@ -448,7 +449,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.exyte.Example-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
@ -463,7 +464,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.exyte.Example-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Release;
};

View File

@ -21,7 +21,7 @@ class AnimationsViewController: NSViewController {
}
animationsView?.prepareAnimation()
let attributes: [NSAttributedStringKey: Any] = [.foregroundColor: NSColor.blue.withAlphaComponent(0.5)]
let attributes: [NSAttributedString.Key: Any] = [.foregroundColor: NSColor.blue.withAlphaComponent(0.5)]
actionButton.attributedTitle = NSMutableAttributedString(string: actionButton.title, attributes: attributes)
}

View File

@ -56,7 +56,7 @@ class EventsExampleController: NSViewController {
return
}
guard let loc = event.points.first?.location else {
guard let loc = event.points.first?.location(in: .scene) else {
return
}
@ -82,7 +82,7 @@ class EventsExampleController: NSViewController {
return
}
guard let loc = event.points.first?.location else {
guard let loc = event.points.first?.location(in: .scene) else {
return
}