Merge branch 'release/1.0.9'

.gitignore

@@ -4,4 +4,5 @@
 .DS_Store
 xcuserdata
 *.xccheckout
+*.xcscmblueprint
 SampleCocoaPodsProject/Pods

BRFullTextSearch.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "BRFullTextSearch"
-  s.version      = "1.0.8"
+  s.version      = "1.0.9"
   s.summary      = "iOS Objective-C full text search engine."
   s.description  = <<-DESC
                    This project provides a way to integrate full-text search
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
 
   s.homepage     = "https://github.com/Blue-Rocket/BRFullTextSearch"
   s.license      = "Apache License, Version 2.0"
-  s.author       = { "Matt Magoffin" => "git+matt@msqr.us" }
+  s.author       = { "Matt Magoffin" => "matt@bluerocket.us" }
 
   s.platform     = :ios, "5.0"
 
@@ -23,7 +23,6 @@ Pod::Spec.new do |s|
 
   s.libraries		= 'stdc++', 'z'
   s.compiler_flags	= '-Wmost', 
-#  					  '-Wno-four-char-constants', '-Wno-unknown-pragmas', 
   					  '-fvisibility=default', '-fPIC', '-D_UCS2', '-D_UNICODE', '-D_REENTRANT',
   					  '-DNDEBUG'
 

BRFullTextSearch.xcodeproj/project.pbxproj

@@ -880,6 +880,7 @@
 		C99FCBE918466AA700A90E66 /* TestIndexable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestIndexable.m; sourceTree = "<group>"; };
 		C99FCBEB18466FE600A90E66 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		C99FCBEE1846745E00A90E66 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		C9A68F3D1BCB6376003E6AE1 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
 		C9AE054317E149E4006527D0 /* NSDate_BRFullTextSearchAdditionsTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSDate_BRFullTextSearchAdditionsTests.h; sourceTree = "<group>"; };
 		C9AE054417E149E4006527D0 /* NSDate_BRFullTextSearchAdditionsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSDate_BRFullTextSearchAdditionsTests.m; sourceTree = "<group>"; };
 		C9D6EC1F1AD615FC006D23F4 /* SnowballPrefixFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SnowballPrefixFilter.cpp; sourceTree = "<group>"; };
@@ -971,6 +972,7 @@
 		C909C2671784CB600016C25E /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				C9A68F3D1BCB6376003E6AE1 /* README.md */,
 				C97940F61786240100DF0660 /* stop-words.txt */,
 				C909C6491784D00C0016C25E /* BRFullTextSearch.h */,
 				C909C2681784CB600016C25E /* BRFullTextSearch-Prefix.pch */,
@@ -1676,7 +1678,7 @@
 		C909C2591784CB600016C25E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Blue Rocket";
 			};
 			buildConfigurationList = C909C25C1784CB600016C25E /* Build configuration list for PBXProject "BRFullTextSearch" */;
@@ -2186,6 +2188,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -2204,7 +2207,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
-				ONLY_ACTIVE_ARCH = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-fvisibility=default",
 					"-fPIC",
@@ -2295,6 +2298,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "BRFullTextSearch/BRFullTextSearch-Prefix.pch";
 				INFOPLIST_FILE = "BRFullTextSearchTests/BRFullTextSearchTests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "us.bluerocket.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = xctest;
 			};
@@ -2306,6 +2310,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "BRFullTextSearch/BRFullTextSearch-Prefix.pch";
 				INFOPLIST_FILE = "BRFullTextSearchTests/BRFullTextSearchTests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "us.bluerocket.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = xctest;
 			};

BRFullTextSearchTests/BRFullTextSearchTests-Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>us.bluerocket.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

README.md

@@ -160,11 +160,21 @@ Install into your project:
 ``` bash
 $ pod install
 ```
+
 Open your project in Xcode using the **.xcworkspace** file CocoaPods generated.
 
 **Note:** the `use_frameworks!` option is not supported, see #4. Any pull requests
 to allow for building as a dynamic framework are very welcome!
 
