Skip to content

Commit 65afb8d

Browse files
morganchen12morganchen12
authored
Merge pull request #942 from firebase/pb-spm
Add Swift Package Manager support
2 parents 21505be + ed65a1b commit 65afb8d

File tree

648 files changed

+1689
-1144
lines changed

Some content is hidden

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

648 files changed

+1689
-1144
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ DerivedData
1616
*.hmap
1717
*.ipa
1818
*.xcuserstate
19-
*/*/xcshareddata/**
2019

2120
# Third Party
2221
/sdk

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
osx_image: xcode11.3
1+
osx_image: xcode12.4
22
language: objective-c
33
xcode_workspace: FirebaseUI.xcworkspace
44
xcode_scheme: FirebaseUI
55

6-
rvm: 2.6.4
6+
rvm: 2.6.6
77
before_install:
88
- gem update cocoapods
99
- gem install bundler

‎AnonymousAuth/Podfile.lock‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎EmailAuth/Podfile.lock‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎FirebaseAnonymousAuthUI.podspec‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Pod::Spec.new do |s|
2+
s.name = 'FirebaseAnonymousAuthUI'
3+
s.version = '11.0.0'
4+
s.summary = 'Provides anonymous auth support for FirebaseAuthUI.'
5+
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
6+
s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
7+
s.source = { :git => 'https://github.com/firebase/FirebaseUI-iOS.git', :tag => 'v' + s.version.to_s}
8+
s.author = 'Firebase'
9+
s.platform = :ios
10+
s.ios.deployment_target = '10.0'
11+
s.ios.framework = 'UIKit'
12+
s.static_framework = true
13+
s.requires_arc = true
14+
s.cocoapods_version = '>= 1.8.0'
15+
s.pod_target_xcconfig = {
16+
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
17+
}
18+
19+
s.public_header_files = 'FirebaseAnonymousAuthUI/Sources/Public/FirebaseAnonymousAuthUI/*.h'
20+
s.source_files = 'FirebaseAnonymousAuthUI/Sources/**/*.{h,m}'
21+
s.dependency 'FirebaseAuthUI'
22+
s.resource_bundle = {
23+
'FirebaseAnonymousAuthUI' => [
24+
'FirebaseAnonymousAuthUI/Sources/{Resources,Strings}/*.{png,lproj}'
25+
]
26+
}
27+
end

‎AnonymousAuth/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj‎ renamed to ‎FirebaseAnonymousAuthUI/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 10 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 */
@@ -62,10 +62,18 @@
6262
/* End PBXFrameworksBuildPhase section */
6363

