Skip to content

Commit 5dcc177

Browse files
yramanchukyramanchuk
committed
merge with 0.5.6
2 parents 83ecb08 + 672aaea commit 5dcc177

File tree

12 files changed

+467
-291
lines changed

12 files changed

+467
-291
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ xcode_scheme: FirebaseUI
55

66
rvm: 2.3.1
77
before_install:
8-
- gem uninstall --all --executables cocoapods
8+
- gem uninstall cocoapods -a
99
- gem install cocoapods -v '1.0.1'
1010
- pod install --repo-update
1111

1212
script: xcodebuild -workspace FirebaseUI.xcworkspace
1313
-scheme FirebaseUI
1414
-sdk iphonesimulator
15-
-destination 'platform=iOS Simulator,name=iPhone 6s'
16-
build test
15+
-destination 'platform=iOS Simulator,name=iPhone 7'
16+
build
17+
test
1718
ONLY_ACTIVE_ARCH=YES
1819
CODE_SIGNING_REQUIRED=NO

‎FirebaseStorageUI/UIImageView+FirebaseStorage.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616

1717
@import UIKit;
1818

19-
@import FirebaseStorage;
20-
@import SDWebImage;
19+
#import <FirebaseStorage/FirebaseStorage.h>
20+
#import <SDWebImage/UIImageView+WebCache.h>
21+
#import <SDWebImage/UIImage+MultiFormat.h>
2122

2223
NS_ASSUME_NONNULL_BEGIN
2324

‎FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseStorageUI.xcscheme‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0800"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
18+
BuildableName = "FirebaseStorageUI.framework"
19+
BlueprintName = "FirebaseStorageUI"
20+
ReferencedContainer = "container:FirebaseUI.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "8D9084351D9316AB00333CC8"
36+
BuildableName = "FirebaseStorageUITests.xctest"
37+
BlueprintName = "FirebaseStorageUITests"
38+
ReferencedContainer = "container:FirebaseUI.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
46+
BuildableName = "FirebaseStorageUI.framework"
47+
BlueprintName = "FirebaseStorageUI"
48+
ReferencedContainer = "container:FirebaseUI.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
53+
</TestAction>
54+
<LaunchAction
55+
buildConfiguration = "Debug"
56+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
57+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
launchStyle = "0"
59+
useCustomWorkingDirectory = "NO"
60+
ignoresPersistentStateOnLaunch = "NO"
61+
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
63+
allowLocationSimulation = "YES">
64+
<MacroExpansion>
65+
<BuildableReference
66+
BuildableIdentifier = "primary"
67+
BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
68+
BuildableName = "FirebaseStorageUI.framework"
69+
BlueprintName = "FirebaseStorageUI"
70+
ReferencedContainer = "container:FirebaseUI.xcodeproj">
71+
</BuildableReference>
72+
</MacroExpansion>
73+
<AdditionalOptions>
74+
</AdditionalOptions>
75+
</LaunchAction>
76+
<ProfileAction
77+
buildConfiguration = "Release"
78+
shouldUseLaunchSchemeArgsEnv = "YES"
79+
savedToolIdentifier = ""
80+
useCustomWorkingDirectory = "NO"
81+
debugDocumentVersioning = "YES">
82+
<MacroExpansion>
83+
<BuildableReference
84+
BuildableIdentifier = "primary"
85+
BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
86+
BuildableName = "FirebaseStorageUI.framework"
87+
BlueprintName = "FirebaseStorageUI"
88+
ReferencedContainer = "container:FirebaseUI.xcodeproj">
89+
</BuildableReference>
90+
</MacroExpansion>
91+
</ProfileAction>
92+
<AnalyzeAction
93+
buildConfiguration = "Debug">
94+
</AnalyzeAction>
95+
<ArchiveAction
96+
buildConfiguration = "Release"
97+
revealArchiveInOrganizer = "YES">
98+
</ArchiveAction>
99+
</Scheme>

‎FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseTwitterAuthUI.xcscheme‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0730"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
18+
BuildableName = "FirebaseTwitterAuthUI.framework"
19+
BlueprintName = "FirebaseTwitterAuthUI"
20+
ReferencedContainer = "container:FirebaseUI.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "C325169A1D88A54C00B0B3F9"
36+
BuildableName = "FirebaseTwitterAuthUITests.xctest"
37+
BlueprintName = "FirebaseTwitterAuthUITests"
38+
ReferencedContainer = "container:FirebaseUI.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
46+
BuildableName = "FirebaseTwitterAuthUI.framework"
47+
BlueprintName = "FirebaseTwitterAuthUI"
48+
ReferencedContainer = "container:FirebaseUI.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
53+
</TestAction>
54+
<LaunchAction
55+
buildConfiguration = "Debug"
56+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
57+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
launchStyle = "0"
59+
useCustomWorkingDirectory = "NO"
60+
ignoresPersistentStateOnLaunch = "NO"
61+
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
63+
allowLocationSimulation = "YES">
64+
<MacroExpansion>
65+
<BuildableReference
66+
BuildableIdentifier = "primary"
67+
BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
68+
BuildableName = "FirebaseTwitterAuthUI.framework"
69+
BlueprintName = "FirebaseTwitterAuthUI"
70+
ReferencedContainer = "container:FirebaseUI.xcodeproj">
71+
</BuildableReference>
72+
</MacroExpansion>
73+
<AdditionalOptions>
74+
</AdditionalOptions>
75+
</LaunchAction>
76+
<ProfileAction
77+
buildConfiguration = "Release"
78+
shouldUseLaunchSchemeArgsEnv = "YES"
79+
savedToolIdentifier = ""
80+
useCustomWorkingDirectory = "NO"
81+
debugDocumentVersioning = "YES">
82+
<MacroExpansion>
83+
<BuildableReference
84+
BuildableIdentifier = "primary"
85+
BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
86+
BuildableName = "FirebaseTwitterAuthUI.framework"
87+
BlueprintName = "FirebaseTwitterAuthUI"
88+
ReferencedContainer = "container:FirebaseUI.xcodeproj">
89+
</BuildableReference>
90+
</MacroExpansion>
91+
</ProfileAction>
92+
<AnalyzeAction
93+
buildConfiguration = "Debug">
94+
</AnalyzeAction>
95+
<ArchiveAction
96+
buildConfiguration = "Release"
97+
revealArchiveInOrganizer = "YES">
98+
</ArchiveAction>
99+
</Scheme>

‎FirebaseUI_dev_storage.podspec‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Pod::Spec.new do |s|
2+
s.name = 'FirebaseStorageUI'
3+
s.version = '0.5.6-rc3'
4+
s.summary = 'UI Storage library for Firebase.'
5+
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
6+
s.license = { :type => 'Apache 2.0' }
7+
s.author = 'Firebase'
8+
s.source = { :git => "../../FirebaseUI-iOS.git" }
9+
s.platform = :ios
10+
s.ios.deployment_target = '8.0'
11+
s.ios.framework = 'UIKit'
12+
s.requires_arc = true
13+
s.default_subspecs = 'Storage'
14+
15+
s.subspec 'Storage' do |storage|
16+
storage.source_files = "FirebaseStorageUI/*.{h,m}"
17+
storage.dependency 'Firebase/Storage', '~> 3.0'
18+
storage.dependency 'SDWebImage'
19+
end
20+
end

0 commit comments

Comments
 (0)