Skip to content

Update android and ios versions for M102 #617

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.

Sign up for GitHub

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 1 commit into from
Aug 24, 2021
Merged

Update android and ios versions for M102 #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions Android/firebase_dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import org.gradle.util.ConfigureUtil;

// A map of library to the dependencies that need to be added for it.
def firebaseDependenciesMap = [
'app' : ['com.google.firebase:firebase-analytics:19.0.0'],
'app' : ['com.google.firebase:firebase-analytics:19.0.1'],
'admob' : ['com.google.firebase:firebase-ads:19.8.0',
'com.google.firebase:firebase-analytics:19.0.0',
'com.google.firebase:firebase-analytics:19.0.1',
'com.google.android.gms:play-services-base:17.6.0'],
'analytics' : ['com.google.firebase:firebase-analytics:19.0.0',
'analytics' : ['com.google.firebase:firebase-analytics:19.0.1',
'com.google.android.gms:play-services-base:17.6.0'],
'auth' : ['com.google.firebase:firebase-auth:21.0.1'],
'database' : ['com.google.firebase:firebase-database:20.0.1'],
Expand Down
2 changes: 1 addition & 1 deletion admob/admob_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

dependencies {
implementation 'com.google.firebase:firebase-analytics:19.0.0'
implementation 'com.google.firebase:firebase-analytics:19.0.1'
implementation 'com.google.firebase:firebase-ads:19.8.0'
}

Expand Down
2 changes: 1 addition & 1 deletion admob/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ platform :ios, '10.0'
# Firebase AdMob test application.

target 'integration_test' do
pod 'Firebase/Analytics', '8.5.0'
pod 'Firebase/Analytics', '8.6.0'
pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk'
end

Expand Down
2 changes: 1 addition & 1 deletion analytics/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '10.0'
# Firebase Analytics test application.

target 'integration_test' do
pod 'Firebase/Analytics', '8.5.0'
pod 'Firebase/Analytics', '8.6.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion app/app_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ android {
}

dependencies {
implementation 'com.google.firebase:firebase-analytics:19.0.0'
implementation 'com.google.firebase:firebase-analytics:19.0.1'
}

afterEvaluate {
Expand Down
2 changes: 1 addition & 1 deletion app/google_api_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
}

dependencies {
implementation 'com.google.firebase:firebase-analytics:19.0.0'
implementation 'com.google.firebase:firebase-analytics:19.0.1'
implementation 'com.google.android.gms:play-services-base:17.6.0'
implementation project(':app:app_resources')
}
Expand Down
2 changes: 1 addition & 1 deletion app/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '10.0'
# Firebase App test application.

target 'integration_test' do
pod 'Firebase/Analytics', '8.5.0'
pod 'Firebase/Analytics', '8.6.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion app/invites_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
}

dependencies {
implementation 'com.google.firebase:firebase-analytics:19.0.0'
implementation 'com.google.firebase:firebase-analytics:19.0.1'
implementation 'com.google.firebase:firebase-dynamic-links:20.1.1'
implementation project(':app:app_resources')
}
Expand Down
2 changes: 1 addition & 1 deletion auth/auth_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
}

dependencies {
implementation 'com.google.firebase:firebase-analytics:19.0.0'
implementation 'com.google.firebase:firebase-analytics:19.0.1'
implementation 'com.google.firebase:firebase-auth:21.0.1'
implementation project(':app:app_resources')
}
Expand Down
4 changes: 2 additions & 2 deletions auth/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ source 'https://github.com/CocoaPods/Specs.git'

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Auth', '8.5.0'
pod 'Firebase/Auth', '8.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '10.0'
pod 'Firebase/Auth', '8.5.0'
pod 'Firebase/Auth', '8.6.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/firestore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if(TARGET firestore)
return()
endif()

set(version CocoaPods-8.5.0)
set(version CocoaPods-8.6.0)
ExternalProject_Add(
firestore

Expand Down
2 changes: 1 addition & 1 deletion database/database_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

dependencies {
implementation 'com.google.firebase:firebase-analytics:19.0.0'
implementation 'com.google.firebase:firebase-analytics:19.0.1'
implementation 'com.google.firebase:firebase-database:20.0.1'
//implementation project(':app:app_resources')
}
Expand Down
8 changes: 4 additions & 4 deletions database/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ source 'https://github.com/CocoaPods/Specs.git'

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Database', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
pod 'Firebase/Database', '8.6.0'
pod 'Firebase/Auth', '8.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '10.0'
pod 'Firebase/Database', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
pod 'Firebase/Database', '8.6.0'
pod 'Firebase/Auth', '8.6.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion dynamic_links/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '10.0'
# Firebase Dynamic Links test application.

target 'integration_test' do
pod 'Firebase/DynamicLinks', '8.5.0'
pod 'Firebase/DynamicLinks', '8.6.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion firestore/firestore_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
}

