Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ xcode_scheme: FirebaseUI

rvm: 2.3.1
before_install:
- gem uninstall cocoapods -a
- gem install cocoapods -v '1.0.1'
- pod install --repo-update

script: xcodebuild -workspace FirebaseUI.xcworkspace
-scheme FirebaseUI
-sdk iphonesimulator
-destination 'platform=iOS Simulator,name=iPhone 6s'
-destination 'platform=iOS Simulator,name=iPhone 7'
build
test
ONLY_ACTIVE_ARCH=YES
CODE_SIGNING_REQUIRED=NO
5 changes: 3 additions & 2 deletions FirebaseStorageUI/UIImageView+FirebaseStorage.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@

@import UIKit;

@import FirebaseStorage;
@import SDWebImage;
#import <FirebaseStorage/FirebaseStorage.h>
#import <SDWebImage/UIImageView+WebCache.h>
#import <SDWebImage/UIImage+MultiFormat.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 2 additions & 0 deletions FirebaseUI.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6442,6 +6442,7 @@ fi
<string>"${PODS_ROOT}/GoogleSignIn/Frameworks"</string>
<string>"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks"</string>
<string>"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks"</string>
<string>"${PODS_ROOT}/FirebaseCore/Frameworks/frameworks"</string>
</array>
<key>INFOPLIST_FILE</key>
<string>FirebaseGoogleAuthUI/Info.plist</string>
Expand Down Expand Up @@ -6486,6 +6487,7 @@ fi
<string>"${PODS_ROOT}/GoogleSignIn/Frameworks"</string>
<string>"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks"</string>
<string>"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks"</string>
<string>"${PODS_ROOT}/FirebaseCore/Frameworks/frameworks"</string>
</array>
<key>INFOPLIST_FILE</key>
<string>FirebaseGoogleAuthUI/Info.plist</string>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
BuildableName = "FirebaseStorageUI.framework"
BlueprintName = "FirebaseStorageUI"
ReferencedContainer = "container:FirebaseUI.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8D9084351D9316AB00333CC8"
BuildableName = "FirebaseStorageUITests.xctest"
BlueprintName = "FirebaseStorageUITests"
ReferencedContainer = "container:FirebaseUI.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
BuildableName = "FirebaseStorageUI.framework"
BlueprintName = "FirebaseStorageUI"
ReferencedContainer = "container:FirebaseUI.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
BuildableName = "FirebaseStorageUI.framework"
BlueprintName = "FirebaseStorageUI"
ReferencedContainer = "container:FirebaseUI.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
BuildableName = "FirebaseStorageUI.framework"
BlueprintName = "FirebaseStorageUI"
ReferencedContainer = "container:FirebaseUI.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
BuildableName = "FirebaseTwitterAuthUI.framework"
BlueprintName = "FirebaseTwitterAuthUI"
ReferencedContainer = "container:FirebaseUI.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C325169A1D88A54C00B0B3F9"
BuildableName = "FirebaseTwitterAuthUITests.xctest"
BlueprintName = "FirebaseTwitterAuthUITests"
ReferencedContainer = "container:FirebaseUI.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
BuildableName = "FirebaseTwitterAuthUI.framework"
BlueprintName = "FirebaseTwitterAuthUI"
ReferencedContainer = "container:FirebaseUI.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
BuildableName = "FirebaseTwitterAuthUI.framework"
BlueprintName = "FirebaseTwitterAuthUI"
ReferencedContainer = "container:FirebaseUI.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
BuildableName = "FirebaseTwitterAuthUI.framework"
BlueprintName = "FirebaseTwitterAuthUI"
ReferencedContainer = "container:FirebaseUI.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand Down
20 changes: 20 additions & 0 deletions FirebaseUI_dev_storage.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Pod::Spec.new do |s|
s.name = 'FirebaseStorageUI'
s.version = '0.5.6-rc3'
s.summary = 'UI Storage library for Firebase.'
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
s.license = { :type => 'Apache 2.0' }
s.author = 'Firebase'
s.source = { :git => "../../FirebaseUI-iOS.git" }
s.platform = :ios
s.ios.deployment_target = '8.0'
s.ios.framework = 'UIKit'
s.requires_arc = true
s.default_subspecs = 'Storage'

s.subspec 'Storage' do |storage|
storage.source_files = "FirebaseStorageUI/*.{h,m}"
storage.dependency 'Firebase/Storage', '~> 3.0'
storage.dependency 'SDWebImage'
end
end
2 changes: 0 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ end
target 'FirebaseAuthUI' do
# Pods for Auth
pod 'Firebase/Auth'
pod 'Firebase/Core'

target 'FirebaseAuthUITests' do
inherit! :search_paths
Expand All @@ -45,7 +44,6 @@ end
target 'FirebaseGoogleAuthUI' do
# Pods for Google Auth
pod 'GoogleSignIn', '~> 4.0'
pod 'Firebase/Core'

target 'FirebaseGoogleAuthUITests' do
inherit! :search_paths
Expand Down
Loading