Merge branch 'release/1.0.5'

Blue-Rocket · Apr 9, 2015 · 62b6043 · 62b6043
2 parents 0defa35 + 8aa3d8f
commit 62b6043
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 52 deletions.
diff --git a/BRFullTextSearch.podspec b/BRFullTextSearch.podspec
@@ -40,9 +40,6 @@ Pod::Spec.new do |s|
 
   s.subspec 'Core' do |as|
   	as.dependency 'BRFullTextSearch/API'
-  	as.dependency 'BRFullTextSearch/CLucene-Shared'
- 	as.dependency 'BRFullTextSearch/CLucene-Core'
- 	as.dependency 'BRFullTextSearch/CLucene-Contribs-Lib'
   	as.dependency 'BRFullTextSearch/Implementation-CLucene'
   end
 
@@ -60,15 +57,13 @@ Pod::Spec.new do |s|
   						"BRFullTextSearch/*Analyzer*",
   						"BRFullTextSearch/*Filter*"
   	as.dependency 'BRFullTextSearch/API'
-  	as.dependency 'BRFullTextSearch/CLucene-Shared-API'
- 	as.dependency 'BRFullTextSearch/CLucene-Core-API'
- 	as.dependency 'BRFullTextSearch/CLucene-Contribs-Lib'
+	as.dependency 'BRFullTextSearch/CLucene'
   end
 
   s.subspec 'CLucene' do |as|
-  	as.dependency 'BRFullTextSearch/API'
   	as.dependency 'BRFullTextSearch/CLucene-Shared'
  	as.dependency 'BRFullTextSearch/CLucene-Core'
+ 	as.dependency 'BRFullTextSearch/CLucene-Contribs-Lib'
   end
 
   s.subspec 'CLucene-Config' do |as|
@@ -77,15 +72,6 @@ Pod::Spec.new do |s|
   	as.header_mappings_dir = 'BRFullTextSearch'
   end
 
-  s.subspec 'CLucene-Shared-API' do |as|
-  	as.requires_arc = false
-  	as.source_files = "clucene/src/shared/CLucene/**/*.h"
-  	as.header_mappings_dir = 'clucene/src/shared'
-  	as.exclude_files = "clucene/src/shared/CLucene/CLSharedMonolithic.*",
-                    	"clucene/src/shared/CLucene/util/deflate.*"
-    as.dependency 'BRFullTextSearch/CLucene-Config'
-  end
-
   s.subspec 'CLucene-Core-API' do |as|
   	as.requires_arc = false
   	as.source_files = "clucene/src/core/CLucene.h",
@@ -99,12 +85,11 @@ Pod::Spec.new do |s|
 
   s.subspec 'CLucene-Shared' do |as|
   	as.requires_arc = false
-  	as.source_files = "clucene/src/shared/CLucene/**/*.{c,cpp}"
+  	as.source_files = "clucene/src/shared/CLucene/**/*.{h,c,cpp}"
   	as.header_mappings_dir = 'clucene/src/shared'
   	as.exclude_files = "clucene/src/shared/CLucene/CLSharedMonolithic.*",
                     	"clucene/src/shared/CLucene/util/deflate.*"
     as.dependency 'BRFullTextSearch/CLucene-Core-API'
-    as.dependency 'BRFullTextSearch/CLucene-Shared-API'
   end
 
   s.subspec 'CLucene-Core' do |as|

diff --git a/SampleCocoaPodsProject/Podfile b/SampleCocoaPodsProject/Podfile
@@ -1,4 +1,8 @@
+source 'https://github.com/CocoaPods/Specs.git'
+
 platform :ios, '7.0'
 
-pod 'BRFullTextSearch', 		'~> 1.0', :inhibit_warnings => true
-pod 'MagicalRecord',			'~> 2.2', :inhibit_warnings => true
+inhibit_all_warnings!
+
+pod 'BRFullTextSearch', 		:path => '../'
+pod 'MagicalRecord',			'~> 2.2'
diff --git a/SampleCocoaPodsProject/Podfile.lock b/SampleCocoaPodsProject/Podfile.lock
@@ -1,42 +1,42 @@
 PODS:
-  - BRFullTextSearch (1.0.0):
-    - BRFullTextSearch/Core
-  - BRFullTextSearch/API (1.0.0)
-  - BRFullTextSearch/CLucene-Config (1.0.0)
-  - BRFullTextSearch/CLucene-Contribs-Lib (1.0.0):
-    - BRFullTextSearch/CLucene-Core-API
-    - BRFullTextSearch/CLucene-Shared-API
-  - BRFullTextSearch/CLucene-Core (1.0.0):
+  - BRFullTextSearch (1.0.5):
+    - BRFullTextSearch/Core (= 1.0.5)
+  - BRFullTextSearch/API (1.0.5)
+  - BRFullTextSearch/CLucene (1.0.5):
+    - 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-Core
+    - BRFullTextSearch/CLucene-Shared
+  - BRFullTextSearch/CLucene-Core (1.0.5):
     - BRFullTextSearch/CLucene-Core-API