dependencies {
implementation 'com.google.firebase:firebase-analytics:19.0.0'
implementation 'com.google.firebase:firebase-analytics:19.0.1'
implementation 'com.google.firebase:firebase-firestore:23.0.3'
}

Expand Down
8 changes: 4 additions & 4 deletions firestore/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ source 'https://github.com/CocoaPods/Specs.git'

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Firestore', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
pod 'Firebase/Firestore', '8.6.0'
pod 'Firebase/Auth', '8.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '10.0'
pod 'Firebase/Firestore', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
pod 'Firebase/Firestore', '8.6.0'
pod 'Firebase/Auth', '8.6.0'
end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 deletions firestore/integration_test_internal/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ platform :ios, '10.0'

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Firestore', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
pod 'Firebase/Firestore', '8.6.0'
pod 'Firebase/Auth', '8.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '10.0'
pod 'Firebase/Firestore', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
pod 'Firebase/Firestore', '8.6.0'
pod 'Firebase/Auth', '8.6.0'
end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 deletions functions/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ source 'https://github.com/CocoaPods/Specs.git'

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Functions', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
pod 'Firebase/Functions', '8.6.0'
pod 'Firebase/Auth', '8.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '10.0'
pod 'Firebase/Functions', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
pod 'Firebase/Functions', '8.6.0'
pod 'Firebase/Auth', '8.6.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions installations/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ platform :ios, '10.0'
# Firebase Installations test application.

target 'integration_test' do
pod 'Firebase/Analytics', '8.5.0'
pod 'Firebase/Installations', '8.5.0'
pod 'Firebase/Analytics', '8.6.0'
pod 'Firebase/Installations', '8.6.0'
end

post_install do |installer|
Expand Down
24 changes: 12 additions & 12 deletions ios_pod/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '10.0'

target 'GetPods' do
pod 'Firebase/Core', '8.5.0'
pod 'Firebase/Core', '8.6.0'

pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk'
pod 'Firebase/Analytics', '8.5.0'
pod 'Firebase/Auth', '8.5.0'
pod 'Firebase/Crashlytics', '8.5.0'
pod 'Firebase/Database', '8.5.0'
pod 'Firebase/DynamicLinks', '8.5.0'
pod 'Firebase/Firestore', '8.5.0'
pod 'Firebase/Functions', '8.5.0'
pod 'Firebase/Installations', '8.5.0'
pod 'Firebase/Messaging', '8.5.0'
pod 'Firebase/RemoteConfig', '8.5.0'
pod 'Firebase/Storage', '8.5.0'
pod 'Firebase/Analytics', '8.6.0'
pod 'Firebase/Auth', '8.6.0'
pod 'Firebase/Crashlytics', '8.6.0'
pod 'Firebase/Database', '8.6.0'
pod 'Firebase/DynamicLinks', '8.6.0'
pod 'Firebase/Firestore', '8.6.0'
pod 'Firebase/Functions', '8.6.0'
pod 'Firebase/Installations', '8.6.0'
pod 'Firebase/Messaging', '8.6.0'
pod 'Firebase/RemoteConfig', '8.6.0'
pod 'Firebase/Storage', '8.6.0'

end
4 changes: 2 additions & 2 deletions messaging/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ source 'https://github.com/CocoaPods/Specs.git'

target 'integration_test' do
platform :ios, '10.0'
pod 'Firebase/Messaging', '8.5.0'
pod 'Firebase/Messaging', '8.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '10.0'
pod 'Firebase/Messaging', '8.5.0'
pod 'Firebase/Messaging', '8.6.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion messaging/messaging_java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ android {
}

dependencies {
implementation 'com.google.firebase:firebase-analytics:19.0.0'
implementation 'com.google.firebase:firebase-analytics:19.0.1'
implementation 'com.google.firebase:firebase-messaging:22.0.0'
implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'
}
Expand Down
6 changes: 3 additions & 3 deletions release_build_files/Android/firebase_dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import org.gradle.util.ConfigureUtil;

// A map of library to the dependencies that need to be added for it.
def firebaseDependenciesMap = [
'app' : ['com.google.firebase:firebase-analytics:19.0.0'],
'app' : ['com.google.firebase:firebase-analytics:19.0.1'],
'admob' : ['com.google.firebase:firebase-ads:19.8.0',
'com.google.firebase:firebase-analytics:19.0.0',
'com.google.firebase:firebase-analytics:19.0.1',
'com.google.android.gms:play-services-base:17.6.0'],
'analytics' : ['com.google.firebase:firebase-analytics:19.0.0',
'analytics' : ['com.google.firebase:firebase-analytics:19.0.1',
'com.google.android.gms:play-services-base:17.6.0'],
'auth' : ['com.google.firebase:firebase-auth:21.0.1'],
'database' : ['com.google.firebase:firebase-database:20.0.1'],
Expand Down
Loading