From b0901daa23236067519b098fef17304a415ebc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boris=20Bu=CC=88gling?= Date: Sat, 2 May 2015 00:08:22 +0200 Subject: [PATCH 1/4] Add 6.4 beta bundle ID. --- Alcatraz/Alcatraz-Info.plist | 1 + 1 file changed, 1 insertion(+) diff --git a/Alcatraz/Alcatraz-Info.plist b/Alcatraz/Alcatraz-Info.plist index a6917f3..c9180fa 100644 --- a/Alcatraz/Alcatraz-Info.plist +++ b/Alcatraz/Alcatraz-Info.plist @@ -24,6 +24,7 @@ 1 DVTPlugInCompatibilityUUIDs + 992275C1-432A-4CF7-B659-D84ED6D42D3F FEC992CC-CA4A-4CFD-8881-77300FCB848A C4A681B0-4A26-480E-93EC-1218098B9AA0 A2E4D43F-41F4-4FB9-BB94-7177011C9AED From 252f0e1e91353c372805b25b5dedb18a686fc908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boris=20Bu=CC=88gling?= Date: Sat, 2 May 2015 00:08:31 +0200 Subject: [PATCH 2/4] Defer adding the menu item. This will make adding the item actually work on Xcode 6.4 --- Alcatraz/Alcatraz.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Alcatraz/Alcatraz.m b/Alcatraz/Alcatraz.m index dda296a..f726fe1 100644 --- a/Alcatraz/Alcatraz.m +++ b/Alcatraz/Alcatraz.m @@ -52,7 +52,9 @@ + (NSString *)localizedStringForKey:(NSString *)key { - (id)initWithBundle:(NSBundle *)plugin { if (self = [super init]) { self.bundle = plugin; - [self createMenuItem]; + dispatch_async(dispatch_get_main_queue(), ^{ + [self createMenuItem]; + }); [self updateAlcatraz]; } return self; From f19090b242de22102267ebc7b7b2c10d1d1f1637 Mon Sep 17 00:00:00 2001 From: jurre Date: Tue, 19 May 2015 09:27:38 +0200 Subject: [PATCH 3/4] prefer NSOperationQueue over dispatch_async --- Alcatraz/Alcatraz-Info.plist | 2 +- Alcatraz/Alcatraz.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Alcatraz/Alcatraz-Info.plist b/Alcatraz/Alcatraz-Info.plist index c9180fa..be1ae52 100644 --- a/Alcatraz/Alcatraz-Info.plist +++ b/Alcatraz/Alcatraz-Info.plist @@ -24,7 +24,6 @@ 1 DVTPlugInCompatibilityUUIDs - 992275C1-432A-4CF7-B659-D84ED6D42D3F FEC992CC-CA4A-4CFD-8881-77300FCB848A C4A681B0-4A26-480E-93EC-1218098B9AA0 A2E4D43F-41F4-4FB9-BB94-7177011C9AED @@ -35,6 +34,7 @@ 992275C1-432A-4CF7-B659-D84ED6D42D3F A16FF353-8441-459E-A50C-B071F53F51B7 9F75337B-21B4-4ADC-B558-F9CADF7073A7 + 992275C1-432A-4CF7-B659-D84ED6D42D3F XC4Compatible diff --git a/Alcatraz/Alcatraz.m b/Alcatraz/Alcatraz.m index f726fe1..d7fd656 100644 --- a/Alcatraz/Alcatraz.m +++ b/Alcatraz/Alcatraz.m @@ -52,9 +52,9 @@ + (NSString *)localizedStringForKey:(NSString *)key { - (id)initWithBundle:(NSBundle *)plugin { if (self = [super init]) { self.bundle = plugin; - dispatch_async(dispatch_get_main_queue(), ^{ + [[NSOperationQueue mainQueue] addOperationWithBlock:^{ [self createMenuItem]; - }); + }]; [self updateAlcatraz]; } return self; From ac7066bd0c870e6579074ce1ecfe5cd2373d3e50 Mon Sep 17 00:00:00 2001 From: Pyroh Date: Sun, 10 May 2015 15:26:54 +0200 Subject: [PATCH 4/4] Xcode 6.3.2 support Conflicts: Alcatraz/Alcatraz-Info.plist Alcatraz/Alcatraz.m --- Alcatraz/Alcatraz-Info.plist | 1 + Alcatraz/Alcatraz.m | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Alcatraz/Alcatraz-Info.plist b/Alcatraz/Alcatraz-Info.plist index be1ae52..3789511 100644 --- a/Alcatraz/Alcatraz-Info.plist +++ b/Alcatraz/Alcatraz-Info.plist @@ -35,6 +35,7 @@ A16FF353-8441-459E-A50C-B071F53F51B7 9F75337B-21B4-4ADC-B558-F9CADF7073A7 992275C1-432A-4CF7-B659-D84ED6D42D3F + E969541F-E6F9-4D25-8158-72DC3545A6C6 XC4Compatible diff --git a/Alcatraz/Alcatraz.m b/Alcatraz/Alcatraz.m index d7fd656..1bf46c4 100644 --- a/Alcatraz/Alcatraz.m +++ b/Alcatraz/Alcatraz.m @@ -53,6 +53,7 @@ - (id)initWithBundle:(NSBundle *)plugin { if (self = [super init]) { self.bundle = plugin; [[NSOperationQueue mainQueue] addOperationWithBlock:^{ + [self createMenuItem]; }]; [self updateAlcatraz]; @@ -106,7 +107,6 @@ - (void)presentAlertWithMessageKey:(NSString *)messageKey { - (void)updateAlcatraz { NSOperationQueue *queue = [[NSOperationQueue alloc] init]; [queue addOperationWithBlock:^{ - [ATZAlcatrazPackage update]; }]; }