-    - BRFullTextSearch/CLucene-Shared-API
-  - BRFullTextSearch/CLucene-Core-API (1.0.0):
+    - BRFullTextSearch/CLucene-Shared
+  - BRFullTextSearch/CLucene-Core-API (1.0.5):
     - BRFullTextSearch/CLucene-Config
-  - BRFullTextSearch/CLucene-Shared (1.0.0):
+  - BRFullTextSearch/CLucene-Shared (1.0.5):
     - BRFullTextSearch/CLucene-Core-API
-    - BRFullTextSearch/CLucene-Shared-API
-  - BRFullTextSearch/CLucene-Shared-API (1.0.0):
-    - BRFullTextSearch/CLucene-Config
-  - BRFullTextSearch/Core (1.0.0):
+  - BRFullTextSearch/Core (1.0.5):
     - BRFullTextSearch/API
-    - BRFullTextSearch/CLucene-Contribs-Lib
-    - BRFullTextSearch/CLucene-Core
-    - BRFullTextSearch/CLucene-Shared
     - BRFullTextSearch/Implementation-CLucene
-  - BRFullTextSearch/Implementation-CLucene (1.0.0):
+  - BRFullTextSearch/Implementation-CLucene (1.0.5):
     - BRFullTextSearch/API
-    - BRFullTextSearch/CLucene-Contribs-Lib
-    - BRFullTextSearch/CLucene-Core-API
-    - BRFullTextSearch/CLucene-Shared-API
+    - BRFullTextSearch/CLucene
   - MagicalRecord (2.2):
-    - MagicalRecord/Core
+    - MagicalRecord/Core (= 2.2)
   - MagicalRecord/Core (2.2)
 
 DEPENDENCIES:
-  - BRFullTextSearch (~> 1.0)
+  - BRFullTextSearch (from `../`)
   - MagicalRecord (~> 2.2)
 
+EXTERNAL SOURCES:
+  BRFullTextSearch:
+    :path: ../
+
 SPEC CHECKSUMS:
-  BRFullTextSearch: 4eba577a98a0b84a8407d61aa66f14b1c0fcbe85
-  MagicalRecord: 95d49d74ef752cd52f6ad87bcb474817fc3978cf
+  BRFullTextSearch: a76ca2fe3c565f4746b2813cf924469efa6977fa
+  MagicalRecord: f8a56bb87ab6552f20c4bb8681a1958a197ea3cd
 
-COCOAPODS: 0.32.1
+COCOAPODS: 0.36.3
diff --git a/SampleCocoaPodsProject/SampleCocoaPodsProject.xcodeproj/project.pbxproj b/SampleCocoaPodsProject/SampleCocoaPodsProject.xcodeproj/project.pbxproj
@@ -25,7 +25,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		02DA846F86E84D1789B6E651 /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = "<group>"; };
+		1178D11A65828B4C3B41DDE8 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
 		93862DD2F770400AB73C2C7B /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		C9D347CF192412DF0021FF0B /* SampleCocoaPodsProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SampleCocoaPodsProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C9D347D2192412DF0021FF0B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -51,6 +51,7 @@
 		C9D3481F192413830021FF0B /* StickyNoteListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StickyNoteListViewController.m; sourceTree = "<group>"; };
 		C9D34820192413830021FF0B /* StickyNoteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StickyNoteViewController.h; sourceTree = "<group>"; };
 		C9D34821192413830021FF0B /* StickyNoteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StickyNoteViewController.m; sourceTree = "<group>"; };
+		DB47DD24440F6CEAEA80E5C9 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -68,6 +69,15 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		4702EABB7E8E03A74F2AB626 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				1178D11A65828B4C3B41DDE8 /* Pods.debug.xcconfig */,
+				DB47DD24440F6CEAEA80E5C9 /* Pods.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 		C97FC8CC1924759500447C51 /* Model */ = {
 			isa = PBXGroup;
 			children = (
@@ -84,7 +94,7 @@
 				C9D347D8192412DF0021FF0B /* SampleCocoaPodsProject */,
 				C9D347D1192412DF0021FF0B /* Frameworks */,
 				C9D347D0192412DF0021FF0B /* Products */,
-				02DA846F86E84D1789B6E651 /* Pods.xcconfig */,
+				4702EABB7E8E03A74F2AB626 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -215,7 +225,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		50FBCD46A9AD4D449A0CA2DE /* Check Pods Manifest.lock */ = {
@@ -345,7 +355,7 @@
 		};
 		C9D34802192412DF0021FF0B /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 02DA846F86E84D1789B6E651 /* Pods.xcconfig */;
+			baseConfigurationReference = 1178D11A65828B4C3B41DDE8 /* Pods.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -359,7 +369,7 @@
 		};
 		C9D34803192412DF0021FF0B /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 02DA846F86E84D1789B6E651 /* Pods.xcconfig */;
+			baseConfigurationReference = DB47DD24440F6CEAEA80E5C9 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;