Skip to content

Update Dangerfile, Firebase.h, and Firebase.podspec for launch readiness #6127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 12, 2020
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
6 changes: 6 additions & 0 deletions CoreOnly/Sources/Firebase.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@
#import "FirebaseAuth.h"
#endif

#if __has_include(<FirebaseAppDistribution/FirebaseAppDistribution.h>)
#import <FirebaseAppDistribution/FirebaseAppDistribution.h>
#elif __has_include("FirebaseAppDistribution.h")
#import "FirebaseAppDistribution.h"
#endif

#if __has_include(<FirebaseCrashlytics/FirebaseCrashlytics.h>)
#import <FirebaseCrashlytics/FirebaseCrashlytics.h>
#elif __has_include("FirebaseCrashlytics.h")
Expand Down
1 change: 1 addition & 0 deletions CoreOnly/Tests/FirebasePodTest/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ target 'FirebasePodTest' do

pod 'Firebase', :path => '../../../'
pod 'FirebaseABTesting', :path => '../../../'
pod 'FirebaseAppDistribution', :path => '../../../'
pod 'FirebaseAuth', :path => '../../../'
pod 'FirebaseCore', :path => '../../../'
pod 'FirebaseCoreDiagnostics', :path => '../../../'
Expand Down
4 changes: 4 additions & 0 deletions Dangerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ end
def labelsForModifiedFiles()
labels = []
labels.push("api: abtesting") if @has_abtesting_changes
labels.push("api: appdistribution") if @has_appdistribution_changes
labels.push("api: auth") if @has_auth_changes
labels.push("api: core") if @has_core_changes
labels.push("api: crashlytics") if @has_crashlytics_changes
Expand Down Expand Up @@ -72,6 +73,8 @@ has_license_changes = didModify(["LICENSE"])
## Product directories
@has_abtesting_changes = hasChangesIn("FirebaseABTesting/")
@has_abtesting_api_changes = hasChangesIn("FirebaseABTesting/Sources/Public/")
@has_appdistribution_changes = hasChangesIn("FirebaseAppDistribution/")
@has_appdistribution_api_changes = hasChangesIn("FirebaseAppDistribution/Sources/Public")
@has_auth_changes = hasChangesIn("FirebaseAuth")
@has_auth_api_changes = hasChangesIn("FirebaseAuth/Sources/Public/")
@has_core_changes = hasChangesIn([
Expand Down Expand Up @@ -110,6 +113,7 @@ has_license_changes = didModify(["LICENSE"])
# Convenient flag for all API changes.
@has_api_changes = @has_abtesting_api_changes ||
@has_auth_api_changes ||
@has_appdistribution_api_changes ||
@has_core_api_changes ||
@has_crashlytics_api_changes ||
@has_database_api_changes ||
Expand Down
5 changes: 5 additions & 0 deletions Firebase.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ Simplify your app development, grow your user base, and monetize more effectivel
ss.ios.dependency 'Google-Mobile-Ads-SDK', '~> 7.50'
end

s.subspec 'AppDistribution' do |ss|
ss.dependency 'Firebase/CoreOnly'
ss.dependency 'FirebaseAppDistribution', '~> 0.9.0'
end

s.subspec 'Auth' do |ss|
ss.dependency 'Firebase/CoreOnly'
ss.dependency 'FirebaseAuth', '~> 6.8.0'
Expand Down
6 changes: 3 additions & 3 deletions FirebaseAppDistribution.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ iOS SDK for App Distribution for Firebase.
]
s.public_header_files = base_dir + 'Public/*.h'

s.dependency 'FirebaseCore', '~> 6.9'
s.dependency 'FirebaseCore', '~> 6.10'
s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.7'
s.dependency 'GoogleUtilities/UserDefaults', '~> 6.7'
s.dependency 'FirebaseInstallations', '~> 1.5'
s.dependency 'GoogleDataTransport', '~> 7.0'
s.dependency 'FirebaseInstallations', '~> 1.6'
s.dependency 'GoogleDataTransport', '~> 7.2'

s.pod_target_xcconfig = {
'GCC_C_LANGUAGE_STANDARD' => 'c99',
Expand Down
1 change: 1 addition & 0 deletions ZipBuilder/Sources/ZipBuilder/FirebasePods.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ enum FirebasePods: String, CaseIterable {
case abTesting = "FirebaseABTesting"
case adMob = "Google-Mobile-Ads-SDK"
case analytics = "FirebaseAnalytics"
case appdistribution = "FirebaseAppDistribution"
case auth = "FirebaseAuth"
case core = "FirebaseCore"
case crashlytics = "FirebaseCrashlytics"
Expand Down