+**Note:** CocoaPods as of version 0.39 might not produce a valid project for this pod.
+You can work around it by running `pod` like this:
+
+``` bash
+$ COCOAPODS_DISABLE_DETERMINISTIC_UUIDS=YES pod install
+```
+or you can manually modify the target membership of any files that are the cause of linker
+errors to be included in the `BRFullTextSearch` target in Xcode.
+
 ## via static framework
 
 Using this approach you'll build a static library framework that you can manually

SampleCocoaPodsProject/Podfile

@@ -5,4 +5,4 @@ platform :ios, '7.0'
 inhibit_all_warnings!
 
 pod 'BRFullTextSearch', 		:path => '../'
-pod 'MagicalRecord',			'~> 2.2'
+pod 'MagicalRecord',			'2.2'

SampleCocoaPodsProject/Podfile.lock

@@ -1,26 +1,26 @@
 PODS:
-  - BRFullTextSearch (1.0.5):
-    - BRFullTextSearch/Core (= 1.0.5)
-  - BRFullTextSearch/API (1.0.5)
-  - BRFullTextSearch/CLucene (1.0.5):
+  - BRFullTextSearch (1.0.9):
+    - BRFullTextSearch/Core (= 1.0.9)
+  - BRFullTextSearch/API (1.0.9)
+  - BRFullTextSearch/CLucene (1.0.9):
     - BRFullTextSearch/CLucene-Contribs-Lib
     - BRFullTextSearch/CLucene-Core
     - BRFullTextSearch/CLucene-Shared
-  - BRFullTextSearch/CLucene-Config (1.0.5)
-  - BRFullTextSearch/CLucene-Contribs-Lib (1.0.5):
+  - BRFullTextSearch/CLucene-Config (1.0.9)
+  - BRFullTextSearch/CLucene-Contribs-Lib (1.0.9):
     - BRFullTextSearch/CLucene-Core
     - BRFullTextSearch/CLucene-Shared
-  - BRFullTextSearch/CLucene-Core (1.0.5):
+  - BRFullTextSearch/CLucene-Core (1.0.9):
     - BRFullTextSearch/CLucene-Core-API
     - BRFullTextSearch/CLucene-Shared
-  - BRFullTextSearch/CLucene-Core-API (1.0.5):
+  - BRFullTextSearch/CLucene-Core-API (1.0.9):
     - BRFullTextSearch/CLucene-Config
-  - BRFullTextSearch/CLucene-Shared (1.0.5):
+  - BRFullTextSearch/CLucene-Shared (1.0.9):
     - BRFullTextSearch/CLucene-Core-API
-  - BRFullTextSearch/Core (1.0.5):
+  - BRFullTextSearch/Core (1.0.9):
     - BRFullTextSearch/API
     - BRFullTextSearch/Implementation-CLucene
-  - BRFullTextSearch/Implementation-CLucene (1.0.5):
+  - BRFullTextSearch/Implementation-CLucene (1.0.9):
     - BRFullTextSearch/API
     - BRFullTextSearch/CLucene
   - MagicalRecord (2.2):
@@ -29,14 +29,14 @@ PODS:
 
 DEPENDENCIES:
   - BRFullTextSearch (from `../`)
-  - MagicalRecord (~> 2.2)
+  - MagicalRecord (= 2.2)
 
 EXTERNAL SOURCES:
   BRFullTextSearch:
     :path: ../
 
 SPEC CHECKSUMS:
-  BRFullTextSearch: a76ca2fe3c565f4746b2813cf924469efa6977fa
+  BRFullTextSearch: b62cbddbf828301e5e2403536044b58837fedf25
   MagicalRecord: f8a56bb87ab6552f20c4bb8681a1958a197ea3cd
 
-COCOAPODS: 0.36.3
+COCOAPODS: 0.39.0

