make project compatible for non-module users

morganchen12 · morganchen12 · commit 670cbad33619 · 2018-02-01T10:09:56.000-08:00
Change-Id: Ica628d5e23746c10a5e80b10367394fb3da9ee70
diff --git a/FirebaseDatabaseUI/FUIArray.h b/FirebaseDatabaseUI/FUIArray.h
@@ -18,7 +18,7 @@
 
 // clang-format on
 
-@import FirebaseDatabase;
+#import <FirebaseDatabase/FirebaseDatabase.h>
 
 #import "FUICollection.h"
 
diff --git a/FirebaseDatabaseUI/FUICollectionViewDataSource.m b/FirebaseDatabaseUI/FUICollectionViewDataSource.m
@@ -21,8 +21,6 @@
 #import "FUICollectionViewDataSource.h"
 #import "FUIArray.h"
 
-@import FirebaseDatabase;
-
 @interface FUICollectionViewDataSource () <FUICollectionDelegate>
 
 @property (nonatomic, readonly, nonnull) id<FUICollection> collection;
diff --git a/FirebaseDatabaseUI/FUIIndexCollectionViewDataSource.h b/FirebaseDatabaseUI/FUIIndexCollectionViewDataSource.h
@@ -14,9 +14,8 @@
 //  limitations under the License.
 //
 
-@import UIKit;
-
-@import FirebaseDatabase;
+#import <FirebaseDatabase/FirebaseDatabase.h>
+#import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseDatabaseUI/FUIIndexTableViewDataSource.h b/FirebaseDatabaseUI/FUIIndexTableViewDataSource.h
@@ -14,9 +14,8 @@
 //  limitations under the License.
 //
 
-@import UIKit;
-
-@import FirebaseDatabase;
+#import <UIKit/UIKit.h>
+#import <FirebaseDatabase/FirebaseDatabase.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseDatabaseUI/FUISortedArray.h b/FirebaseDatabaseUI/FUISortedArray.h
@@ -14,9 +14,7 @@
 //  limitations under the License.
 //
 
-@import FirebaseDatabase;
-
-#import "FirebaseDatabaseUI.h"
+#import "FUIArray.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseDatabaseUI/FUITableViewDataSource.m b/FirebaseDatabaseUI/FUITableViewDataSource.m
@@ -21,8 +21,6 @@
 #import "FUIArray.h"
 #import "FUITableViewDataSource.h"
 
-@import FirebaseDatabase;
-
 @interface FUITableViewDataSource () <FUICollectionDelegate>
 
 @property (strong, nonatomic, readwrite) UITableViewCell *(^populateCell)
diff --git a/FirebaseFirestoreUI/FUIBatchedArray.h b/FirebaseFirestoreUI/FUIBatchedArray.h
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import "FUISnapshotArrayDiff.h"
 
diff --git a/FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.m b/FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.m
@@ -20,8 +20,6 @@
 
 #import "FUIFirestoreTableViewDataSource.h"
 
-@import FirebaseFirestore;
-
 @interface FUIFirestoreTableViewDataSource () <FUIBatchedArrayDelegate>
 
 @property (strong, nonatomic, readwrite) UITableViewCell *(^populateCell)
diff --git a/FirebaseFirestoreUI/FUISnapshotArrayDiff.m b/FirebaseFirestoreUI/FUISnapshotArrayDiff.m
@@ -14,9 +14,9 @@
 //  limitations under the License.
 //
 
-#import "FUISnapshotArrayDiff.h"
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
-@import FirebaseFirestore;
+#import "FUISnapshotArrayDiff.h"
 
 @interface FUIArraySlice ()
 
diff --git a/FirebaseGoogleAuthUITests/FirebaseGoogleAuthUITests.m b/FirebaseGoogleAuthUITests/FirebaseGoogleAuthUITests.m
@@ -16,9 +16,8 @@
 
 #import <FirebaseAuth/FirebaseAuth.h>
 #import <FirebaseAuthUI/FUIAuthErrorUtils.h>
-#import <FirebaseAuthUI/FUIAuthUtils.h>
+#import "FUIAuthUtils.h"
 #import <FirebaseAuthUI/FUIAuth.h>
-#import <FirebaseCore/FirebaseCore.h>
 #import <FirebaseGoogleAuthUI/FirebaseGoogleAuthUI.h>
 #import <GoogleSignIn/GoogleSignIn.h>
 #import <OCMock/OCMock.h>
diff --git a/FirebaseTwitterAuthUITests/FirebaseTwitterAuthUITests.m b/FirebaseTwitterAuthUITests/FirebaseTwitterAuthUITests.m
@@ -15,12 +15,12 @@
 //
 
 
+
 #import "FUITwitterAuth.h"
 #import <FirebaseAuth/FirebaseAuth.h>
 #import <FirebaseAuthUI/FUIAuthErrorUtils.h>
-#import <FirebaseAuthUI/FUIAuthUtils.h>
+#import "FUIAuthUtils.h"
 #import <FirebaseAuthUI/FUIAuth.h>
-#import <FirebaseCore/FirebaseCore.h>
 #import <FirebaseTwitterAuthUI/FirebaseTwitterAuthUI.h>
 #import <OCMock/OCMock.h>
 #import <TwitterCore/TwitterCore.h>
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 
 source 'https://rubygems.org'
 
-gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git'
-gem 'cocoapods-core', :git => 'https://github.com/CocoaPods/Core.git'
-gem 'xcodeproj', :git => 'https://github.com/CocoaPods/Xcodeproj.git'
+gem 'cocoapods'
+gem 'cocoapods-core'
+gem 'xcodeproj'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,12 +1,18 @@
-GIT
-  remote: https://github.com/CocoaPods/CocoaPods.git
-  revision: f6a7d53286ccbc4c5e419c33f0eb3dbc320af2be
+GEM
+  remote: https://rubygems.org/
   specs:
-    cocoapods (1.4.0.beta.1)
+    CFPropertyList (2.3.6)
+    activesupport (4.2.10)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    claide (1.0.2)
+    cocoapods (1.4.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.4.0.beta.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
+      cocoapods-core (= 1.4.0)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
       cocoapods-downloader (>= 1.1.3, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
@@ -17,41 +23,15 @@ GIT
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.1)
+      molinillo (~> 0.6.4)
       nap (~> 1.0)
       ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.2, < 2.0)
-
-GIT
-  remote: https://github.com/CocoaPods/Core.git
-  revision: 3efa5e2f0dec56af6fdcfd98822156b65c888ef5
-  specs:
-    cocoapods-core (1.4.0.beta.1)
+      xcodeproj (>= 1.5.4, < 2.0)
+    cocoapods-core (1.4.0)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-
-GIT
-  remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: 0b7414adf9a21efe139eeed9eda4c16eede431fd
-  specs:
-    xcodeproj (1.5.2)
-      CFPropertyList (~> 2.3.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.3.5)
-    activesupport (4.2.10)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    claide (1.0.2)
-    cocoapods-deintegrate (1.0.1)
+    cocoapods-deintegrate (1.0.2)
     cocoapods-downloader (1.1.3)
     cocoapods-plugins (1.0.0)
       nap
@@ -67,25 +47,30 @@ GEM
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.0.3)
-    i18n (0.9.0)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
-    minitest (5.10.3)
-    molinillo (0.6.3)
+    minitest (5.11.3)
+    molinillo (0.6.4)
     nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.11.0)
     ruby-macho (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
+    xcodeproj (1.5.4)
+      CFPropertyList (~> 2.3.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods!
-  cocoapods-core!
-  xcodeproj!
+  cocoapods
+  cocoapods-core
+  xcodeproj
 
 BUNDLED WITH
    1.15.1
