Integrate Latest @ 217800785

jonsimantov · jonsimantov · commit 795ab2678667 · 2018-10-18T21:12:19.000-04:00
Changes to all ...
- Update Android dependency versions.
Changes to admob/testapp ...
- Add the sample AdMob Application ID to the Android manifest.
Changes to auth/testapp ...
- Update bundle ids for Firebase C++ Auth/DynamicLinks/Messaging/Invites testapps.
Changes to dynamic_links/testapp ...
- Update bundle ids for Firebase C++ Auth/DynamicLinks/Messaging/Invites testapps.
Changes to invites/testapp ...
- Update bundle ids for Firebase C++ Auth/DynamicLinks/Messaging/Invites testapps.
- In the Firebase Invites testapp, change the Android Minimum Version Code we check against to 1 instead of 19, since the testapp's version code is, in fact, 1.
Changes to messaging/testapp ...
- Make placeholder values in C++ messaging testapp consistent.
- Fix messaging C++ sample's Android package name.
- Update bundle ids for Firebase C++ Auth/DynamicLinks/Messaging/Invites testapps.

CL: 217800785
diff --git a/admob/testapp/AndroidManifest.xml b/admob/testapp/AndroidManifest.xml
@@ -8,6 +8,10 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
   <application android:label="@string/app_name">
+    <!-- You may replace the sample Admob App ID below with your own App ID. -->
+    <meta-data
+        android:name="com.google.android.gms.ads.APPLICATION_ID"
+        android:value="ca-app-pub-3940256099942544~3347511713"/>
     <activity android:name="android.app.NativeActivity"
       android:screenOrientation="portrait"
       android:configChanges="orientation|screenSize">
diff --git a/admob/testapp/build.gradle b/admob/testapp/build.gradle
@@ -91,9 +91,9 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:16.0.3'
-  compile 'com.google.firebase:firebase-ads:15.0.1'
-  compile 'com.google.firebase:firebase-common:16.0.2'
+  compile 'com.google.firebase:firebase-core:16.0.4'
+  compile 'com.google.firebase:firebase-ads:17.0.0'
+  compile 'com.google.firebase:firebase-common:16.0.3'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/admob/testapp/src/common_main.cc b/admob/testapp/src/common_main.cc
@@ -70,6 +70,8 @@ class LoggingRewardedVideoListener
 
 // The AdMob app IDs for the test app.
 #if defined(__ANDROID__)
+// If you change the AdMob app ID for your Android app, make sure to change it
+// in AndroidManifest.xml as well.
 const char* kAdMobAppID = "ca-app-pub-3940256099942544~3347511713";
 #else
 const char* kAdMobAppID = "ca-app-pub-3940256099942544~1458002511";
