Skip to content

Commit bcaa296

Browse files
TimOliverTimOliver
authored
Merge pull request #120 from steve228uk/update-swift
Update Project for Swift 5 and Xcode 12
2 parents a406fa8 + 9a049e8 commit bcaa296

File tree

9 files changed

+191
-117
lines changed

9 files changed

+191
-117
lines changed

‎Podfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
platform :osx, '10.11'
2+
13
target 'YT Music' do
24
use_frameworks!
35

46
pod 'MediaKeyTap'
5-
67
end

‎Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ SPEC REPOS:
1111
SPEC CHECKSUMS:
1212
MediaKeyTap: 737434cc2459e5fb9385f7e8974939ee833cd8ec
1313

14-
PODFILE CHECKSUM: d93615dae66d91fd60309b738fa6ab727150f228
14+
PODFILE CHECKSUM: 39753b4cf62ed0d645a492327c32fe20665c5361
1515

16-
COCOAPODS: 1.10.0.rc.1
16+
COCOAPODS: 1.10.1

‎Pods/Manifest.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/Pods.xcodeproj/project.pbxproj

+96-102
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎YT Music.xcodeproj/project.pbxproj

+7-6
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@
194194
TargetAttributes = {
195195
28DA92B120D90169004B2A6D = {
196196
CreatedOnToolsVersion = 10.0;
197+
LastSwiftMigration = 1240;
197198
SystemCapabilities = {
198199
com.apple.Sandbox = {
199200
enabled = 0;
@@ -420,10 +421,10 @@
420421
baseConfigurationReference = 5AED565561146EAC97AC8F55 /* Pods-YT Music.debug.xcconfig */;
421422
buildSettings = {
422423
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
423-
CODE_SIGN_IDENTITY = "Mac Developer";
424+
CODE_SIGN_IDENTITY = "Apple Development";
424425
CODE_SIGN_STYLE = Automatic;
425426
COMBINE_HIDPI_IMAGES = YES;
426-
DEVELOPMENT_TEAM = 6LF3GMKZAB;
427+
DEVELOPMENT_TEAM = "";
427428
FRAMEWORK_SEARCH_PATHS = (
428429
"$(inherited)",
429430
"$(PROJECT_DIR)/YT\\ Music",
@@ -440,7 +441,7 @@
440441
PRODUCT_NAME = "$(TARGET_NAME)";
441442
PROVISIONING_PROFILE_SPECIFIER = "";
442443
SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/YT Music/Bridge.h";
443-
SWIFT_VERSION = 4.0;
444+
SWIFT_VERSION = 5.0;
444445
};
445446
name = Debug;
446447
};
@@ -449,10 +450,10 @@
449450
baseConfigurationReference = DF9D316F37D878F34D8107B0 /* Pods-YT Music.release.xcconfig */;
450451
buildSettings = {
451452
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
452-
CODE_SIGN_IDENTITY = "Mac Developer";
453+
CODE_SIGN_IDENTITY = "Apple Development";
453454
CODE_SIGN_STYLE = Automatic;
454455
COMBINE_HIDPI_IMAGES = YES;
455-
DEVELOPMENT_TEAM = 6LF3GMKZAB;
456+
DEVELOPMENT_TEAM = "";
456457
FRAMEWORK_SEARCH_PATHS = (
457458
"$(inherited)",
458459
"$(PROJECT_DIR)/YT\\ Music",
@@ -469,7 +470,7 @@
469470
PRODUCT_NAME = "$(TARGET_NAME)";
470471
PROVISIONING_PROFILE_SPECIFIER = "";
471472
SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/YT Music/Bridge.h";
472-
SWIFT_VERSION = 4.0;
473+
SWIFT_VERSION = 5.0;
473474
};
474475
name = Release;
475476
};

‎YT Music.xcodeproj/xcshareddata/xcschemes/YT Music.xcscheme

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1240"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "28DA92B120D90169004B2A6D"
18+
BuildableName = "YT Music.app"
19+
BlueprintName = "YT Music"
20+
ReferencedContainer = "container:YT Music.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
<BuildableProductRunnable
44+
runnableDebuggingMode = "0">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "28DA92B120D90169004B2A6D"
48+
BuildableName = "YT Music.app"
49+
BlueprintName = "YT Music"
50+
ReferencedContainer = "container:YT Music.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "28DA92B120D90169004B2A6D"
65+
BuildableName = "YT Music.app"
66+
BlueprintName = "YT Music"
67+
ReferencedContainer = "container:YT Music.xcodeproj">
68+
</BuildableReference>
69+
</BuildableProductRunnable>
70+
</ProfileAction>
71+
<AnalyzeAction
72+
buildConfiguration = "Debug">
73+
</AnalyzeAction>
74+
<ArchiveAction
75+
buildConfiguration = "Release"
76+
revealArchiveInOrganizer = "YES">
77+
</ArchiveAction>
78+
</Scheme>

‎YT Music/AppDelegate.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import Cocoa
1212
class AppDelegate: NSObject, NSApplicationDelegate {
1313

1414
lazy var mainWindowController: NSWindowController? = {
15-
let storyboard = NSStoryboard(name: NSStoryboard.Name("Main"), bundle: nil)
16-
return storyboard.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier("main")) as? NSWindowController
15+
let storyboard = NSStoryboard(name: "Main", bundle: nil)
16+
return storyboard.instantiateController(withIdentifier: "main") as? NSWindowController
1717
}()
1818

1919
lazy var dockMenu: NSMenu = {

‎YT Music/Controllers/ViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ extension ViewController: WKNavigationDelegate, WKUIDelegate {
162162

163163
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
164164
print(error)
165-
print(navigation)
165+
print(navigation as Any)
166166
}
167167

168168
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {

‎YT Music/Views/CustomWindow.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class CustomWindow: NSWindow {
2323
identifier = NSUserInterfaceItemIdentifier(rawValue: "main")
2424
backgroundColor = NSColor(hue:0.00, saturation:0.00, brightness:0.07, alpha:1.00)
2525
contentMinSize = NSSize(width: 800, height: 500)
26-
setFrameAutosaveName(NSWindow.FrameAutosaveName(rawValue: "uk.co.wearecocoon.ytmusic.main"))
26+
setFrameAutosaveName("uk.co.wearecocoon.ytmusic.main")
2727

2828
}
2929

0 commit comments

Comments
 (0)