More header fixes for subspecs

jkuziel · Aug 25, 2015 · 1a5f7eb · 1a5f7eb
1 parent 9e629ed
commit 1a5f7eb
Show file tree

Hide file tree

Showing 8 changed files with 500 additions and 519 deletions.
diff --git a/QuickDialog.podspec b/QuickDialog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'QuickDialog'
-  s.version  = '1.0.1'
+  s.version  = '1.0.2'
   s.platform = :ios, '5.0'
   s.license  = 'Apache License, Version 2.0'
   s.summary  = 'Quick and easy dialog screens for iOS.'
@@ -21,23 +21,9 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Extras" do |sp|
+    sp.dependency 'QuickDialog/Core'
     sp.source_files = 'extras', '*.{h,m}'
   end
 
-  s.subspec "QPicker" do |sp|
-    sp.source_files = 'extras/QPicker*.{h,m}'
-  end
-  s.subspec "QMail" do |sp|
-    sp.source_files = 'extras/QMail*.{h,m}'
-  end
-  s.subspec "QMap" do |sp|
-    sp.source_files = 'extras/QMap*.{h,m}'
-  end
-  s.subspec "QWeb" do |sp|
-    sp.source_files = 'extras/QWeb*.{h,m}'
-  end
-  s.subspec "QColor" do |sp|
-    sp.source_files = 'extras/QColor*.{h,m}', 'extras/UIColor*.{h,m}'
-  end
 
 end
diff --git a/QuickDialog.xcodeproj/project.pbxproj b/QuickDialog.xcodeproj/project.pbxproj
diff --git a/extras/QColorPickerElement.h b/extras/QColorPickerElement.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 Quickfire Software. All rights reserved.
 //
 
-#import "QLabelElement.h"
+#import "QuickDialog.h"
 
 @interface QColorPickerElement : QRadioElement
 

diff --git a/extras/QMailElement.h b/extras/QMailElement.h
@@ -8,9 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <MessageUI/MessageUI.h>
-
 #import "QuickDialog.h"
-#import "QLabelElement.h"
 
 @interface QMailElement : QLabelElement <MFMailComposeViewControllerDelegate> {
 

diff --git a/extras/QWebElement.h b/extras/QWebElement.h
@@ -13,7 +13,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QLabelElement.h"
+#import "QuickDialog.h"
 
 /**
   QWebElement: pushes a simple browser that opens the URL defined in the element

diff --git a/QDateInlineTableViewCell.h → quickdialog/QDateInlineTableViewCell.h b/QDateInlineTableViewCell.h → quickdialog/QDateInlineTableViewCell.h
diff --git a/QDateInlineTableViewCell.m → quickdialog/QDateInlineTableViewCell.m b/QDateInlineTableViewCell.m → quickdialog/QDateInlineTableViewCell.m
diff --git a/QuickDialogDelegate.h → quickdialog/QuickDialogDelegate.h b/QuickDialogDelegate.h → quickdialog/QuickDialogDelegate.h