6464
/* Begin PBXGroup section */
65+
8D55F14B261E5BAC0020DFB0 /* Public */ = {
66+
isa = PBXGroup;
67+
children = (
68+
8DAB9B46263768C300FF271F /* FirebaseAnonymousAuthUI */,
69+
);
70+
path = Public;
71+
sourceTree = "<group>";
72+
};
6573
8D69E21321DD476C00CFA49B = {
6674
isa = PBXGroup;
6775
children = (
68-
8D69E21F21DD476C00CFA49B /* FirebaseAnonymousAuthUI */,
76+
8D69E21F21DD476C00CFA49B /* Sources */,
6977
8D69E22A21DD476D00CFA49B /* FirebaseAnonymousAuthUITests */,
7078
8D69E21E21DD476C00CFA49B /* Products */,
7179
BEF4805F13BABCBDD925C264 /* Pods */,
@@ -81,17 +89,16 @@
8189
name = Products;
8290
sourceTree = "<group>";
8391
};
84-
8D69E21F21DD476C00CFA49B /* FirebaseAnonymousAuthUI */ = {
92+
8D69E21F21DD476C00CFA49B /* Sources */ = {
8593
isa = PBXGroup;
8694
children = (
87-
8D69E22021DD476D00CFA49B /* FirebaseAnonymousAuthUI.h */,
88-
8D69E23821DD47B400CFA49B /* FUIAnonymousAuth.h */,
95+
8D55F14B261E5BAC0020DFB0 /* Public */,
8996
8D69E23721DD47B400CFA49B /* FUIAnonymousAuth.m */,
9097
8D69E22121DD476D00CFA49B /* Info.plist */,
9198
8D69E34C21DD5C4700CFA49B /* Resources */,
9299
8D69E35021DD5C4700CFA49B /* Strings */,
93100
);
94-
path = FirebaseAnonymousAuthUI;
101+
path = Sources;
95102
sourceTree = "<group>";
96103
};
97104
8D69E22A21DD476D00CFA49B /* FirebaseAnonymousAuthUITests */ = {
@@ -121,6 +128,15 @@
121128
path = Strings;
122129
sourceTree = "<group>";
123130
};
131+
8DAB9B46263768C300FF271F /* FirebaseAnonymousAuthUI */ = {
132+
isa = PBXGroup;
133+
children = (
134+
8D69E22021DD476D00CFA49B /* FirebaseAnonymousAuthUI.h */,
135+
8D69E23821DD47B400CFA49B /* FUIAnonymousAuth.h */,
136+
);
137+
path = FirebaseAnonymousAuthUI;
138+
sourceTree = "<group>";
139+
};
124140
BEF4805F13BABCBDD925C264 /* Pods */ = {
125141
isa = PBXGroup;
126142
children = (
@@ -326,6 +342,7 @@
326342
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
327343
GCC_WARN_UNUSED_FUNCTION = YES;
328344
GCC_WARN_UNUSED_VARIABLE = YES;
345+
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../\"";
329346
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
330347
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
331348
MTL_FAST_MATH = YES;
@@ -382,6 +399,7 @@
382399
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
383400
GCC_WARN_UNUSED_FUNCTION = YES;
384401
GCC_WARN_UNUSED_VARIABLE = YES;
402+
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../\"";
385403
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
386404
MTL_ENABLE_DEBUG_INFO = NO;
387405
MTL_FAST_MATH = YES;
@@ -401,7 +419,7 @@
401419
DYLIB_COMPATIBILITY_VERSION = 1;
402420
DYLIB_CURRENT_VERSION = 1;
403421
DYLIB_INSTALL_NAME_BASE = "@rpath";
404-
INFOPLIST_FILE = FirebaseAnonymousAuthUI/Info.plist;
422+
INFOPLIST_FILE = Sources/Info.plist;
405423
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
406424
LD_RUNPATH_SEARCH_PATHS = (
407425
"$(inherited)",
@@ -424,7 +442,7 @@
424442
DYLIB_COMPATIBILITY_VERSION = 1;
425443
DYLIB_CURRENT_VERSION = 1;
426444
DYLIB_INSTALL_NAME_BASE = "@rpath";
427-
INFOPLIST_FILE = FirebaseAnonymousAuthUI/Info.plist;
445+
INFOPLIST_FILE = Sources/Info.plist;
428446
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
429447
LD_RUNPATH_SEARCH_PATHS = (
430448
"$(inherited)",
@@ -442,7 +460,7 @@
442460
isa = XCBuildConfiguration;
443461
buildSettings = {
444462
CODE_SIGN_STYLE = Automatic;
445-
INFOPLIST_FILE = FirebaseAnonymousAuthUITests/Info.plist;
463+
INFOPLIST_FILE = Sources/Info.plist;
446464
LD_RUNPATH_SEARCH_PATHS = (
447465
"$(inherited)",
448466
"@executable_path/Frameworks",
@@ -478,7 +496,7 @@
478496
isa = XCBuildConfiguration;
479497
buildSettings = {
480498
CODE_SIGN_STYLE = Automatic;
481-
INFOPLIST_FILE = FirebaseAnonymousAuthUITests/Info.plist;
499+
INFOPLIST_FILE = Sources/Info.plist;
482500
LD_RUNPATH_SEARCH_PATHS = (
483501
"$(inherited)",
484502
"@executable_path/Frameworks",

‎AnonymousAuth/FirebaseAnonymousAuthUI.xcodeproj/xcshareddata/xcschemes/FirebaseAnonymousAuthUI.xcscheme‎ renamed to ‎FirebaseAnonymousAuthUI/FirebaseAnonymousAuthUI.xcodeproj/xcshareddata/xcschemes/FirebaseAnonymousAuthUI.xcscheme‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "8D69E21C21DD476C00CFA49B"
35+
BuildableName = "FirebaseAnonymousAuthUI.framework"
36+
BlueprintName = "FirebaseAnonymousAuthUI"
37+
ReferencedContainer = "container:FirebaseAnonymousAuthUI.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "8D69E21C21DD476C00CFA49B"
47-
BuildableName = "FirebaseAnonymousAuthUI.framework"
48-
BlueprintName = "FirebaseAnonymousAuthUI"
49-
ReferencedContainer = "container:FirebaseAnonymousAuthUI.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:FirebaseAnonymousAuthUI.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

0 commit comments

Comments
 (0)