Skip to content

Commit 50b7f9d

Browse files
committed
fix duplicate FirebaseAnalytics in auth binary
1 parent 1ecd62f commit 50b7f9d

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

FirebaseUI.podspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'FirebaseUI'
3-
s.version = '0.5.1'
3+
s.version = '0.5.2'
44
s.summary = 'UI binding libraries for Firebase.'
55
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
66
s.license = { :type => 'Apache 2.0', :file => 'FirebaseUIFrameworks/LICENSE' }
@@ -16,6 +16,8 @@ Pod::Spec.new do |s|
1616
s.subspec 'All' do |all|
1717
all.dependency 'FirebaseUI/Database'
1818
all.dependency 'FirebaseUI/Auth'
19+
all.dependency 'FirebaseUI/Facebook'
20+
all.dependency 'FirebaseUI/Google'
1921
end
2022

2123
s.subspec 'Database' do |database|
@@ -27,7 +29,6 @@ Pod::Spec.new do |s|
2729
auth.source_files = 'FirebaseAuthUI/*.{h,m}'
2830
auth.resource_bundles = { 'FirebaseAuthUIBundle' => [ 'FirebaseAuthUI/Resources/*', 'FirebaseAuthUI/*.xib', 'FirebaseAuthUI/Strings/**/*.strings' ] }
2931
auth.dependency 'Firebase/Auth'
30-
auth.dependency 'Firebase/Analytics'
3132
end
3233

3334
s.subspec 'Facebook' do |facebook|

build.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ struct Build {
7474
params.append(value)
7575
}
7676
}
77+
// hard code bitcode so cocoapods dummy
78+
// files are built with bitcode, hope for
79+
// no consequences later
80+
params.append("BITCODE_GENERATION_MODE=bitcode")
7781
return params
7882
}
7983

samples/swift/uidemo.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333

3434
/* Begin PBXFileReference section */
3535
574F1B121D8106D2001924BB /* UIStoryboardExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIStoryboardExtension.swift; sourceTree = "<group>"; };
36-
1004D218CE11AF7D8D57EC06 /* Pods-uidemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-uidemoTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-uidemoTests/Pods-uidemoTests.debug.xcconfig"; sourceTree = "<group>"; };
37-
307AA4B2A6A2B54E7A0E3405 /* Pods_uidemoTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_uidemoTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
38-
49D4095176DE050264EC1BDB /* Pods_uidemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_uidemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
39-
646EBF2B9F0A806D044E63F4 /* Pods-uidemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-uidemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-uidemo/Pods-uidemo.release.xcconfig"; sourceTree = "<group>"; };
4036
8D16073D1D492B200069E4F5 /* AuthViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthViewController.swift; sourceTree = "<group>"; };
4137
8DABC9851D3D82D600453807 /* uidemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = uidemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
4238
8DABC9881D3D82D600453807 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };

0 commit comments

Comments
 (0)