Merge branch 'develop' of github.com:phranck/podlive-macos into develop

Podlive · Sep 21, 2019 · 733035b · 733035b
2 parents 5fcca16 + 68cc854
commit 733035b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/App/Podlive.xcodeproj/project.pbxproj b/App/Podlive.xcodeproj/project.pbxproj
@@ -964,7 +964,6 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(USER_LIBRARY_DIR)/Frameworks",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
 				);
@@ -1026,7 +1025,6 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(USER_LIBRARY_DIR)/Frameworks",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
 				);

diff --git a/App/Podlive/Categories/Appkit/NSApplication+MainMenu.m b/App/Podlive/Categories/Appkit/NSApplication+MainMenu.m
@@ -3,8 +3,8 @@
 //  Copyright © 2017 cocoa:naut. All rights reserved.
 //
 
-@import CCNAppKit;
 #import "NSApplication+MainMenu.h"
+#import "NSApplication+Tools.h"
 #import "CCNApplicationDelegate.h"
 #import "NSBundle+Localization.h"
 

diff --git a/App/Podlive/Model/CCNChannel.m b/App/Podlive/Model/CCNChannel.m
@@ -3,9 +3,9 @@
 //  Copyright © 2017 cocoa:naut. All rights reserved.
 //
 
-#import <CCNFoundation/NSString+CCNAdditions.h>
 #import "CCNChannel.h"
 #import "CCNChannel+Convenience.h"
+#import "NSString+Tools.h"
 
 NSString *const CCNChannelFieldCoverart             = @"coverart";
 NSString *const CCNChannelFieldCoverartThumbnail200 = @"coverartThumbnail200";