From c7b2368df74a6d146cad04894ded0ec88367b7ff Mon Sep 17 00:00:00 2001 From: dmaclach Date: Sun, 11 Nov 2018 10:46:39 -0800 Subject: Remove unused GTMNSArray+Merge (#182) --- Foundation/GTMNSArray+Merge.h | 47 -------- Foundation/GTMNSArray+Merge.m | 111 ------------------ Foundation/GTMNSArray+MergeTest.m | 218 ------------------------------------ GTM.xcodeproj/project.pbxproj | 12 -- GTMiPhone.xcodeproj/project.pbxproj | 10 -- 5 files changed, 398 deletions(-) delete mode 100644 Foundation/GTMNSArray+Merge.h delete mode 100644 Foundation/GTMNSArray+Merge.m delete mode 100644 Foundation/GTMNSArray+MergeTest.m diff --git a/Foundation/GTMNSArray+Merge.h b/Foundation/GTMNSArray+Merge.h deleted file mode 100644 index ef8787b..0000000 --- a/Foundation/GTMNSArray+Merge.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// GTMNSArray+Merge.h -// -// Copyright 2008 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy -// of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. -// - -#import - -// Extension to NSArray to allow merging of arrays. -// -@interface NSArray (GTMNSArrayMergingAdditions) - -// Merge our array with |newArray| by sorting each array then merging the -// two arrays. If |merger| is provided then call that method on any old -// items that compare as equal to a new item, passing the new item as -// the only argument. If |merger| is not provided, then insert new items -// in front of matching old items. If neither array has any items then -// nil is returned. -// -// The signature of the |merger| is: -// - (id)merge:(id)newItem; -// -// Returns a new, sorted array. -- (NSArray *)gtm_mergeArray:(NSArray *)newArray - mergeSelector:(SEL)merger; - -// Same as above, only |comparer| is used to sort/compare the objects, just like -// -[NSArray sortedArrayUsingSelector]. If |comparer| is nil, nil is returned. -- (NSArray *)gtm_mergeArray:(NSArray *)newArray - compareSelector:(SEL)comparer - mergeSelector:(SEL)merger; - -@end - - diff --git a/Foundation/GTMNSArray+Merge.m b/Foundation/GTMNSArray+Merge.m deleted file mode 100644 index 4b67853..0000000 --- a/Foundation/GTMNSArray+Merge.m +++ /dev/null @@ -1,111 +0,0 @@ -// -// GTMNSArray+Merge.m -// -// Copyright 2008 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy -// of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. -// - -#import "GTMNSArray+Merge.h" - -#import "GTMDefines.h" - -#if GTM_IPHONE_SDK -#import -#else // GTM_IPHONE_SDK -#import -#endif // GTM_IPHONE_SDK - -@implementation NSArray (GTMNSArrayMergingAdditions) - -- (NSArray *)gtm_mergeArray:(NSArray *)newArray - mergeSelector:(SEL)merger { - return [self gtm_mergeArray:newArray - compareSelector:@selector(compare:) - mergeSelector:merger]; -} - -- (NSArray *)gtm_mergeArray:(NSArray *)newArray - compareSelector:(SEL)comparer - mergeSelector:(SEL)merger { - // must have a compare selector - if (!comparer) return nil; - - // Sort and merge the contents of |self| with |newArray|. - NSArray *sortedMergedArray = nil; - if ([self count] && [newArray count]) { - NSMutableArray *mergingArray = [NSMutableArray arrayWithArray:self]; - [mergingArray sortUsingSelector:comparer]; - NSArray *sortedNewArray - = [newArray sortedArrayUsingSelector:comparer]; - - NSUInteger oldIndex = 0; - NSUInteger oldCount = [mergingArray count]; - id oldItem = (oldIndex < oldCount) - ? [mergingArray objectAtIndex:0] - : nil; - - id newItem = nil; - for (newItem in sortedNewArray) { - BOOL stillLooking = YES; - while (oldIndex < oldCount && stillLooking) { - // We must take care here, since Intel leaves junk in high bytes of - // return register for predicates that return BOOL. - // For details see: - // http://developer.apple.com/documentation/MacOSX/Conceptual/universal_binary/universal_binary_tips/chapter_5_section_23.html - // and - // http://www.red-sweater.com/blog/320/abusing-objective-c-with-class#comment-83187 - NSComparisonResult result - = ((NSComparisonResult (*)(id, SEL, id))objc_msgSend)(newItem, comparer, oldItem); - if (result == NSOrderedSame && merger) { - // It's a match! - id repItem = [oldItem performSelector:merger - withObject:newItem]; - [mergingArray replaceObjectAtIndex:oldIndex - withObject:repItem]; - ++oldIndex; - oldItem = (oldIndex < oldCount) - ? [mergingArray objectAtIndex:oldIndex] - : nil; - stillLooking = NO; - } else if (result == NSOrderedAscending - || (result == NSOrderedSame && !merger)) { - // This is either a new item and belongs right here, or it's - // a match to an existing item but we're not merging. - [mergingArray insertObject:newItem - atIndex:oldIndex]; - ++oldIndex; - ++oldCount; - stillLooking = NO; - } else { - ++oldIndex; - oldItem = (oldIndex < oldCount) - ? [mergingArray objectAtIndex:oldIndex] - : nil; - } - } - if (stillLooking) { - // Once we get here, the rest of the new items get appended. - [mergingArray addObject:newItem]; - } - } - sortedMergedArray = mergingArray; - } else if ([self count]) { - sortedMergedArray = [self sortedArrayUsingSelector:comparer]; - } else if ([newArray count]) { - sortedMergedArray = [newArray sortedArrayUsingSelector:comparer]; - } - return sortedMergedArray; -} - -@end diff --git a/Foundation/GTMNSArray+MergeTest.m b/Foundation/GTMNSArray+MergeTest.m deleted file mode 100644 index 535e0ce..0000000 --- a/Foundation/GTMNSArray+MergeTest.m +++ /dev/null @@ -1,218 +0,0 @@ -// -// GTMNSArray+MergeTest.m -// -// Copyright 2008 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy -// of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. -// - -#import "GTMSenTestCase.h" -#import "GTMNSArray+Merge.h" - -@interface GTMNSArray_MergeTest : GTMTestCase -@end - - -@interface NSString (GTMStringMergingTestAdditions) - -- (NSString *)mergeString:(NSString *)stringB; - -@end - - -@implementation GTMNSArray_MergeTest - -- (void)testMergingTwoEmptyArrays { - NSArray *emptyArrayA = [NSArray array]; - NSArray *emptyArrayB = [NSArray array]; - NSArray *mergedArray = [emptyArrayA gtm_mergeArray:emptyArrayB - mergeSelector:nil]; - XCTAssertNil(mergedArray, - @"merge of two empty arrays with no merger should render nil"); -} - -- (void)testMergingTwoEmptyArraysWithMerger { - NSArray *emptyArrayA = [NSArray array]; - NSArray *emptyArrayB = [NSArray array]; - NSArray *mergedArray - = [emptyArrayA gtm_mergeArray:emptyArrayB - mergeSelector:@selector(mergeString:)]; - XCTAssertNil(mergedArray, - @"merge of two empty arrays with merger should render nil"); -} - -- (void)testMergingEmptyWithNilArray { - NSArray *emptyArrayA = [NSArray array]; - NSArray *nilArrayB = nil; - NSArray *mergedArray = [emptyArrayA gtm_mergeArray:nilArrayB - mergeSelector:nil]; - XCTAssertNil(mergedArray, - @"merge of empty with nil array with no merger should render nil"); -} - -- (void)testMergingEmptyWithNilArrayWithMerger { - NSArray *emptyArrayA = [NSArray array]; - NSArray *nilArrayB = nil; - NSArray *mergedArray - = [emptyArrayA gtm_mergeArray:nilArrayB - mergeSelector:@selector(mergeString:)]; - XCTAssertNil(mergedArray, - @"merge of empty with nil array with merger should render nil"); -} - -- (void)testMergingTwoOneItemArraysThatDontMatch { - NSArray *arrayA = [NSArray arrayWithObject:@"abc.def"]; - NSArray *arrayB = [NSArray arrayWithObject:@"abc.ghi"]; - NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB - mergeSelector:nil]; - XCTAssertNotNil(mergedArray, - @"merge of two non empty arrays with no merger should render " - @"an array"); - XCTAssertEqual([mergedArray count], (NSUInteger)2, - @"merged array should have two items"); - XCTAssertEqualObjects([mergedArray objectAtIndex:0], @"abc.def"); - XCTAssertEqualObjects([mergedArray objectAtIndex:1], @"abc.ghi"); -} - -- (void)testMergingTwoOneItemArraysThatDontMatchWithMerger { - NSArray *arrayA = [NSArray arrayWithObject:@"abc.def"]; - NSArray *arrayB = [NSArray arrayWithObject:@"abc.ghi"]; - NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB - mergeSelector:@selector(mergeString:)]; - XCTAssertNotNil(mergedArray, - @"merge of two non empty arrays with merger should render " - @"an array"); - XCTAssertEqual([mergedArray count], (NSUInteger)2, - @"merged array should have two items"); - XCTAssertEqualObjects([mergedArray objectAtIndex:0], @"abc.def"); - XCTAssertEqualObjects([mergedArray objectAtIndex:1], @"abc.ghi"); -} - -- (void)testMergingTwoOneItemArraysThatMatch { - NSArray *arrayA = [NSArray arrayWithObject:@"abc.def"]; - NSArray *arrayB = [NSArray arrayWithObject:@"abc.def"]; - NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB - mergeSelector:nil]; - XCTAssertNotNil(mergedArray, - @"merge of two matching arrays with no merger should render " - @"an array"); - XCTAssertEqual([mergedArray count], (NSUInteger)2, - @"merged array with no merger should have two items"); - XCTAssertEqualObjects([mergedArray objectAtIndex:0], @"abc.def"); - XCTAssertEqualObjects([mergedArray objectAtIndex:1], @"abc.def"); -} - -- (void)testMergingTwoOneItemArraysThatMatchWithMerger { - NSArray *arrayA = [NSArray arrayWithObject:@"abc.def"]; - NSArray *arrayB = [NSArray arrayWithObject:@"abc.def"]; - NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB - mergeSelector:@selector(mergeString:)]; - XCTAssertNotNil(mergedArray, - @"merge of two matching arrays with merger should render " - @"an array"); - XCTAssertEqual([mergedArray count], (NSUInteger)1, - @"merged array with merger should have one items"); - XCTAssertEqualObjects([mergedArray objectAtIndex:0], @"abc.def"); -} - -- (void)testMergingMultipleItemArray { - NSArray *arrayA = [NSArray arrayWithObjects: - @"Kansas", - @"Arkansas", - @"Wisconson", - @"South Carolina", - nil]; - NSArray *arrayB = [NSArray arrayWithObjects: - @"South Carolina", - @"Quebec", - @"British Columbia", - @"Arkansas", - @"South Hamptom", - nil]; - NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB - mergeSelector:nil]; - XCTAssertNotNil(mergedArray, - @"merge of two non empty arrays with no merger should render " - @"an array"); - XCTAssertEqual([mergedArray count], (NSUInteger)9, - @"merged array should have 9 items"); -} - -- (void)testMergingMultipleItemArrayWithMerger { - NSArray *arrayA = [NSArray arrayWithObjects: - @"Kansas", - @"Arkansas", - @"Wisconson", - @"South Carolina", - nil]; - NSArray *arrayB = [NSArray arrayWithObjects: - @"South Carolina", - @"Quebec", - @"British Columbia", - @"Arkansas", - @"South Hamptom", - nil]; - NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB - mergeSelector:@selector(mergeString:)]; - XCTAssertNotNil(mergedArray, - @"merge of two non empty arrays with merger should render " - @"an array"); - XCTAssertEqual([mergedArray count], (NSUInteger)7, - @"merged array should have 7 items"); -} - -- (void)testMergeWithEmptyArrays { - NSArray *arrayA = [NSArray arrayWithObjects:@"xyz", @"abc", @"mno", nil]; - NSArray *arrayB = [NSArray array]; - NSArray *expected = [NSArray arrayWithObjects:@"abc", @"mno", @"xyz", nil]; - XCTAssertNotNil(arrayA); - XCTAssertNotNil(arrayB); - XCTAssertNotNil(expected); - NSArray *mergedArray; - - // no merger - mergedArray = [arrayA gtm_mergeArray:arrayB - mergeSelector:nil]; - XCTAssertNotNil(mergedArray); - XCTAssertEqualObjects(mergedArray, expected); - - // w/ merger - mergedArray = [arrayA gtm_mergeArray:arrayB - mergeSelector:@selector(mergeString:)]; - XCTAssertNotNil(mergedArray); - XCTAssertEqualObjects(mergedArray, expected); - - // no merger and array args reversed - mergedArray = [arrayB gtm_mergeArray:arrayA - mergeSelector:nil]; - XCTAssertNotNil(mergedArray); - XCTAssertEqualObjects(mergedArray, expected); - - // w/ merger and array args reversed - mergedArray = [arrayB gtm_mergeArray:arrayA - mergeSelector:@selector(mergeString:)]; - XCTAssertNotNil(mergedArray); - XCTAssertEqualObjects(mergedArray, expected); -} - -@end - - -@implementation NSString (GTMStringMergingTestAdditions) - -- (NSString *)mergeString:(NSString *)stringB { - return stringB; -} - -@end - diff --git a/GTM.xcodeproj/project.pbxproj b/GTM.xcodeproj/project.pbxproj index 99dda57..dc94984 100644 --- a/GTM.xcodeproj/project.pbxproj +++ b/GTM.xcodeproj/project.pbxproj @@ -14,8 +14,6 @@ 33C374380DD8D44800E97817 /* GTMNSDictionary+URLArguments.h in Headers */ = {isa = PBXBuildFile; fileRef = 33C374360DD8D44800E97817 /* GTMNSDictionary+URLArguments.h */; settings = {ATTRIBUTES = (Public, ); }; }; 33C374390DD8D44800E97817 /* GTMNSDictionary+URLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 33C374370DD8D44800E97817 /* GTMNSDictionary+URLArguments.m */; }; 444B3B7719F6D24000B9191E /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 444B3B7619F6D24000B9191E /* CoreServices.framework */; }; - 629445400EDDF647009295EA /* GTMNSArray+Merge.h in Headers */ = {isa = PBXBuildFile; fileRef = 6294453E0EDDF647009295EA /* GTMNSArray+Merge.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 629445410EDDF647009295EA /* GTMNSArray+Merge.m in Sources */ = {isa = PBXBuildFile; fileRef = 6294453F0EDDF647009295EA /* GTMNSArray+Merge.m */; }; 7F511DF90F4B0378009F41B6 /* GTMNSColor+Luminance.h in Headers */ = {isa = PBXBuildFile; fileRef = 7F511DF30F4B0378009F41B6 /* GTMNSColor+Luminance.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7F511DFA0F4B0378009F41B6 /* GTMNSColor+Luminance.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F511DF40F4B0378009F41B6 /* GTMNSColor+Luminance.m */; }; 7F97DB31104EBC8D004DDDEE /* GTMFadeTruncatingTextFieldCellTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F97DB2F104EBC8D004DDDEE /* GTMFadeTruncatingTextFieldCellTest.m */; }; @@ -107,7 +105,6 @@ 8BFE6E821282371200B5C894 /* GTMLogger+ASLTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F98681950E2C20C100CEE8BF /* GTMLogger+ASLTest.m */; }; 8BFE6E831282371200B5C894 /* GTMLoggerRingBufferWriterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F95803F80E2FB0760049A088 /* GTMLoggerRingBufferWriterTest.m */; }; 8BFE6E841282371200B5C894 /* GTMLoggerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F98680B10E2C15C300CEE8BF /* GTMLoggerTest.m */; }; - 8BFE6E881282371200B5C894 /* GTMNSArray+MergeTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6294454B0EDDF89A009295EA /* GTMNSArray+MergeTest.m */; }; 8BFE6E891282371200B5C894 /* GTMNSData+zlibTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F43E4E600D4E5EC90041161F /* GTMNSData+zlibTest.m */; }; 8BFE6E8B1282371200B5C894 /* GTMNSDictionary+URLArgumentsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 33C3745E0DD8D85B00E97817 /* GTMNSDictionary+URLArgumentsTest.m */; }; 8BFE6E8D1282371200B5C894 /* GTMNSFileHandle+UniqueNameTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B29078611F8D1BF0064F50F /* GTMNSFileHandle+UniqueNameTest.m */; }; @@ -243,9 +240,6 @@ 33C374370DD8D44800E97817 /* GTMNSDictionary+URLArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSDictionary+URLArguments.m"; sourceTree = ""; }; 33C3745E0DD8D85B00E97817 /* GTMNSDictionary+URLArgumentsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSDictionary+URLArgumentsTest.m"; sourceTree = ""; }; 444B3B7619F6D24000B9191E /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; - 6294453E0EDDF647009295EA /* GTMNSArray+Merge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSArray+Merge.h"; sourceTree = ""; }; - 6294453F0EDDF647009295EA /* GTMNSArray+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSArray+Merge.m"; sourceTree = ""; }; - 6294454B0EDDF89A009295EA /* GTMNSArray+MergeTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSArray+MergeTest.m"; sourceTree = ""; }; 7F511DF30F4B0378009F41B6 /* GTMNSColor+Luminance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSColor+Luminance.h"; sourceTree = ""; }; 7F511DF40F4B0378009F41B6 /* GTMNSColor+Luminance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSColor+Luminance.m"; sourceTree = ""; }; 7F511DF50F4B0378009F41B6 /* GTMNSColor+LuminanceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSColor+LuminanceTest.m"; sourceTree = ""; }; @@ -703,9 +697,6 @@ F95803F60E2FB0760049A088 /* GTMLoggerRingBufferWriter.h */, F95803F70E2FB0760049A088 /* GTMLoggerRingBufferWriter.m */, F95803F80E2FB0760049A088 /* GTMLoggerRingBufferWriterTest.m */, - 6294453E0EDDF647009295EA /* GTMNSArray+Merge.h */, - 6294453F0EDDF647009295EA /* GTMNSArray+Merge.m */, - 6294454B0EDDF89A009295EA /* GTMNSArray+MergeTest.m */, 33C374360DD8D44800E97817 /* GTMNSDictionary+URLArguments.h */, 33C374370DD8D44800E97817 /* GTMNSDictionary+URLArguments.m */, 33C3745E0DD8D85B00E97817 /* GTMNSDictionary+URLArgumentsTest.m */, @@ -864,7 +855,6 @@ 8B3590160E8190FA0041E21C /* GTMTestTimer.h in Headers */, 8B6F4B630E8856CA00425D9F /* GTMDebugThreadValidation.h in Headers */, F41711350ECDFBD500B9B276 /* GTMLightweightProxy.h in Headers */, - 629445400EDDF647009295EA /* GTMNSArray+Merge.h in Headers */, 8B3E292F0EEB53F8000681D8 /* GTMCarbonEvent.h in Headers */, F49FA8440EEF2AB700077669 /* GTMFileSystemKQueue.h in Headers */, 8B8EC87D0EF17C270044D13F /* GTMNSFileManager+Carbon.h in Headers */, @@ -1166,7 +1156,6 @@ 8BFE6E821282371200B5C894 /* GTMLogger+ASLTest.m in Sources */, 8BFE6E831282371200B5C894 /* GTMLoggerRingBufferWriterTest.m in Sources */, 8BFE6E841282371200B5C894 /* GTMLoggerTest.m in Sources */, - 8BFE6E881282371200B5C894 /* GTMNSArray+MergeTest.m in Sources */, 8BFE6E891282371200B5C894 /* GTMNSData+zlibTest.m in Sources */, 8BFE6E8B1282371200B5C894 /* GTMNSDictionary+URLArgumentsTest.m in Sources */, 8BFE6E8D1282371200B5C894 /* GTMNSFileHandle+UniqueNameTest.m in Sources */, @@ -1219,7 +1208,6 @@ 8B61FDC00E4CDB8000FF9C21 /* GTMStackTrace.m in Sources */, 8B6F4B640E8856CA00425D9F /* GTMDebugThreadValidation.m in Sources */, F41711360ECDFBD500B9B276 /* GTMLightweightProxy.m in Sources */, - 629445410EDDF647009295EA /* GTMNSArray+Merge.m in Sources */, 8B3E292E0EEB53F8000681D8 /* GTMCarbonEvent.m in Sources */, F49FA8450EEF2AB700077669 /* GTMFileSystemKQueue.m in Sources */, 8B8EC87E0EF17C270044D13F /* GTMNSFileManager+Carbon.m in Sources */, diff --git a/GTMiPhone.xcodeproj/project.pbxproj b/GTMiPhone.xcodeproj/project.pbxproj index 65803c5..6a15d4b 100644 --- a/GTMiPhone.xcodeproj/project.pbxproj +++ b/GTMiPhone.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 8B82CF041D9C1C3B007182AA /* GTMLightweightProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = F41711580ECDFF0400B9B276 /* GTMLightweightProxy.m */; }; 8B82CF051D9C1C3B007182AA /* GTMLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = F418AFA30E7559C7004FB565 /* GTMLogger.m */; }; 8B82CF061D9C1C3B007182AA /* GTMLoggerRingBufferWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = F418AFB20E755B4D004FB565 /* GTMLoggerRingBufferWriter.m */; }; - 8B82CF071D9C1C3B007182AA /* GTMNSArray+Merge.m in Sources */ = {isa = PBXBuildFile; fileRef = 629446180EDE177A009295EA /* GTMNSArray+Merge.m */; }; 8B82CF081D9C1C3B007182AA /* GTMNSData+zlib.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BC0477F0DAE928A00C2D1CA /* GTMNSData+zlib.m */; }; 8B82CF091D9C1C3B007182AA /* GTMNSDictionary+URLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = F418AFCB0E755C94004FB565 /* GTMNSDictionary+URLArguments.m */; }; 8B82CF0A1D9C1C3B007182AA /* GTMNSFileManager+Path.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BC047850DAE928A00C2D1CA /* GTMNSFileManager+Path.m */; }; @@ -55,7 +54,6 @@ 8B82CF371D9C2373007182AA /* GTMLightweightProxyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F41711590ECDFF0400B9B276 /* GTMLightweightProxyTest.m */; }; 8B82CF381D9C2373007182AA /* GTMLoggerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F418AFA40E7559C7004FB565 /* GTMLoggerTest.m */; }; 8B82CF391D9C2373007182AA /* GTMLoggerRingBufferWriterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F418AFB30E755B4D004FB565 /* GTMLoggerRingBufferWriterTest.m */; }; - 8B82CF3A1D9C2373007182AA /* GTMNSArray+MergeTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 629446190EDE177A009295EA /* GTMNSArray+MergeTest.m */; }; 8B82CF3B1D9C2373007182AA /* GTMNSData+zlibTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BC047800DAE928A00C2D1CA /* GTMNSData+zlibTest.m */; }; 8B82CF3C1D9C2373007182AA /* GTMNSDictionary+URLArgumentsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F418AFCC0E755C94004FB565 /* GTMNSDictionary+URLArgumentsTest.m */; }; 8B82CF3D1D9C2373007182AA /* GTMNSFileManager+PathTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BC047860DAE928A00C2D1CA /* GTMNSFileManager+PathTest.m */; }; @@ -116,9 +114,6 @@ 1D6058910D05DD3D006BFB54 /* GTMiPhoneTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GTMiPhoneTest.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 23220A05152C9E980060CB7D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; - 629446170EDE177A009295EA /* GTMNSArray+Merge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSArray+Merge.h"; sourceTree = ""; }; - 629446180EDE177A009295EA /* GTMNSArray+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSArray+Merge.m"; sourceTree = ""; }; - 629446190EDE177A009295EA /* GTMNSArray+MergeTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSArray+MergeTest.m"; sourceTree = ""; }; 64D0F5C50FD3E65C00506CC7 /* GTMUIImage+Resize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMUIImage+Resize.h"; sourceTree = ""; }; 64D0F5C60FD3E65C00506CC7 /* GTMUIImage+ResizeTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMUIImage+ResizeTest.m"; sourceTree = ""; }; 64D0F5C70FD3E65C00506CC7 /* GTMUIImage+Resize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMUIImage+Resize.m"; sourceTree = ""; }; @@ -363,9 +358,6 @@ F418AFB10E755B4D004FB565 /* GTMLoggerRingBufferWriter.h */, F418AFB20E755B4D004FB565 /* GTMLoggerRingBufferWriter.m */, F418AFB30E755B4D004FB565 /* GTMLoggerRingBufferWriterTest.m */, - 629446170EDE177A009295EA /* GTMNSArray+Merge.h */, - 629446180EDE177A009295EA /* GTMNSArray+Merge.m */, - 629446190EDE177A009295EA /* GTMNSArray+MergeTest.m */, 8BC0477E0DAE928A00C2D1CA /* GTMNSData+zlib.h */, 8BC0477F0DAE928A00C2D1CA /* GTMNSData+zlib.m */, 8BC047800DAE928A00C2D1CA /* GTMNSData+zlibTest.m */, @@ -654,7 +646,6 @@ 8B82CF101D9C1C3B007182AA /* GTMNSString+URLArguments.m in Sources */, 8B82CF091D9C1C3B007182AA /* GTMNSDictionary+URLArguments.m in Sources */, 8B82CF061D9C1C3B007182AA /* GTMLoggerRingBufferWriter.m in Sources */, - 8B82CF071D9C1C3B007182AA /* GTMNSArray+Merge.m in Sources */, 8B82CF131D9C1C3B007182AA /* GTMRegex.m in Sources */, 8B82CF0A1D9C1C3B007182AA /* GTMNSFileManager+Path.m in Sources */, 8B82CF001D9C1C3B007182AA /* GTMDebugThreadValidation.m in Sources */, @@ -674,7 +665,6 @@ 8B82CF2C1D9C1CC5007182AA /* GTMStringEncodingTest.m in Sources */, 8B82CF4D1D9C2385007182AA /* GTMUIFont+LineHeightTest.m in Sources */, 8B82CF381D9C2373007182AA /* GTMLoggerTest.m in Sources */, - 8B82CF3A1D9C2373007182AA /* GTMNSArray+MergeTest.m in Sources */, 8B82CF2F1D9C1E49007182AA /* GTMSenTestCase.m in Sources */, 8B82CF4A1D9C2373007182AA /* GTMUILocalizerTest.m in Sources */, 8BF753DD1D9DB30E0010A295 /* GTMSQLiteTest.m in Sources */, -- cgit v1.2.3