Skip to content

Commit ed65a1b

Browse files
morganchen12morganchen12
committed
Make module imports not required
1 parent 917dd17 commit ed65a1b

File tree

148 files changed

+286
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+286
-208
lines changed

‎FirebaseAnonymousAuthUI.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
1717
}
1818

19-
s.public_header_files = 'FirebaseAnonymousAuthUI/Sources/Public/*.h'
19+
s.public_header_files = 'FirebaseAnonymousAuthUI/Sources/Public/FirebaseAnonymousAuthUI/*.h'
2020
s.source_files = 'FirebaseAnonymousAuthUI/Sources/**/*.{h,m}'
2121
s.dependency 'FirebaseAuthUI'
2222
s.resource_bundle = {

‎FirebaseAnonymousAuthUI/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -65,8 +65,7 @@
6565
8D55F14B261E5BAC0020DFB0 /* Public */ = {
6666
isa = PBXGroup;
6767
children = (
68-
8D69E22021DD476D00CFA49B /* FirebaseAnonymousAuthUI.h */,
69-
8D69E23821DD47B400CFA49B /* FUIAnonymousAuth.h */,
68+
8DAB9B46263768C300FF271F /* FirebaseAnonymousAuthUI */,
7069
);
7170
path = Public;
7271
sourceTree = "<group>";
@@ -129,6 +128,15 @@
129128
path = Strings;
130129
sourceTree = "<group>";
131130
};
131+
8DAB9B46263768C300FF271F /* FirebaseAnonymousAuthUI */ = {
132+
isa = PBXGroup;
133+
children = (
134+
8D69E22021DD476D00CFA49B /* FirebaseAnonymousAuthUI.h */,
135+
8D69E23821DD47B400CFA49B /* FUIAnonymousAuth.h */,
136+
);
137+
path = FirebaseAnonymousAuthUI;
138+
sourceTree = "<group>";
139+
};
132140
BEF4805F13BABCBDD925C264 /* Pods */ = {
133141
isa = PBXGroup;
134142
children = (

‎FirebaseAnonymousAuthUI/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ EXTERNAL SOURCES:
7575
SPEC CHECKSUMS:
7676
Firebase: c121feb35e4126c0b355e3313fa9b487d47319fd
7777
FirebaseAuth: 5fe4585c2ed847319f0ea68bd1d82c77e49ff9a0
78-
FirebaseAuthUI: 0364632d70a90e0b42fc1cce0435d375219fdddb
78+
FirebaseAuthUI: b3511544eeec97b719aeda7ccd779f7f0ff086d3
7979
FirebaseCore: 907447d8917a4d3eb0cce2829c5a0ad21d90b432
8080
FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
8181
GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7

‎FirebaseAnonymousAuthUI/Sources/FUIAnonymousAuth.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
// limitations under the License.
1515
//
1616

17-
@import FirebaseAuthUI;
17+
#import <FirebaseAuthUI/FirebaseAuthUI.h>
1818

19-
#import "FirebaseAnonymousAuthUI/Sources/Public/FUIAnonymousAuth.h"
19+
#import "FirebaseAnonymousAuthUI/Sources/Public/FirebaseAnonymousAuthUI/FUIAnonymousAuth.h"
2020

2121
/** @var kTableName
2222
@brief The name of the strings table to search for localized strings.

‎FirebaseAnonymousAuthUI/Sources/Public/FUIAnonymousAuth.h‎ renamed to ‎FirebaseAnonymousAuthUI/Sources/Public/FirebaseAnonymousAuthUI/FUIAnonymousAuth.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// limitations under the License.
1515
//
1616

17-
@import FirebaseAuthUI;
17+
#import <FirebaseAuthUI/FirebaseAuthUI.h>
1818

1919
NS_ASSUME_NONNULL_BEGIN
2020

‎FirebaseAnonymousAuthUI/Sources/Public/FirebaseAnonymousAuthUI.h‎ renamed to ‎FirebaseAnonymousAuthUI/Sources/Public/FirebaseAnonymousAuthUI/FirebaseAnonymousAuthUI.h‎

File renamed without changes.

‎FirebaseAuthUI.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
1717
}
1818

19-
s.public_header_files = 'FirebaseAuthUI/Sources/Public/*.h'
19+
s.public_header_files = 'FirebaseAuthUI/Sources/Public/FirebaseAuthUI/*.h'
2020
s.source_files = 'FirebaseAuthUI/Sources/**/*.{h,m}'
2121
s.dependency 'Firebase/Auth', '>= 7.2.0'
2222
s.dependency 'GoogleUtilities/UserDefaults'

‎FirebaseAuthUI/FirebaseAuthUI.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -268,22 +268,7 @@
268268
8D55F14E261E5F3F0020DFB0 /* Public */ = {
269269
isa = PBXGroup;
270270
children = (
271-
8D69E25C21DD4BD000CFA49B /* FirebaseAuthUI.h */,
272-
8D69E2BD21DD4C5D00CFA49B /* FUIAccountSettingsOperationType.h */,
273-
8D69E2C021DD4C5D00CFA49B /* FUIAccountSettingsViewController.h */,
274-
8D69E27D21DD4C5000CFA49B /* FUIAuth_Internal.h */,
275-
8D69E27F21DD4C5000CFA49B /* FUIAuth.h */,
276-
8D69E28A21DD4C5100CFA49B /* FUIAuthBaseViewController_Internal.h */,
277-
8D69E29021DD4C5100CFA49B /* FUIAuthBaseViewController.h */,
278-
8D69E27621DD4C5000CFA49B /* FUIAuthErrors.h */,
279-
8D69E27721DD4C5000CFA49B /* FUIAuthErrorUtils.h */,
280-
8D69E27E21DD4C5000CFA49B /* FUIAuthPickerViewController.h */,
281-
8D69E29121DD4C5100CFA49B /* FUIAuthProvider.h */,
282-
8D69E27521DD4C5000CFA49B /* FUIAuthStrings.h */,
283-
8D69E27821DD4C5000CFA49B /* FUIAuthTableHeaderView.h */,
284-
8D69E28B21DD4C5100CFA49B /* FUIAuthTableViewCell.h */,
285-
8D69E27A21DD4C5000CFA49B /* FUIAuthUtils.h */,
286-
8D69E28921DD4C5100CFA49B /* FUIPrivacyAndTermsOfServiceView.h */,
271+
8DAB9B49263768D900FF271F /* FirebaseAuthUI */,
287272
);
288273
path = Public;
289274
sourceTree = "<group>";
@@ -392,6 +377,29 @@
392377
path = Strings;
393378
sourceTree = "<group>";
394379
};
380+
8DAB9B49263768D900FF271F /* FirebaseAuthUI */ = {
381+
isa = PBXGroup;
382+
children = (
383+
8D69E25C21DD4BD000CFA49B /* FirebaseAuthUI.h */,
384+
8D69E2BD21DD4C5D00CFA49B /* FUIAccountSettingsOperationType.h */,
385+
8D69E2C021DD4C5D00CFA49B /* FUIAccountSettingsViewController.h */,
386+
8D69E27D21DD4C5000CFA49B /* FUIAuth_Internal.h */,
387+
8D69E27F21DD4C5000CFA49B /* FUIAuth.h */,
388+
8D69E28A21DD4C5100CFA49B /* FUIAuthBaseViewController_Internal.h */,
389+
8D69E29021DD4C5100CFA49B /* FUIAuthBaseViewController.h */,
390+
8D69E27621DD4C5000CFA49B /* FUIAuthErrors.h */,
391+
8D69E27721DD4C5000CFA49B /* FUIAuthErrorUtils.h */,
392+
8D69E27E21DD4C5000CFA49B /* FUIAuthPickerViewController.h */,
393+
8D69E29121DD4C5100CFA49B /* FUIAuthProvider.h */,
394+
8D69E27521DD4C5000CFA49B /* FUIAuthStrings.h */,
395+
8D69E27821DD4C5000CFA49B /* FUIAuthTableHeaderView.h */,
396+
8D69E28B21DD4C5100CFA49B /* FUIAuthTableViewCell.h */,
397+
8D69E27A21DD4C5000CFA49B /* FUIAuthUtils.h */,
398+
8D69E28921DD4C5100CFA49B /* FUIPrivacyAndTermsOfServiceView.h */,
399+
);
400+
path = FirebaseAuthUI;
401+
sourceTree = "<group>";
402+
};
395403
ACF63AA832F9F7882BC43A9D /* Pods */ = {
396404
isa = PBXGroup;
397405
children = (

‎FirebaseAuthUI/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ instance can be accessed as follows:
6363

6464
```swift
6565
// Swift
66-
import FirebaseUI
66+
import FirebaseAuthUI
6767

6868
/* ... */
6969

@@ -75,7 +75,7 @@ authUI?.delegate = self
7575

7676
```objective-c
7777
// Objective-C
78-
@import FirebaseUI;
78+
@import FirebaseAuthUI;
7979

8080
/* ... */
8181

@@ -89,7 +89,7 @@ This instance can then be configured with the providers you wish to support:
8989

9090
```swift
9191
// Swift
92-
import FirebaseUI
92+
import FirebaseAuthUI
9393

9494
/* ... */
9595

@@ -109,7 +109,7 @@ authUI?.providers = providers
109109

110110
```objective-c
111111
// Objective-C
112-
@import FirebaseUI;
112+
@import FirebaseAuthUI;
113113

114114
/* ... */
115115

‎FirebaseAuthUI/Sources/FUIAccountSettingsOperation.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#import "FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdateEmail.h"
2424
#import "FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdateName.h"
2525
#import "FirebaseAuthUI/Sources/FUIAccountSettingsOperationUpdatePassword.h"
26-
#import "FirebaseAuthUI/Sources/Public/FUIAuthBaseViewController_Internal.h"
27-
#import "FirebaseAuthUI/Sources/Public/FUIAuthErrorUtils.h"
28-
#import "FirebaseAuthUI/Sources/Public/FUIAuth_Internal.h"
26+
#import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h"
27+
#import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthErrorUtils.h"
28+
#import "FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuth_Internal.h"
2929

3030
NS_ASSUME_NONNULL_BEGIN
3131

0 commit comments

Comments
 (0)