Skip to content

Commit 1a3a979

Browse files
author
Stewart Miles
committed
Integrate Latest @ 215455396
- Updated Android dependencies for the C++ samples - Fixed Invites sample to open the test application rather than the store. - Added sample code for testing Functions with a local emulator. CL: 215455396
1 parent c57543c commit 1a3a979

File tree

10 files changed

+16
-10
lines changed

10 files changed

+16
-10
lines changed

admob/testapp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ android {
9393
dependencies {
9494
compile 'com.google.firebase:firebase-core:16.0.3'
9595
compile 'com.google.firebase:firebase-ads:15.0.1'
96-
compile 'com.google.firebase:firebase-common:16.0.1'
96+
compile 'com.google.firebase:firebase-common:16.0.2'
9797
}
9898

9999
apply plugin: 'com.google.gms.google-services'

analytics/testapp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ android {
9393
dependencies {
9494
compile 'com.google.firebase:firebase-core:16.0.3'
9595
compile 'com.google.firebase:firebase-analytics:16.0.3'
96-
compile 'com.google.firebase:firebase-common:16.0.1'
96+
compile 'com.google.firebase:firebase-common:16.0.2'
9797
}
9898

9999
apply plugin: 'com.google.gms.google-services'

auth/testapp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ android {
9393
dependencies {
9494
compile 'com.google.firebase:firebase-core:16.0.3'
9595
compile 'com.google.firebase:firebase-auth:16.0.3'
96-
compile 'com.google.firebase:firebase-common:16.0.1'
96+
compile 'com.google.firebase:firebase-common:16.0.2'
9797
}
9898

9999
apply plugin: 'com.google.gms.google-services'

dynamic_links/testapp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ android {
9393
dependencies {
9494
compile 'com.google.firebase:firebase-core:16.0.3'
9595
compile 'com.google.firebase:firebase-invites:16.0.3'
96-
compile 'com.google.firebase:firebase-common:16.0.1'
96+
compile 'com.google.firebase:firebase-common:16.0.2'
9797
}
9898

9999
apply plugin: 'com.google.gms.google-services'

functions/testapp/src/common_main.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ extern "C" int common_main(int argc, const char* argv[]) {
9090
}
9191
LogMessage("Successfully initialized Firebase Auth and Cloud Functions.");
9292

93+
// To test against a local emulator, uncomment this line:
94+
// functions->UseFunctionsEmulator("http://localhost:5005");
95+
// Or when running in an Android emulator:
96+
// functions->UseFunctionsEmulator("http://10.0.2.2:5005");
97+
9398
// Optionally, sign in using Auth before accessing Functions.
9499
{
95100
firebase::Future<firebase::auth::User*> sign_in_future =

invites/testapp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ android {
9393
dependencies {
9494
compile 'com.google.firebase:firebase-core:16.0.3'
9595
compile 'com.google.firebase:firebase-invites:16.0.3'
96-
compile 'com.google.firebase:firebase-common:16.0.1'
96+
compile 'com.google.firebase:firebase-common:16.0.2'
9797
}
9898

9999
apply plugin: 'com.google.gms.google-services'

invites/testapp/src/common_main.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ extern "C" int common_main(int argc, const char* argv[]) {
104104
invite.message_text = "Please try my app! It's awesome.";
105105
invite.call_to_action_text = "Download it for FREE";
106106
invite.deep_link_url = "http://google.com/abc";
107-
invite.android_minimum_version_code = 19;
107+
// Android minimum version code refers to versionCode in build.gradle.
108+
invite.android_minimum_version_code = 1;
108109
auto future_result = ::firebase::invites::SendInvite(invite);
109110
while (future_result.status() == firebase::kFutureStatusPending) {
110111
if (ProcessEvents(10)) break;

messaging/testapp/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ repositories {
9999
dependencies {
100100
compile 'com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar'
101101
compile 'com.google.firebase:firebase-core:16.0.3'
102-
compile 'com.google.firebase:firebase-messaging:17.3.0'
103-
compile 'com.google.firebase:firebase-common:16.0.1'
102+
compile 'com.google.firebase:firebase-messaging:17.3.2'
103+
compile 'com.google.firebase:firebase-common:16.0.2'
104104
}
105105

106106
apply plugin: 'com.google.gms.google-services'

remote_config/testapp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ android {
9393
dependencies {
9494
compile 'com.google.firebase:firebase-core:16.0.3'
9595
compile 'com.google.firebase:firebase-config:16.0.0'
96-
compile 'com.google.firebase:firebase-common:16.0.1'
96+
compile 'com.google.firebase:firebase-common:16.0.2'
9797
}
9898

9999
apply plugin: 'com.google.gms.google-services'

storage/testapp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ android {
9494
dependencies {
9595
compile 'com.google.firebase:firebase-core:16.0.3'
9696
compile 'com.google.firebase:firebase-auth:16.0.3'
97-
compile 'com.google.firebase:firebase-storage:16.0.1'
97+
compile 'com.google.firebase:firebase-storage:16.0.2'
9898
}
9999

100100
apply plugin: 'com.google.gms.google-services'

0 commit comments

Comments
 (0)