diff --git a/analytics/testapp/build.gradle b/analytics/testapp/build.gradle
@@ -91,9 +91,9 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:16.0.3'
-  compile 'com.google.firebase:firebase-analytics:16.0.3'
-  compile 'com.google.firebase:firebase-common:16.0.2'
+  compile 'com.google.firebase:firebase-core:16.0.4'
+  compile 'com.google.firebase:firebase-analytics:16.0.4'
+  compile 'com.google.firebase:firebase-common:16.0.3'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/auth/testapp/build.gradle b/auth/testapp/build.gradle
@@ -91,9 +91,9 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:16.0.3'
-  compile 'com.google.firebase:firebase-auth:16.0.3'
-  compile 'com.google.firebase:firebase-common:16.0.2'
+  compile 'com.google.firebase:firebase-core:16.0.4'
+  compile 'com.google.firebase:firebase-auth:16.0.5'
+  compile 'com.google.firebase:firebase-common:16.0.3'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/auth/testapp/readme.md b/auth/testapp/readme.md
@@ -49,7 +49,7 @@ Building and Running the testapp
   - Register your iOS app with Firebase.
     - Create a new app on the [Firebase console](https://firebase.google.com/console/), and attach
       your iOS app to it.
-      - You can use "com.google.ios.auth.testapp" as the iOS Bundle ID
+      - You can use "com.google.FirebaseCppAuthTestApp.dev" as the iOS Bundle ID
         while you're testing. You can omit App Store ID while testing.
     - Add the GoogleService-Info.plist that you downloaded from Firebase
       console to the testapp root directory. This file identifies your iOS app
diff --git a/auth/testapp/testapp/Info.plist b/auth/testapp/testapp/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.google.ios.auth.testapp</string>
+	<string>com.google.FirebaseCppAuthTestApp.dev</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -22,10 +22,10 @@
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleURLName</key>
-			<string>com.google.ios.auth.testapp</string>
+			<string>com.google.FirebaseCppAuthTestApp.dev</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>com.google.ios.auth.testapp</string>
+				<string>com.google.FirebaseCppAuthTestApp.dev</string>
 			</array>
 		</dict>
 		<dict>
diff --git a/database/testapp/build.gradle b/database/testapp/build.gradle
@@ -92,9 +92,9 @@ android {
 }
 
 dependencies {
-    compile 'com.google.firebase:firebase-core:16.0.3'
-    compile 'com.google.firebase:firebase-auth:16.0.3'
-    compile 'com.google.firebase:firebase-database:16.0.1'
+    compile 'com.google.firebase:firebase-core:16.0.4'
+    compile 'com.google.firebase:firebase-auth:16.0.5'
+    compile 'com.google.firebase:firebase-database:16.0.3'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/dynamic_links/testapp/build.gradle b/dynamic_links/testapp/build.gradle
@@ -91,9 +91,9 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:16.0.3'
-  compile 'com.google.firebase:firebase-invites:16.0.3'
-  compile 'com.google.firebase:firebase-common:16.0.2'
+  compile 'com.google.firebase:firebase-core:16.0.4'
+  compile 'com.google.firebase:firebase-invites:16.0.4'
+  compile 'com.google.firebase:firebase-common:16.0.3'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/dynamic_links/testapp/readme.md b/dynamic_links/testapp/readme.md
@@ -33,7 +33,7 @@ Building and Running the testapp
   - Register your iOS app with Firebase.
     - Create a new app on the [Firebase console](https://firebase.google.com/console/), and attach
       your iOS app to it.
-      - You can use "com.google.ios.dynamiclinks.testapp" as the iOS Bundle ID
+      - You can use "com.google.FirebaseCppDynamicLinksTestApp.dev" as the iOS Bundle ID
         while you're testing. You can omit App Store ID while testing.
     - Add the GoogleService-Info.plist that you downloaded from Firebase
       console to the testapp root directory. This file identifies your iOS app
diff --git a/dynamic_links/testapp/testapp/Info.plist b/dynamic_links/testapp/testapp/Info.plist
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>$(EXECUTABLE_NAME)</string>
     <key>CFBundleIdentifier</key>
-    <string>com.google.ios.dynamiclinks.testapp</string>
+    <string>com.google.FirebaseCppDynamicLinksTestApp.dev</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>
@@ -18,18 +18,18 @@
     <string>1.0</string>
     <key>CFBundleURLSchemes</key>
     <array>
-      <string>com.google.ios.dynamiclinks.testapp</string>
+      <string>com.google.FirebaseCppDynamicLinksTestApp.dev</string>
     </array>
     <key>CFBundleURLTypes</key>
     <array>
       <dict>
         <key>CFBundleTypeRole</key>
         <string>Editor</string>
         <key>CFBundleURLName</key>
-        <string>com.google.ios.dynamiclinks.testapp</string>
+        <string>com.google.FirebaseCppDynamicLinksTestApp.dev</string>
         <key>CFBundleURLSchemes</key>
         <array>
-          <string>com.google.ios.dynamiclinks.testapp</string>
+          <string>com.google.FirebaseCppDynamicLinksTestApp.dev</string>
         </array>
       </dict>
       <dict>
diff --git a/functions/testapp/build.gradle b/functions/testapp/build.gradle
@@ -92,9 +92,9 @@ android {
 }
 
 dependencies {
-    compile 'com.google.firebase:firebase-core:16.0.3'
-    compile 'com.google.firebase:firebase-auth:16.0.3'
-    compile 'com.google.firebase:firebase-functions:16.1.0'
+    compile 'com.google.firebase:firebase-core:16.0.4'
+    compile 'com.google.firebase:firebase-auth:16.0.5'
+    compile 'com.google.firebase:firebase-functions:16.1.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/invites/testapp/build.gradle b/invites/testapp/build.gradle
@@ -91,9 +91,9 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:16.0.3'
-  compile 'com.google.firebase:firebase-invites:16.0.3'
-  compile 'com.google.firebase:firebase-common:16.0.2'
+  compile 'com.google.firebase:firebase-core:16.0.4'
+  compile 'com.google.firebase:firebase-invites:16.0.4'
+  compile 'com.google.firebase:firebase-common:16.0.3'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/invites/testapp/readme.md b/invites/testapp/readme.md
@@ -38,7 +38,7 @@ Building and Running the testapp
       and attach your iOS app to it.
       - For Invites, you will need an App Store ID. Use something random such
         as 12345678."
-      - You can use "com.google.ios.invites.testapp" as the iOS Bundle ID
+      - You can use "com.google.FirebaseCppInvitesTestApp.dev" as the iOS Bundle ID
         while you're testing.
     - Add the GoogleService-Info.plist that you downloaded from Firebase
       console to the testapp root directory. This file identifies your iOS app
diff --git a/invites/testapp/testapp/Info.plist b/invites/testapp/testapp/Info.plist
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>$(EXECUTABLE_NAME)</string>
     <key>CFBundleIdentifier</key>
-    <string>com.google.ios.invites.testapp</string>
+    <string>com.google.FirebaseCppInvitesTestApp.dev</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>
@@ -18,18 +18,18 @@
     <string>1.0</string>
     <key>CFBundleURLSchemes</key>
     <array>
-      <string>com.google.ios.invites.testapp</string>
+      <string>com.google.FirebaseCppInvitesTestApp.dev</string>
     </array>
     <key>CFBundleURLTypes</key>
     <array>
       <dict>
         <key>CFBundleTypeRole</key>
         <string>Editor</string>
         <key>CFBundleURLName</key>
-        <string>com.google.ios.invites.testapp</string>
+        <string>com.google.FirebaseCppInvitesTestApp.dev</string>
         <key>CFBundleURLSchemes</key>
         <array>
-          <string>com.google.ios.invites.testapp</string>
+          <string>com.google.FirebaseCppInvitesTestApp.dev</string>
         </array>
       </dict>
       <dict>
diff --git a/messaging/testapp/build.gradle b/messaging/testapp/build.gradle
@@ -98,9 +98,9 @@ repositories {
 
 dependencies {
   compile 'com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar'
-  compile 'com.google.firebase:firebase-core:16.0.3'
-  compile 'com.google.firebase:firebase-messaging:17.3.2'
-  compile 'com.google.firebase:firebase-common:16.0.2'
+  compile 'com.google.firebase:firebase-core:16.0.4'
+  compile 'com.google.firebase:firebase-messaging:17.3.4'
+  compile 'com.google.firebase:firebase-common:16.0.3'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/messaging/testapp/readme.md b/messaging/testapp/readme.md
@@ -39,7 +39,7 @@ Building and Running the testapp
     , and attach your iOS app to it.
       - For Messaging, you will need an App Store ID. Use something random such
         as 12345678."
-      - You can use "com.google.ios.messaging.testapp" as the iOS Bundle ID
+      - You can use "com.google.FirebaseCppMessagingTestApp.dev" as the iOS Bundle ID
         while you're testing.
     - Add the GoogleService-Info.plist that you downloaded from Firebase
       console to the testapp root directory. This file identifies your iOS app
@@ -218,7 +218,7 @@ viewed via the console:
     * **Android**: View the logcat output in Android studio or by running
     "adb logcat" from the command line.
 - When you first run the app, it will print:
-`Recieved Registration Token: <code>`. Copy this code to a text editor.
+`Received Registration Token: <code>`. Copy this code to a text editor.
 - Copy the ServerKey from the firebase console:
   - Open your project in the
     [Firebase Console](https://firebase.google.com/console/).
diff --git a/messaging/testapp/testapp/Info.plist b/messaging/testapp/testapp/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.google.ios.messaging.testapp</string>
+	<string>com.google.FirebaseCppMessagingTestApp.dev</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/remote_config/testapp/build.gradle b/remote_config/testapp/build.gradle
@@ -91,9 +91,9 @@ android {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-core:16.0.3'
-  compile 'com.google.firebase:firebase-config:16.0.0'
-  compile 'com.google.firebase:firebase-common:16.0.2'
+  compile 'com.google.firebase:firebase-core:16.0.4'
+  compile 'com.google.firebase:firebase-config:16.1.0'
+  compile 'com.google.firebase:firebase-common:16.0.3'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/storage/testapp/build.gradle b/storage/testapp/build.gradle
@@ -92,9 +92,9 @@ android {
 }
 
 dependencies {
-    compile 'com.google.firebase:firebase-core:16.0.3'
-    compile 'com.google.firebase:firebase-auth:16.0.3'
-    compile 'com.google.firebase:firebase-storage:16.0.2'
+    compile 'com.google.firebase:firebase-core:16.0.4'
+    compile 'com.google.firebase:firebase-auth:16.0.5'
+    compile 'com.google.firebase:firebase-storage:16.0.3'
 }
 
 apply plugin: 'com.google.gms.google-services'

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,9 @@ android {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`dependencies {`
`94`		`- compile 'com.google.firebase:firebase-core:16.0.3'`
`95`		`- compile 'com.google.firebase:firebase-ads:15.0.1'`
`96`		`- compile 'com.google.firebase:firebase-common:16.0.2'`
	`94`	`+ compile 'com.google.firebase:firebase-core:16.0.4'`
	`95`	`+ compile 'com.google.firebase:firebase-ads:17.0.0'`
	`96`	`+ compile 'com.google.firebase:firebase-common:16.0.3'`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`apply plugin: 'com.google.gms.google-services'`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,9 @@ android {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`dependencies {`
`95`		`- compile 'com.google.firebase:firebase-core:16.0.3'`
`96`		`- compile 'com.google.firebase:firebase-auth:16.0.3'`
`97`		`- compile 'com.google.firebase:firebase-database:16.0.1'`
	`95`	`+ compile 'com.google.firebase:firebase-core:16.0.4'`
	`96`	`+ compile 'com.google.firebase:firebase-auth:16.0.5'`
	`97`	`+ compile 'com.google.firebase:firebase-database:16.0.3'`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`apply plugin: 'com.google.gms.google-services'`