diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9e25e67 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.* +!/.gitignore +xcuserdata +*.xccheckout diff --git a/PostgreSQL.xcodeproj/project.pbxproj b/PostgreSQL.xcodeproj/project.pbxproj index 3287f47..3eabfbc 100644 --- a/PostgreSQL.xcodeproj/project.pbxproj +++ b/PostgreSQL.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -304,10 +304,10 @@ 2035B181149C8B83009A2972 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0640; + LastUpgradeCheck = 1010; }; buildConfigurationList = 2035B184149C8B83009A2972 /* Build configuration list for PBXProject "PostgreSQL" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 10.0"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -403,15 +403,26 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; 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_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_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; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -433,7 +444,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "PostgreSQL/PostgreSQL-Info.plist"; INFOPLIST_PREFIX_HEADER = ""; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.14; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; PRODUCT_NAME = PostgreSQL; @@ -446,11 +457,21 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; 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_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_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; COPY_PHASE_STRIP = YES; @@ -470,7 +491,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "PostgreSQL/PostgreSQL-Info.plist"; INFOPLIST_PREFIX_HEADER = ""; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.14; OTHER_CFLAGS = ""; PRODUCT_NAME = PostgreSQL; SDKROOT = macosx; @@ -480,12 +501,17 @@ 2035B1A9149C8B84009A2972 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = 79VG65MJG4; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "PostgreSQL/PostgreSQL-Prefix.pch"; INFOPLIST_FILE = "PostgreSQL/PostgreSQL-Info.plist"; INSTALL_PATH = "$(HOME)/Library/PreferencePanes"; + PRODUCT_BUNDLE_IDENTIFIER = "com.maccatech.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = PostgreSQL; + PROVISIONING_PROFILE_SPECIFIER = ""; WRAPPER_EXTENSION = prefPane; }; name = Debug; @@ -493,12 +519,17 @@ 2035B1AA149C8B84009A2972 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = 79VG65MJG4; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "PostgreSQL/PostgreSQL-Prefix.pch"; INFOPLIST_FILE = "PostgreSQL/PostgreSQL-Info.plist"; INSTALL_PATH = "$(HOME)/Library/PreferencePanes"; + PRODUCT_BUNDLE_IDENTIFIER = "com.maccatech.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = PostgreSQL; + PROVISIONING_PROFILE_SPECIFIER = ""; WRAPPER_EXTENSION = prefPane; }; name = Release; diff --git a/PostgreSQL.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/PostgreSQL.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/PostgreSQL.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/PostgreSQL/Classes/PGServerController.m b/PostgreSQL/Classes/PGServerController.m index 4dba1d7..3fba778 100644 --- a/PostgreSQL/Classes/PGServerController.m +++ b/PostgreSQL/Classes/PGServerController.m @@ -46,15 +46,12 @@ - (NSDictionary *)filteredDictionaryUsingBlock:(BOOL(^)(id key, id value))block; @implementation NSDictionary(Helper) - (NSDictionary *)filteredDictionaryUsingBlock:(BOOL (^)(id, id))block { - NSArray *keysToKeep = [self.allKeys filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id key, NSDictionary *bindings) - { - return block(key, self[key]); - }]]; + NSArray *keysToKeep = [self keysOfEntriesPassingTest:^BOOL(id key, id obj, BOOL *stop) { + return block(key, obj); + }].allObjects; - if (keysToKeep == 0) return @{}; - NSMutableDictionary *result = [NSMutableDictionary dictionaryWithCapacity:keysToKeep.count]; - for (id key in keysToKeep) result[key] = self[key]; - return [NSDictionary dictionaryWithDictionary:result]; + if (keysToKeep.count == 0) return @{}; + return [NSDictionary dictionaryWithObjects:[self objectsForKeys:keysToKeep notFoundMarker:[NSNull null]] forKeys:keysToKeep]; } @end @@ -937,7 +934,7 @@ - (NSString *)fullNameByJoiningUser:(NSString *)user name:(NSString *)name domai NSString *result; if (!name) result = domain; else if (!domain) result = name; - else [NSString stringWithFormat:@"%@.%@", domain, name]; + else result = [NSString stringWithFormat:@"%@.%@", domain, name]; return user && result ? [NSString stringWithFormat:@"%@@%@", user, result] : result; } diff --git a/PostgreSQL/PostgreSQL-Info.plist b/PostgreSQL/PostgreSQL-Info.plist index 29f8fe7..b94a449 100644 --- a/PostgreSQL/PostgreSQL-Info.plist +++ b/PostgreSQL/PostgreSQL-Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile PostgreSQL CFBundleIdentifier - com.maccatech.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -17,9 +17,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.4.2 - CFBundleVersion - 2.4.2 + 2.4.3 NSHumanReadableCopyright Copyright © 2015 Macca Tech Ltd. All rights reserved. NSMainNibFile diff --git a/README.pod b/README.pod index d2edd2b..2f0947b 100644 --- a/README.pod +++ b/README.pod @@ -7,6 +7,7 @@
+ =end html @@ -230,6 +231,15 @@ However, from version 2.1 onwards, Postgre Preferences automatically detects and + + v2.4.3 + 20-Jan 2020 + Bugfix release + + + v2.4.2 8-Feb 2016 @@ -403,8 +413,6 @@ However, from version 2.1 onwards, Postgre Preferences automatically detects and