From dfe962966fc82fc07633d702cf925db6d15bc4fe Mon Sep 17 00:00:00 2001 From: Aleksandr Dodatko Date: Tue, 5 May 2015 16:00:18 +0300 Subject: [PATCH 1/2] Fixed crash when aggregator returns other type Issue description : https://github.com/ColinEberhardt/LinqToObjectiveC/issues/12 --- NSArray+LinqExtensions.m | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/NSArray+LinqExtensions.m b/NSArray+LinqExtensions.m index 9716aa4..7307fdd 100644 --- a/NSArray+LinqExtensions.m +++ b/NSArray+LinqExtensions.m @@ -138,12 +138,9 @@ - (NSArray *)linq_distinct:(LINQSelector)keySelector - (id)linq_aggregate:(LINQAccumulator)accumulator { id aggregate = nil; - for (id item in self) { - if (aggregate == nil) { - aggregate = item; - } else { - aggregate = accumulator(item, aggregate); - } + for (id item in self) + { + aggregate = accumulator(item, aggregate); } return aggregate; } From bf34237ba0713973162cdc5649a80084b7cd92da Mon Sep 17 00:00:00 2001 From: Mark Prutskiy Date: Mon, 29 Aug 2016 15:40:19 +0300 Subject: [PATCH 2/2] update --- .../LinqToObjectiveC-iOS-dynamic/Info.plist | 2 +- .../LinqToObjectiveC-iOS-static/Info.plist | 2 +- .../LinqToObjectiveC.xcodeproj/project.pbxproj | 9 ++++++++- .../xcschemes/LinqToObjectiveC-iOS-dynamic.xcscheme | 13 ++++++++----- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/LinqToObjectiveC/LinqToObjectiveC-iOS-dynamic/Info.plist b/LinqToObjectiveC/LinqToObjectiveC-iOS-dynamic/Info.plist index d3671bd..d3de8ee 100644 --- a/LinqToObjectiveC/LinqToObjectiveC-iOS-dynamic/Info.plist +++ b/LinqToObjectiveC/LinqToObjectiveC-iOS-dynamic/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - org.dodikk.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/LinqToObjectiveC/LinqToObjectiveC-iOS-static/Info.plist b/LinqToObjectiveC/LinqToObjectiveC-iOS-static/Info.plist index d3671bd..d3de8ee 100644 --- a/LinqToObjectiveC/LinqToObjectiveC-iOS-static/Info.plist +++ b/LinqToObjectiveC/LinqToObjectiveC-iOS-static/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - org.dodikk.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/project.pbxproj b/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/project.pbxproj index 813f1f9..67fcffb 100644 --- a/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/project.pbxproj +++ b/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/project.pbxproj @@ -246,7 +246,7 @@ 7E8F43791A8B92D5000F5D01 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0730; ORGANIZATIONNAME = scottlogic; TargetAttributes = { 7E8F43801A8B92D5000F5D01 = { @@ -346,6 +346,7 @@ 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_OPTIMIZATION_LEVEL = 0; @@ -435,6 +436,7 @@ INFOPLIST_FILE = "LinqToObjectiveC-iOS-dynamic/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "org.dodikk.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = LinqToObjectiveC; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -455,6 +457,7 @@ INFOPLIST_FILE = "LinqToObjectiveC-iOS-dynamic/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "org.dodikk.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = LinqToObjectiveC; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -480,6 +483,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; + PRODUCT_BUNDLE_IDENTIFIER = "org.dodikk.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = LinqToObjectiveC; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -501,6 +505,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; + PRODUCT_BUNDLE_IDENTIFIER = "org.dodikk.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = LinqToObjectiveC; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -537,6 +542,7 @@ 7EEE35BC1AB4711000668C3E /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 7EEE35DE1AB4718500668C3E /* Build configuration list for PBXNativeTarget "LinqToObjectiveC-iOS-static" */ = { isa = XCConfigurationList; @@ -545,6 +551,7 @@ 7EEE35E01AB4718500668C3E /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/xcshareddata/xcschemes/LinqToObjectiveC-iOS-dynamic.xcscheme b/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/xcshareddata/xcschemes/LinqToObjectiveC-iOS-dynamic.xcscheme index 1dde0a5..3fdbdba 100644 --- a/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/xcshareddata/xcschemes/LinqToObjectiveC-iOS-dynamic.xcscheme +++ b/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/xcshareddata/xcschemes/LinqToObjectiveC-iOS-dynamic.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -38,15 +38,18 @@ ReferencedContainer = "container:LinqToObjectiveC.xcodeproj"> + +