SampleCocoaPodsProject/SampleCocoaPodsProject.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		182C0BCFE26E400C9567DBC9 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 93862DD2F770400AB73C2C7B /* libPods.a */; };
 		C9D347D3192412DF0021FF0B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9D347D2192412DF0021FF0B /* Foundation.framework */; };
 		C9D347D5192412DF0021FF0B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9D347D4192412DF0021FF0B /* CoreGraphics.framework */; };
 		C9D347D7192412DF0021FF0B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9D347D6192412DF0021FF0B /* UIKit.framework */; };
@@ -22,6 +21,7 @@
 		C9D34825192413830021FF0B /* StickyNote.m in Sources */ = {isa = PBXBuildFile; fileRef = C9D3481D192413830021FF0B /* StickyNote.m */; };
 		C9D34826192413830021FF0B /* StickyNoteListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C9D3481F192413830021FF0B /* StickyNoteListViewController.m */; };
 		C9D34827192413830021FF0B /* StickyNoteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C9D34821192413830021FF0B /* StickyNoteViewController.m */; };
+		EA838DCEC4BB4D0AE5A719D3 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 93862DD2F770400AB73C2C7B /* libPods.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -62,7 +62,7 @@
 				C9D347D5192412DF0021FF0B /* CoreGraphics.framework in Frameworks */,
 				C9D347D7192412DF0021FF0B /* UIKit.framework in Frameworks */,
 				C9D347D3192412DF0021FF0B /* Foundation.framework in Frameworks */,
-				182C0BCFE26E400C9567DBC9 /* libPods.a in Frameworks */,
+				EA838DCEC4BB4D0AE5A719D3 /* libPods.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -162,6 +162,7 @@
 				C9D347CC192412DF0021FF0B /* Frameworks */,
 				C9D347CD192412DF0021FF0B /* Resources */,
 				0D1275ABF81240DE8C7BDDA0 /* Copy Pods Resources */,
+				C1ED7AF19AC72C71D482605C /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -178,7 +179,7 @@
 		C9D347C7192412DF0021FF0B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Blue Rocket, Inc.";
 			};
 			buildConfigurationList = C9D347CA192412DF0021FF0B /* Build configuration list for PBXProject "SampleCocoaPodsProject" */;
@@ -243,6 +244,21 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
+		C1ED7AF19AC72C71D482605C /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -301,6 +317,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -363,6 +380,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SampleCocoaPodsProject/SampleCocoaPodsProject-Prefix.pch";
 				INFOPLIST_FILE = "SampleCocoaPodsProject/SampleCocoaPodsProject-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "us.bluerocket.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -377,6 +395,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SampleCocoaPodsProject/SampleCocoaPodsProject-Prefix.pch";
 				INFOPLIST_FILE = "SampleCocoaPodsProject/SampleCocoaPodsProject-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "us.bluerocket.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

SampleCocoaPodsProject/SampleCocoaPodsProject/SampleCocoaPodsProject-Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>us.bluerocket.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

SampleDependentProject/SampleDependentProject.xcodeproj/project.pbxproj

@@ -184,7 +184,7 @@
 		C92BDBC9178BC63C00700BD0 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0460;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Blue Rocket";
 			};
 			buildConfigurationList = C92BDBCC178BC63C00700BD0 /* Build configuration list for PBXProject "SampleDependentProject" */;
@@ -298,6 +298,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -350,6 +351,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SampleDependentProject/SampleDependentProject-Prefix.pch";
 				INFOPLIST_FILE = "SampleDependentProject/SampleDependentProject-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "us.bluerocket.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -361,6 +363,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SampleDependentProject/SampleDependentProject-Prefix.pch";
 				INFOPLIST_FILE = "SampleDependentProject/SampleDependentProject-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "us.bluerocket.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

SampleDependentProject/SampleDependentProject/SampleDependentProject-Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>us.bluerocket.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>