From 649e9ae4bafb5a7f0f41a4fc812519de225a7e61 Mon Sep 17 00:00:00 2001 From: Achim Breidenbach Date: Tue, 23 Aug 2016 15:36:19 +0200 Subject: [PATCH 01/13] removed development data --- QCIRCReceiver/QCIRCReceiverPlugIn.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QCIRCReceiver/QCIRCReceiverPlugIn.m b/QCIRCReceiver/QCIRCReceiverPlugIn.m index 7d866d7..16186ab 100644 --- a/QCIRCReceiver/QCIRCReceiverPlugIn.m +++ b/QCIRCReceiver/QCIRCReceiverPlugIn.m @@ -45,7 +45,7 @@ + (NSDictionary *)attributesForPropertyPortWithKey:(NSString *)key if ([key isEqualToString:@"inputServer"]) { return @{QCPortAttributeNameKey: @"Server", - QCPortAttributeDefaultValueKey: @"irc.chat.twitch.tv"}; + QCPortAttributeDefaultValueKey: @""}; } else if ([key isEqualToString:@"inputPort"]) { @@ -65,7 +65,7 @@ + (NSDictionary *)attributesForPropertyPortWithKey:(NSString *)key else if ([key isEqualToString:@"inputChannel"]) { return @{QCPortAttributeNameKey: @"IRC Channel", - QCPortAttributeDefaultValueKey: @"#macpiets"}; + QCPortAttributeDefaultValueKey: @""}; } else if ([key isEqualToString:@"outputMessages"]) { From ae855a381fa72d5635fdd25392b6eaf646167768 Mon Sep 17 00:00:00 2001 From: Achim Breidenbach Date: Tue, 23 Aug 2016 15:37:06 +0200 Subject: [PATCH 02/13] join a channel after the callback for the messages has been established --- QCIRCReceiver/QCIRCReceiverPlugIn.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/QCIRCReceiver/QCIRCReceiverPlugIn.m b/QCIRCReceiver/QCIRCReceiverPlugIn.m index 16186ab..3b021d0 100644 --- a/QCIRCReceiver/QCIRCReceiverPlugIn.m +++ b/QCIRCReceiver/QCIRCReceiverPlugIn.m @@ -162,7 +162,6 @@ - (void)connect IRCConnection *connection = [[IRCConnection alloc] initWithServer:self.inputServer port:self.inputPort serverPassword:password]; connection.nickname = self.inputNickname; - [connection joinChannel:self.inputChannel]; connection.messageCallback = ^void(IRCMessage * _Nonnull message) { //Append message to array @@ -180,7 +179,9 @@ - (void)connect [self.messages removeObjectAtIndex:0]; } }; - + + [connection joinChannel:self.inputChannel]; + self.connection = connection; self.oldPort = self.inputPort; self.oldServer = self.inputServer; From 9a23822baa6f7774d7b9b9e52ef1a23114aab0fe Mon Sep 17 00:00:00 2001 From: Achim Breidenbach Date: Tue, 23 Aug 2016 15:39:57 +0200 Subject: [PATCH 03/13] added an input to force a reconnect to the irc server, added two outputs to be able to monitor the socket connection state --- QCIRCReceiver/IRCConnection.h | 18 ++++++++++++++++++ QCIRCReceiver/IRCConnection.m | 24 ++++++++++++++++++++++++ QCIRCReceiver/QCIRCReceiverPlugIn.h | 4 ++++ QCIRCReceiver/QCIRCReceiverPlugIn.m | 28 ++++++++++++++++++++++++---- 4 files changed, 70 insertions(+), 4 deletions(-) diff --git a/QCIRCReceiver/IRCConnection.h b/QCIRCReceiver/IRCConnection.h index 99cce7a..86460fc 100644 --- a/QCIRCReceiver/IRCConnection.h +++ b/QCIRCReceiver/IRCConnection.h @@ -8,6 +8,15 @@ #import +typedef NS_ENUM(NSUInteger, IRCConnectionState) { + IRCConnectionStateDisconnected = 0, + IRCConnectionStateConnecting = 1, + IRCConnectionStateConnected = 2, + IRCConnectionStateReceivingData = 3, + IRCConnectionStateConnectionError = 99, + +}; + @class IRCMessage; @interface IRCConnection : NSObject @@ -54,5 +63,14 @@ typedef void (^IRCConnectionMessageCallback)(IRCMessage * _Nonnull message); */ @property (nonatomic, copy) IRCConnectionMessageCallback _Nullable messageCallback; +/*! + * @brief Stores the current connection state + */ +@property (nonatomic, assign, readonly) IRCConnectionState connectionState; + +/*! + * @brief Stores the last connection error + */ +@property (atomic, strong, readonly) NSString * _Nullable connectionError; @end diff --git a/QCIRCReceiver/IRCConnection.m b/QCIRCReceiver/IRCConnection.m index 50cc73a..2c11316 100644 --- a/QCIRCReceiver/IRCConnection.m +++ b/QCIRCReceiver/IRCConnection.m @@ -16,6 +16,9 @@ @interface IRCConnection () @property (nonatomic, strong) IRCAsyncSocket *socket; @property (nonatomic, strong) NSMutableArray *messageQueue; +@property (nonatomic, assign) IRCConnectionState connectionState; +@property (atomic, strong) NSString * _Nullable connectionError; + @end @implementation IRCConnection @@ -26,6 +29,8 @@ - (instancetype _Nonnull)initWithServer:(NSString * _Nonnull)server port:(NSInte if (self) { self.messageQueue = [NSMutableArray array]; + + self.connectionState = IRCConnectionStateDisconnected; IRCAsyncSocket *socket = [[IRCAsyncSocket alloc] initWithDelegate:self delegateQueue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)]; @@ -33,10 +38,15 @@ - (instancetype _Nonnull)initWithServer:(NSString * _Nonnull)server port:(NSInte [socket connectToHost:server onPort:port error:&error]; if (error) { + self.connectionState = IRCConnectionStateConnectionError; + self.connectionError = error.localizedDescription; + NSLog(@"Error while connecting to server: %@", error); } else { + self.connectionState = IRCConnectionStateConnecting; + self.socket = socket; if (password) @@ -82,12 +92,16 @@ - (BOOL)connected - (void)socket:(IRCAsyncSocket *)sock didConnectToHost:(NSString *)host port:(uint16_t)port { + self.connectionState = IRCConnectionStateConnected; + [self _workMessageQueue]; [sock readDataToData:IRCAsyncSocket.CRLFData withTimeout:-1 tag:0]; } - (void)socket:(IRCAsyncSocket *)sock didReadData:(NSData *)data withTag:(long)tag { + self.connectionState = IRCConnectionStateReceivingData; + //Parse message IRCMessage *message = [[IRCMessage alloc] initWithData:data]; @@ -109,6 +123,16 @@ - (void)socket:(IRCAsyncSocket *)sock didReadData:(NSData *)data withTag:(long)t - (void)socketDidDisconnect:(IRCAsyncSocket *)sock withError:(NSError *)err { + if(err) + { + self.connectionState = IRCConnectionStateConnectionError; + self.connectionError = err.localizedDescription; + } + else + { + self.connectionState = IRCConnectionStateDisconnected; + } + self.socket = nil; [self.messageQueue removeAllObjects]; } diff --git a/QCIRCReceiver/QCIRCReceiverPlugIn.h b/QCIRCReceiver/QCIRCReceiverPlugIn.h index 17d2688..fe4a9e2 100644 --- a/QCIRCReceiver/QCIRCReceiverPlugIn.h +++ b/QCIRCReceiver/QCIRCReceiverPlugIn.h @@ -16,9 +16,13 @@ @property (copy) NSString *inputNickname; @property (copy) NSString *inputPassword; @property (copy) NSString *inputChannel; +@property BOOL inputReconnect; //Outputs @property (copy) NSArray *outputMessages; +@property NSUInteger outputConnectionState; +@property NSString *outputConnectionError; + @property BOOL outputConnected; @end diff --git a/QCIRCReceiver/QCIRCReceiverPlugIn.m b/QCIRCReceiver/QCIRCReceiverPlugIn.m index 3b021d0..4eba572 100644 --- a/QCIRCReceiver/QCIRCReceiverPlugIn.m +++ b/QCIRCReceiver/QCIRCReceiverPlugIn.m @@ -31,8 +31,8 @@ @interface QCIRCReceiverPlugIn () @implementation QCIRCReceiverPlugIn -@dynamic inputServer, inputPort, inputNickname, inputPassword, inputChannel; -@dynamic outputMessages, outputConnected; +@dynamic inputServer, inputPort, inputNickname, inputPassword, inputChannel, inputReconnect; +@dynamic outputMessages, outputConnected, outputConnectionState, outputConnectionError; + (NSDictionary *)attributes { @@ -67,6 +67,11 @@ + (NSDictionary *)attributesForPropertyPortWithKey:(NSString *)key return @{QCPortAttributeNameKey: @"IRC Channel", QCPortAttributeDefaultValueKey: @""}; } + else if ([key isEqualToString:@"inputReconnect"]) + { + return @{QCPortAttributeNameKey: @"Reconnect", + QCPortAttributeDefaultValueKey: @(NO)}; + } else if ([key isEqualToString:@"outputMessages"]) { return @{QCPortAttributeNameKey: @"Messages"}; @@ -75,7 +80,15 @@ + (NSDictionary *)attributesForPropertyPortWithKey:(NSString *)key { return @{QCPortAttributeNameKey: @"Connected"}; } - + else if ([key isEqualToString:@"outputConnectionState"]) + { + return @{QCPortAttributeNameKey: @"Connection State"}; + } + else if ([key isEqualToString:@"outputConnectionError"]) + { + return @{QCPortAttributeNameKey: @"Connection Error"}; + } + return nil; } @@ -111,7 +124,8 @@ - (BOOL)execute:(id )context atTime:(NSTimeInterval)time withAr ![self.oldServer isEqualToString:self.inputServer] || ![self.oldNickname isEqualToString:self.inputNickname] || ![self.oldChannel isEqualToString:self.inputChannel] || - ![self.oldPassword isEqualToString:self.inputPassword]) + ![self.oldPassword isEqualToString:self.inputPassword] || + self.inputReconnect) { [self disconnect]; [self connect]; @@ -128,6 +142,12 @@ - (BOOL)execute:(id )context atTime:(NSTimeInterval)time withAr self.outputMessages = @[]; } + if(self.connection) + { + self.outputConnectionState = self.connection.connectionState; + self.outputConnectionError = self.connection.connectionError; + } + return YES; } From 33341a82873ea5db416c503b3342dc1d1d3395ab Mon Sep 17 00:00:00 2001 From: Peter Kraml Date: Mon, 19 Sep 2016 17:57:00 +0200 Subject: [PATCH 04/13] disable codesigning --- QCIRCReceiver.xcodeproj/project.pbxproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/QCIRCReceiver.xcodeproj/project.pbxproj b/QCIRCReceiver.xcodeproj/project.pbxproj index 083d0ab..0ac7602 100644 --- a/QCIRCReceiver.xcodeproj/project.pbxproj +++ b/QCIRCReceiver.xcodeproj/project.pbxproj @@ -160,6 +160,7 @@ TargetAttributes = { B611D98A1CC39ED700D3BA8C = { CreatedOnToolsVersion = 7.3; + ProvisioningStyle = Automatic; }; B677B8111D4200BD00587500 = { CreatedOnToolsVersion = 7.3.1; @@ -309,7 +310,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = B677B80A1D41FDF700587500 /* BuildNumber.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = QCIRCReceiver/Info.plist; INSTALL_PATH = "$(HOME)/Library/Graphics/Quartz Composer Plug-Ins"; @@ -324,7 +325,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = B677B80A1D41FDF700587500 /* BuildNumber.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; INFOPLIST_FILE = QCIRCReceiver/Info.plist; @@ -378,6 +379,7 @@ B677B8141D4200BD00587500 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; From e6b40f7bd3f245ea4aaa95358572fb1b8a08626b Mon Sep 17 00:00:00 2001 From: Benjamin Federer Date: Wed, 21 Jun 2017 17:38:43 +0200 Subject: [PATCH 05/13] Making Xcode happy. --- QCIRCReceiver.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/QCIRCReceiver.xcscheme | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/QCIRCReceiver.xcodeproj/project.pbxproj b/QCIRCReceiver.xcodeproj/project.pbxproj index 0ac7602..3eef09a 100644 --- a/QCIRCReceiver.xcodeproj/project.pbxproj +++ b/QCIRCReceiver.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ B611D9821CC39ED700D3BA8C /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0730; + LastUpgradeCheck = 0830; ORGANIZATIONNAME = MacPietsApps.net; TargetAttributes = { B611D98A1CC39ED700D3BA8C = { @@ -239,8 +239,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; @@ -283,8 +285,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; diff --git a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme index c8a2387..e330074 100644 --- a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme +++ b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 30 Apr 2018 13:18:28 +0200 Subject: [PATCH 06/13] Update project to settings recommended by Xcode 9.3 --- QCIRCReceiver.xcodeproj/project.pbxproj | 18 +++++++++++++++++- .../xcschemes/QCIRCReceiver.xcscheme | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/QCIRCReceiver.xcodeproj/project.pbxproj b/QCIRCReceiver.xcodeproj/project.pbxproj index 3eef09a..a66d229 100644 --- a/QCIRCReceiver.xcodeproj/project.pbxproj +++ b/QCIRCReceiver.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ B611D9821CC39ED700D3BA8C /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = MacPietsApps.net; TargetAttributes = { B611D98A1CC39ED700D3BA8C = { @@ -234,14 +234,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -280,14 +288,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; diff --git a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme index e330074..86c6178 100644 --- a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme +++ b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 30 Apr 2018 16:40:15 +0200 Subject: [PATCH 07/13] Disable implicitly retained self warning --- QCIRCReceiver.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QCIRCReceiver.xcodeproj/project.pbxproj b/QCIRCReceiver.xcodeproj/project.pbxproj index a66d229..af758af 100644 --- a/QCIRCReceiver.xcodeproj/project.pbxproj +++ b/QCIRCReceiver.xcodeproj/project.pbxproj @@ -245,7 +245,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -299,7 +299,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; From 34acbdc7e6fd8dc7bb33de3b81197e086422a418 Mon Sep 17 00:00:00 2001 From: Stefan Fochler Date: Wed, 30 May 2018 13:53:48 +0200 Subject: [PATCH 08/13] Make Xcode 9.4 happy --- .../xcshareddata/xcschemes/QCIRCReceiver.xcscheme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme index 86c6178..8700a32 100644 --- a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme +++ b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme @@ -1,6 +1,6 @@ Date: Fri, 22 Feb 2019 16:22:19 +0100 Subject: [PATCH 09/13] Make Xcode 10.1 happy --- .../xcshareddata/xcschemes/QCIRCReceiver.xcscheme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme index 8700a32..58ab58d 100644 --- a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme +++ b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme @@ -1,6 +1,6 @@ Date: Fri, 15 May 2020 15:11:41 +0200 Subject: [PATCH 10/13] Made Xcode 11.2.1. happy --- QCIRCReceiver.xcodeproj/project.pbxproj | 5 ++++- .../xcshareddata/xcschemes/QCIRCReceiver.xcscheme | 6 +----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/QCIRCReceiver.xcodeproj/project.pbxproj b/QCIRCReceiver.xcodeproj/project.pbxproj index af758af..09cfa56 100644 --- a/QCIRCReceiver.xcodeproj/project.pbxproj +++ b/QCIRCReceiver.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ B611D9821CC39ED700D3BA8C /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1120; ORGANIZATIONNAME = MacPietsApps.net; TargetAttributes = { B611D98A1CC39ED700D3BA8C = { @@ -172,6 +172,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = B611D9811CC39ED700D3BA8C; @@ -229,6 +230,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -283,6 +285,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; diff --git a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme index 58ab58d..dadc0f3 100644 --- a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme +++ b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme @@ -1,6 +1,6 @@ - - - - Date: Thu, 9 Jul 2020 13:10:54 +0200 Subject: [PATCH 11/13] Made Xcode 12.0 happy Signed-off-by: Mladen Mikic --- QCIRCReceiver.xcodeproj/project.pbxproj | 8 +++++--- .../xcshareddata/xcschemes/QCIRCReceiver.xcscheme | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/QCIRCReceiver.xcodeproj/project.pbxproj b/QCIRCReceiver.xcodeproj/project.pbxproj index 09cfa56..29ba05f 100644 --- a/QCIRCReceiver.xcodeproj/project.pbxproj +++ b/QCIRCReceiver.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ B611D9821CC39ED700D3BA8C /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1120; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = MacPietsApps.net; TargetAttributes = { B611D98A1CC39ED700D3BA8C = { @@ -169,11 +169,11 @@ }; buildConfigurationList = B611D9851CC39ED700D3BA8C /* Build configuration list for PBXProject "QCIRCReceiver" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, + Base, ); mainGroup = B611D9811CC39ED700D3BA8C; productRefGroup = B611D98C1CC39ED700D3BA8C /* Products */; @@ -250,6 +250,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -305,6 +306,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme index dadc0f3..5812acc 100644 --- a/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme +++ b/QCIRCReceiver.xcodeproj/xcshareddata/xcschemes/QCIRCReceiver.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 16 Nov 2020 12:22:13 +0100 Subject: [PATCH 12/13] Refs #9664: Update - removed apple silicon build (QCIRCReceiver) --- QCIRCReceiver.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/QCIRCReceiver.xcodeproj/project.pbxproj b/QCIRCReceiver.xcodeproj/project.pbxproj index 29ba05f..5b5045a 100644 --- a/QCIRCReceiver.xcodeproj/project.pbxproj +++ b/QCIRCReceiver.xcodeproj/project.pbxproj @@ -230,6 +230,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = x86_64; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -286,6 +287,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = x86_64; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -335,6 +337,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = B677B80A1D41FDF700587500 /* BuildNumber.xcconfig */; buildSettings = { + ARCHS = x86_64; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = QCIRCReceiver/Info.plist; @@ -350,6 +353,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = B677B80A1D41FDF700587500 /* BuildNumber.xcconfig */; buildSettings = { + ARCHS = x86_64; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; From c4bb30ec90454e086afe089ccfcc107249f88c61 Mon Sep 17 00:00:00 2001 From: Achim Breidenbach Date: Fri, 14 Feb 2025 13:19:44 +0100 Subject: [PATCH 13/13] Updated deployment target to 10.15.2 to make Xcode 16 happy. --- QCIRCReceiver.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/QCIRCReceiver.xcodeproj/project.pbxproj b/QCIRCReceiver.xcodeproj/project.pbxproj index 5b5045a..1d7fefb 100644 --- a/QCIRCReceiver.xcodeproj/project.pbxproj +++ b/QCIRCReceiver.xcodeproj/project.pbxproj @@ -342,6 +342,7 @@ COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = QCIRCReceiver/Info.plist; INSTALL_PATH = "$(HOME)/Library/Graphics/Quartz Composer Plug-Ins"; + MACOSX_DEPLOYMENT_TARGET = 10.15.2; PRODUCT_BUNDLE_IDENTIFIER = net.macpietsapps.QCIRCReceiver; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -359,6 +360,7 @@ COPY_PHASE_STRIP = YES; INFOPLIST_FILE = QCIRCReceiver/Info.plist; INSTALL_PATH = "$(HOME)/Library/Graphics/Quartz Composer Plug-Ins"; + MACOSX_DEPLOYMENT_TARGET = 10.15.2; PRODUCT_BUNDLE_IDENTIFIER = net.macpietsapps.QCIRCReceiver; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES;