Skip to content

Commit dd539a1

Browse files
committed
Changes to the podspec (2.3 and above), changed header imports from <> to "", changed 8.2 to 7.1, trying to get podspec to lint properly.
1 parent f47b7f0 commit dd539a1

File tree

6 files changed

+27
-16
lines changed

6 files changed

+27
-16
lines changed

FirebaseUI.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
77
s.author = { "Firebase" => "[email protected]" }
88
s.source = { :git => "https://github.com/firebase/FirebaseUI-iOS.git", :tag => 'v0.1.0' }
99
s.source_files = "FirebaseUI/**/*.{h,m}"
10-
s.dependency 'Firebase', '~> 2.2'
10+
s.dependency 'Firebase', '~> 2.3'
1111
s.platform = :ios
1212
s.ios.deployment_target = '7.0'
1313
s.ios.framework = 'UIKit'

FirebaseUI.xcodeproj/project.pbxproj

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
/* End PBXAggregateTarget section */
2323

2424
/* Begin PBXBuildFile section */
25+
D8124F411B72A90C003441AD /* Firebase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8124F401B72A90C003441AD /* Firebase.framework */; };
26+
D8124F421B72B344003441AD /* FirebaseTableViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D8B6ACF11B583C41005CDDB2 /* FirebaseTableViewDataSource.m */; };
27+
D8124F431B72B347003441AD /* FirebaseTableViewDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6ACEE1B583C33005CDDB2 /* FirebaseTableViewDataSource.h */; };
2528
D8784C401B719F280025587E /* FirebaseArrayDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = D8784C3F1B719F280025587E /* FirebaseArrayDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
2629
D8B6ACE51B58383C005CDDB2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8C579BB1B5837DF00899F86 /* UIKit.framework */; };
2730
D8B6ACE71B583877005CDDB2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8B6ACE61B583877005CDDB2 /* Foundation.framework */; };
2831
D8B6ACF31B583C41005CDDB2 /* FirebaseArray.m in Sources */ = {isa = PBXBuildFile; fileRef = D8B6ACEF1B583C41005CDDB2 /* FirebaseArray.m */; };
29-
D8B6ACF51B583C41005CDDB2 /* FirebaseTableViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D8B6ACF11B583C41005CDDB2 /* FirebaseTableViewDataSource.m */; };
3032
D8B6ACF61B583C41005CDDB2 /* FirebaseDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D8B6ACF21B583C41005CDDB2 /* FirebaseDataSource.m */; };
3133
D8B6ACF81B583D3E005CDDB2 /* FirebaseUI.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6ACEB1B583C33005CDDB2 /* FirebaseUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
3234
D8B6ACF91B583D3E005CDDB2 /* FirebaseDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6ACED1B583C33005CDDB2 /* FirebaseDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
33-
D8B6ACFA1B583D3E005CDDB2 /* FirebaseTableViewDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6ACEE1B583C33005CDDB2 /* FirebaseTableViewDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
3435
D8B6ACFB1B583D48005CDDB2 /* FirebaseArray.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6ACEC1B583C33005CDDB2 /* FirebaseArray.h */; settings = {ATTRIBUTES = (Public, ); }; };
35-
D8B6ACFF1B583DBA005CDDB2 /* Firebase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8B6ACFE1B583DBA005CDDB2 /* Firebase.framework */; };
3636
/* End PBXBuildFile section */
3737

3838
/* Begin PBXContainerItemProxy section */
@@ -58,6 +58,7 @@
5858
/* End PBXCopyFilesBuildPhase section */
5959

6060
/* Begin PBXFileReference section */
61+
D8124F401B72A90C003441AD /* Firebase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Firebase.framework; path = sdk/Firebase.framework; sourceTree = "<group>"; };
6162
D8784C3F1B719F280025587E /* FirebaseArrayDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FirebaseArrayDelegate.h; path = API/FirebaseArrayDelegate.h; sourceTree = "<group>"; };
6263
D8B6ACE61B583877005CDDB2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
6364
D8B6ACEB1B583C33005CDDB2 /* FirebaseUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FirebaseUI.h; path = API/FirebaseUI.h; sourceTree = "<group>"; };
@@ -67,7 +68,6 @@
6768
D8B6ACEF1B583C41005CDDB2 /* FirebaseArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirebaseArray.m; path = Implementation/FirebaseArray.m; sourceTree = "<group>"; };
6869
D8B6ACF11B583C41005CDDB2 /* FirebaseTableViewDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirebaseTableViewDataSource.m; path = Implementation/FirebaseTableViewDataSource.m; sourceTree = "<group>"; };
6970
D8B6ACF21B583C41005CDDB2 /* FirebaseDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirebaseDataSource.m; path = Implementation/FirebaseDataSource.m; sourceTree = "<group>"; };
70-
D8B6ACFE1B583DBA005CDDB2 /* Firebase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Firebase.framework; path = sdk/Firebase.framework; sourceTree = "<group>"; };
7171
D8B6AD971B58D45F005CDDB2 /* libc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.dylib"; path = "usr/lib/libc++.dylib"; sourceTree = SDKROOT; };
7272
D8B6AD991B58D486005CDDB2 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
7373
D8B6AD9B1B58D48C005CDDB2 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
@@ -82,9 +82,9 @@
8282
isa = PBXFrameworksBuildPhase;
8383
buildActionMask = 2147483647;
8484
files = (
85-
D8B6ACE71B583877005CDDB2 /* Foundation.framework in Frameworks */,
8685
D8B6ACE51B58383C005CDDB2 /* UIKit.framework in Frameworks */,
87-
D8B6ACFF1B583DBA005CDDB2 /* Firebase.framework in Frameworks */,
86+
D8124F411B72A90C003441AD /* Firebase.framework in Frameworks */,
87+
D8B6ACE71B583877005CDDB2 /* Foundation.framework in Frameworks */,
8888
);
8989
runOnlyForDeploymentPostprocessing = 0;
9090
};
@@ -94,12 +94,12 @@
9494
D8B6ACE81B5839A5005CDDB2 /* Frameworks */ = {
9595
isa = PBXGroup;
9696
children = (
97+
D8124F401B72A90C003441AD /* Firebase.framework */,
9798
D8B6AD9F1B58D49E005CDDB2 /* SystemConfiguration.framework */,
9899
D8B6AD9D1B58D494005CDDB2 /* Security.framework */,
99100
D8B6AD9B1B58D48C005CDDB2 /* CFNetwork.framework */,
100101
D8B6AD991B58D486005CDDB2 /* libicucore.dylib */,
101102
D8B6AD971B58D45F005CDDB2 /* libc++.dylib */,
102-
D8B6ACFE1B583DBA005CDDB2 /* Firebase.framework */,
103103
D8B6ACE61B583877005CDDB2 /* Foundation.framework */,
104104
D8C579BB1B5837DF00899F86 /* UIKit.framework */,
105105
);
@@ -162,10 +162,10 @@
162162
buildActionMask = 2147483647;
163163
files = (
164164
D8B6ACF81B583D3E005CDDB2 /* FirebaseUI.h in Headers */,
165-
D8B6ACFA1B583D3E005CDDB2 /* FirebaseTableViewDataSource.h in Headers */,
166165
D8B6ACF91B583D3E005CDDB2 /* FirebaseDataSource.h in Headers */,
167166
D8784C401B719F280025587E /* FirebaseArrayDelegate.h in Headers */,
168167
D8B6ACFB1B583D48005CDDB2 /* FirebaseArray.h in Headers */,
168+
D8124F431B72B347003441AD /* FirebaseTableViewDataSource.h in Headers */,
169169
);
170170
runOnlyForDeploymentPostprocessing = 0;
171171
};
@@ -197,6 +197,7 @@
197197
D8C5799E1B57349000899F86 /* Project object */ = {
198198
isa = PBXProject;
199199
attributes = {
200+
CLASSPREFIX = FUI;
200201
LastUpgradeCheck = 0700;
201202
ORGANIZATIONNAME = "Firebase, Inc.";
202203
TargetAttributes = {
@@ -264,7 +265,7 @@
264265
files = (
265266
D8B6ACF61B583C41005CDDB2 /* FirebaseDataSource.m in Sources */,
266267
D8B6ACF31B583C41005CDDB2 /* FirebaseArray.m in Sources */,
267-
D8B6ACF51B583C41005CDDB2 /* FirebaseTableViewDataSource.m in Sources */,
268+
D8124F421B72B344003441AD /* FirebaseTableViewDataSource.m in Sources */,
268269
);
269270
runOnlyForDeploymentPostprocessing = 0;
270271
};
@@ -282,13 +283,15 @@
282283
D8B6ADA51B58DCDD005CDDB2 /* Debug */ = {
283284
isa = XCBuildConfiguration;
284285
buildSettings = {
286+
OTHER_LDFLAGS = "-ObjC";
285287
PRODUCT_NAME = "$(TARGET_NAME)";
286288
};
287289
name = Debug;
288290
};
289291
D8B6ADA61B58DCDD005CDDB2 /* Release */ = {
290292
isa = XCBuildConfiguration;
291293
buildSettings = {
294+
OTHER_LDFLAGS = "-ObjC";
292295
PRODUCT_NAME = "$(TARGET_NAME)";
293296
};
294297
name = Release;
@@ -378,8 +381,12 @@
378381
FRAMEWORK_SEARCH_PATHS = (
379382
"$(inherited)",
380383
"$(PROJECT_DIR)/sdk",
384+
"$(DEVELOPER_FRAMEWORKS_DIR)",
385+
"$(SDKROOT)/Developer/Library/Frameworks",
381386
);
382-
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
387+
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
388+
GCC_WARN_PEDANTIC = YES;
389+
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
383390
OTHER_LDFLAGS = "-ObjC";
384391
PRODUCT_NAME = "$(TARGET_NAME)";
385392
PUBLIC_HEADERS_FOLDER_PATH = "include/$(PROJECT_NAME)";
@@ -395,8 +402,12 @@
395402
FRAMEWORK_SEARCH_PATHS = (
396403
"$(inherited)",
397404
"$(PROJECT_DIR)/sdk",
405+
"$(DEVELOPER_FRAMEWORKS_DIR)",
406+
"$(SDKROOT)/Developer/Library/Frameworks",
398407
);
399-
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
408+
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
409+
GCC_WARN_PEDANTIC = YES;
410+
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
400411
OTHER_LDFLAGS = "-ObjC";
401412
PRODUCT_NAME = "$(TARGET_NAME)";
402413
PUBLIC_HEADERS_FOLDER_PATH = "include/$(PROJECT_NAME)";

FirebaseUI/API/FirebaseArray.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#import <Foundation/Foundation.h>
3030

31-
#import <FirebaseUI/FirebaseArrayDelegate.h>
31+
#import "FirebaseArrayDelegate.h"
3232

3333
@class FQuery;
3434
@class Firebase;

FirebaseUI/API/FirebaseDataSource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#import <Foundation/Foundation.h>
3030

31-
#import <FirebaseUI/FirebaseArray.h>
31+
#import "FirebaseArray.h"
3232

3333
@class Firebase;
3434

FirebaseUI/API/FirebaseTableViewDataSource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#import <UIKit/UIKit.h>
3030

31-
#import <FirebaseUI/FirebaseDataSource.h>
31+
#import "FirebaseDataSource.h"
3232

3333
@interface FirebaseTableViewDataSource : FirebaseDataSource <UITableViewDataSource>
3434

FirebaseUI/API/FirebaseUI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#import <FirebaseUI/FirebaseArray.h>
3232
#import <FirebaseUI/FirebaseDataSource.h>
33-
#import <FirebaseUI/FirebaseTableViewDataSource.h>
33+
//#import <FirebaseUI/FirebaseTableViewDataSource.h>
3434

3535
@interface FirebaseUI : NSObject
3636

0 commit comments

Comments
 (0)