Flatten hierarchy for pods that specify use_frameworks!

ailiao · Sep 18, 2015 · 427316b · 427316b
1 parent dd0094e
commit 427316b
Show file tree

Hide file tree

Showing 20 changed files with 96 additions and 110 deletions.
diff --git a/Unirest.xcodeproj/project.pbxproj b/Unirest.xcodeproj/project.pbxproj
diff --git a/Unirest/HttpRequest/UNIBaseRequest.h → Unirest/UNIBaseRequest.h b/Unirest/HttpRequest/UNIBaseRequest.h → Unirest/UNIBaseRequest.h
diff --git a/Unirest/HttpRequest/UNIBaseRequest.m → Unirest/UNIBaseRequest.m b/Unirest/HttpRequest/UNIBaseRequest.m → Unirest/UNIBaseRequest.m
diff --git a/Unirest/HttpRequest/UNIBodyRequest.h → Unirest/UNIBodyRequest.h b/Unirest/HttpRequest/UNIBodyRequest.h → Unirest/UNIBodyRequest.h
diff --git a/Unirest/HttpRequest/UNIBodyRequest.m → Unirest/UNIBodyRequest.m b/Unirest/HttpRequest/UNIBodyRequest.m → Unirest/UNIBodyRequest.m
diff --git a/Unirest/HttpResponse/UNIHTTPBinaryResponse.h → Unirest/UNIHTTPBinaryResponse.h b/Unirest/HttpResponse/UNIHTTPBinaryResponse.h → Unirest/UNIHTTPBinaryResponse.h
diff --git a/Unirest/HttpResponse/UNIHTTPBinaryResponse.m → Unirest/UNIHTTPBinaryResponse.m b/Unirest/HttpResponse/UNIHTTPBinaryResponse.m → Unirest/UNIHTTPBinaryResponse.m
diff --git a/Unirest/UNIHTTPClientHelper.h b/Unirest/UNIHTTPClientHelper.h
@@ -23,10 +23,10 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#import "HttpResponse/UNIHTTPResponse.h"
+#import "UNIHTTPResponse.h"
 #import "UNIHTTPRequest.h"
 #import "UNIHTTPRequestWithBody.h"
-#import "HttpRequest/UNISimpleRequest.h"
+#import "UNISimpleRequest.h"
 #import "UNIUrlConnection.h"
 
 #define BOUNDARY @"---------------------------17237809831461299884346131229"

diff --git a/Unirest/HttpResponse/UNIHTTPJsonResponse.h → Unirest/UNIHTTPJsonResponse.h b/Unirest/HttpResponse/UNIHTTPJsonResponse.h → Unirest/UNIHTTPJsonResponse.h
diff --git a/Unirest/HttpResponse/UNIHTTPJsonResponse.m → Unirest/UNIHTTPJsonResponse.m b/Unirest/HttpResponse/UNIHTTPJsonResponse.m → Unirest/UNIHTTPJsonResponse.m
diff --git a/Unirest/UNIHTTPRequest.h b/Unirest/UNIHTTPRequest.h
@@ -23,9 +23,9 @@
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#import "HttpResponse/UNIHTTPStringResponse.h"
-#import "HttpResponse/UNIHTTPBinaryResponse.h"
-#import "HttpResponse/UNIHTTPJsonResponse.h"
+#import "UNIHTTPStringResponse.h"
+#import "UNIHTTPBinaryResponse.h"
+#import "UNIHTTPJsonResponse.h"
 #import "UNIUrlConnection.h"
 
 typedef NS_ENUM(NSInteger, UNIHTTPMethod) {

diff --git a/Unirest/HttpResponse/UNIHTTPResponse.h → Unirest/UNIHTTPResponse.h b/Unirest/HttpResponse/UNIHTTPResponse.h → Unirest/UNIHTTPResponse.h
diff --git a/Unirest/HttpResponse/UNIHTTPResponse.m → Unirest/UNIHTTPResponse.m b/Unirest/HttpResponse/UNIHTTPResponse.m → Unirest/UNIHTTPResponse.m
diff --git a/Unirest/HttpResponse/UNIHTTPStringResponse.h → Unirest/UNIHTTPStringResponse.h b/Unirest/HttpResponse/UNIHTTPStringResponse.h → Unirest/UNIHTTPStringResponse.h
diff --git a/Unirest/HttpResponse/UNIHTTPStringResponse.m → Unirest/UNIHTTPStringResponse.m b/Unirest/HttpResponse/UNIHTTPStringResponse.m → Unirest/UNIHTTPStringResponse.m
diff --git a/Unirest/HttpResponse/UNIJsonNode.h → Unirest/UNIJsonNode.h b/Unirest/HttpResponse/UNIJsonNode.h → Unirest/UNIJsonNode.h
diff --git a/Unirest/HttpResponse/UNIJsonNode.m → Unirest/UNIJsonNode.m b/Unirest/HttpResponse/UNIJsonNode.m → Unirest/UNIJsonNode.m
diff --git a/Unirest/UNIRest.h b/Unirest/UNIRest.h
@@ -26,11 +26,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #import <Foundation/Foundation.h>
 #import "UNIHTTPRequest.h"
 #import "UNIHTTPRequestWithBody.h"
-#import "HttpRequest/UNISimpleRequest.h"
-#import "HttpRequest/UNIBodyRequest.h"
-#import "HttpResponse/UNIHTTPBinaryResponse.h"
-#import "HttpResponse/UNIHTTPJsonResponse.h"
-#import "HttpResponse/UNIHTTPStringResponse.h"
+#import "UNISimpleRequest.h"
+#import "UNIBodyRequest.h"
+#import "UNIHTTPBinaryResponse.h"
+#import "UNIHTTPJsonResponse.h"
+#import "UNIHTTPStringResponse.h"
 
 typedef void (^UNISimpleRequestBlock)(UNISimpleRequest* simpleRequest);
 typedef void (^UNIBodyRequestBlock)(UNIBodyRequest* unibodyRequest);

diff --git a/Unirest/HttpRequest/UNISimpleRequest.h → Unirest/UNISimpleRequest.h b/Unirest/HttpRequest/UNISimpleRequest.h → Unirest/UNISimpleRequest.h
diff --git a/Unirest/HttpRequest/UNISimpleRequest.m → Unirest/UNISimpleRequest.m b/Unirest/HttpRequest/UNISimpleRequest.m → Unirest/UNISimpleRequest.m