Integrate Latest @ 120135726

Changes to admob/testapp ... - Fixed runtime link errors when building for Android devices running < M. - Fixed compilation of Firebase C++ AdMob test app when building with blaze. - Removed AdMob specific methods from testapp platform abstraction layer. - Apply Proguard stripping rules to Firebase C++ test apps. - Updates AdMob Podfile to pull v3.1.1 for Firebase/Core pod. - Refactors the state-polling interface for the AdMob C++ API by adding virtuallistener classes and corresponding setter methods, removing the public lifecycle stateenumerations, and renaming the other enums. Also updates the testapp to make use of the same. - Fixes two bugs, refactors the banner and interstitial helper properties to ivars, and removes void* and __bridge casting. - Add Firebase C++ testapp builds to TAP test suite. - Updates the AdMob C++ API implementation to include Futures for interstial ads Changes to analytics/testapp ... - Fixed runtime link errors when building for Android devices running < M. - Fixed Firebase Analytics test application to build with stlport and gnustl. - Apply Proguard stripping rules to Firebase C++ test apps. - Fixed build of Android testapps with blaze. - Pins sample podfile dependencies to M7 firebase packages. Fixes mac build for Auth and Analytics samples. - Cleans up creation of android log-window, through the use of a java class. (In place of lots of messy JNI invocations.) - Add Firebase C++ testapp builds to TAP test suite. - Remote Config C++ test application. Changes to auth/testapp ... - Fixed runtime link errors when building for Android devices running < M. - Fixed use of algorithm in Firebase C++ testapps which doesn't work with stlport. - Apply Proguard stripping rules to Firebase C++ test apps. - Fixed build of Android testapps with blaze. - Pins sample podfile dependencies to M7 firebase packages. Fixes mac build for Auth and Analytics samples. - Cleans up creation of android log-window, through the use of a java class. (In place of lots of messy JNI invocations.) - Modified the firebase auth readme to tell the user to enable anonymous sign-in in the test app. Previously this was enabled by default, but no longer. - Add Firebase C++ testapp builds to TAP test suite. - Added a text window to the ios sample, to mirror log outputs on the device. Changes to invites/testapp ... - Pin firebase dependencies in podfile to a specific release. This fixes the linker errors when building the ios version of the invites test app. - Fixed runtime link errors when building for Android devices running < M. - Fixed use of algorithm in Firebase C++ testapps which doesn't work with stlport. - Apply Proguard stripping rules to Firebase C++ test apps. - Fixed build of Android testapps with blaze. - Cleans up creation of android log-window, through the use of a java class. (In place of lots of messy JNI invocations.) - Implement method swizzling to install the ios_startup functions in Invites, moving and consolidating most of the code to Firebase App. - Add Firebase C++ testapp builds to TAP test suite. - Added a text view in the background which mirrors log output. Changes to messaging/testapp ... - Fixed runtime link errors when building for Android devices running < M. - Fixed use of algorithm in Firebase C++ testapps which doesn't work with stlport. - Apply Proguard stripping rules to Firebase C++ test apps. - Add missing gradle build files to Messaging testapp. - Fixed build of Android testapps with blaze. - Pins sample podfile dependencies to M7 firebase packages. Fixes mac build for Auth and Analytics samples. - Cleans up creation of android log-window, through the use of a java class. (In place of lots of messy JNI invocations.) - Add Firebase C++ testapp builds to TAP test suite. - Added a textview to messaging testapp, which mirrors log output. CL: 120135726

Author: Alex Ames

admob/testapp/Podfile

@@ -3,6 +3,6 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '7.0'
 # AdMob test application.
 target 'testapp' do
- pod 'Firebase/Core'
+ pod 'Firebase/Core', '3.1.1'
  pod 'Google-Mobile-Ads-SDK', '~> 7.7’
 end

admob/testapp/build.gradle

@@ -19,43 +19,6 @@ allprojects {
 
 apply plugin: 'com.android.application'
 
-android {
- compileSdkVersion 23
- buildToolsVersion '23.0.1'
-
- sourceSets {
- main {
- jniLibs.srcDirs = ['libs']
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src/android/java']
- res.srcDirs = ['res']
- }
- }
-
- defaultConfig {
- applicationId 'com.google.android.admob.testapp'
- minSdkVersion 14
- targetSdkVersion 23
- versionCode 1
- versionName '1.0'
- }
- buildTypes {
- release {
- // Proguard temporarily disabled until we have a template for
- // classes referenced from JNI that shouldn't be stripped.
- //minifyEnabled true
- //proguardFiles getDefaultProguardFile('proguard-android.txt')
- }
- }
-}
-
-dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.google.android.gms:play-services-ads:8.5.4'
-}
-
-apply plugin: 'com.google.gms.google-services'
-
 // Pre-experimental Gradle plug-in NDK boilerplate below.
 // Right now the Firebase plug-in does not work with the experimental
 // Gradle plug-in so we're using ndk-build for the moment.
@@ -94,6 +57,43 @@ project.ext {
  }
 }
 
+android {
+ compileSdkVersion 23
+ buildToolsVersion '23.0.1'
+
+ sourceSets {
+ main {
+ jniLibs.srcDirs = ['libs']
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src/android/java']
+ res.srcDirs = ['res']
+ }
+ }
+
+ defaultConfig {
+ applicationId 'com.google.android.admob.testapp'
+ minSdkVersion 14
+ targetSdkVersion 23
+ versionCode 1
+ versionName '1.0'
+ }
+ buildTypes {
+ release {
+ minifyEnabled true
+ proguardFile getDefaultProguardFile('proguard-android.txt')
+ proguardFile file(project.ext.firebase_cpp_sdk_dir + "/libs/android/app.pro")
+ proguardFile file(project.ext.firebase_cpp_sdk_dir + "/libs/android/admob.pro")
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile 'com.google.android.gms:play-services-ads:8.5.4'
+}
+
+apply plugin: 'com.google.gms.google-services'
+
 task ndkBuildCompile(type:Exec) {
  description 'Use ndk-build to compile the C++ application.'
  commandLine("${project.ext.ndk_dir}${File.separator}ndk-build",

admob/testapp/src/android/android_main.cc

@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <stdarg.h>
+
 #include <android/log.h>
 #include <android_native_app_glue.h>
-#include <stdarg.h>
 
 #include "main.h" // NOLINT
 

admob/testapp/src/common_main.cc

@@ -22,6 +22,39 @@
 // Thin OS abstraction layer.
 #include "main.h" // NOLINT
 
+// A simple listener that logs changes to a BannerView.
+class LoggingBannerViewListener : public firebase::admob::BannerView::Listener {
+ public:
+ LoggingBannerViewListener() {}
+ void OnPresentationStateChanged(
+ firebase::admob::BannerView* banner_view,
+ firebase::admob::BannerView::PresentationState new_state) {
+ ::LogMessage("BannerView PresentationState has changed to %d.", new_state);
+ }
+
+ void OnBoundingBoxChanged(firebase::admob::BannerView* banner_view,
+ firebase::admob::BoundingBox new_box) {
+ ::LogMessage(
+ "BannerView BoundingBox has changed to (x: %d, y: %d, width: %d, "
+ "height "
+ "%d)",
+ new_box.x, new_box.y, new_box.width, new_box.height);
+ }
+};
+
+// A simple listener that logs changes to an InterstitialAd.
+class LoggingInterstitialAdListener
+ : public firebase::admob::InterstitialAd::Listener {
+ public:
+ LoggingInterstitialAdListener() {}
+ void OnPresentationStateChanged(
+ firebase::admob::InterstitialAd* interstitial_ad,
+ firebase::admob::InterstitialAd::PresentationState new_state) {
+ ::LogMessage("InterstitialAd PresentationState has changed to %d.",
+ new_state);
+ }
+};
+
 // These ad units are configured to always serve test ads.
 #if defined(__ANDROID__)
 const char* kBannerAdUnit = "ca-app-pub-3940256099942544/6300978111";
@@ -56,13 +89,27 @@ ::firebase::App* g_app;
 ::firebase::admob::BannerView* g_banner;
 ::firebase::admob::InterstitialAd* g_int;
 ::firebase::admob::AdRequest g_request;
+LoggingBannerViewListener g_banner_listener;
+LoggingInterstitialAdListener g_int_listener;
 
 // Extras to use later
 ::firebase::admob::KeyValuePair g_extra;
 ::firebase::admob::KeyValuePair* g_extras_array[] = {&g_extra};
 
+static void WaitForFutureCompletion(firebase::FutureBase future) {
+#if defined(__ANDROID__)
+ while (!ProcessAndroidEvents(1000)) {
+#else
+ while (true) {
+#endif // defined(__ANDROID__)
+ if (future.Status() != ::firebase::kFutureStatus_Pending) {
+ break;
+ }
+ }
+}
+
 // Execute all methods of the C++ admob API.
-extern "C" int common_main(void* ad_parent) {
+extern "C" int common_main(::firebase::admob::AdParent ad_parent) {
  namespace admob = ::firebase::admob;
 
  LogMessage("Initializing the AdMob library");
@@ -127,6 +174,7 @@ extern "C" int common_main(void* ad_parent) {
 
  LogMessage("Creating the BannerView.");
  g_banner = new admob::BannerView();
+ g_banner->SetListener(&g_banner_listener);
  g_banner->Initialize(static_cast<admob::AdParent>(ad_parent), kBannerAdUnit,
  ad_size);
 
@@ -142,8 +190,23 @@ extern "C" int common_main(void* ad_parent) {
  LogMessage("Showing the banner.");
  g_banner->Show();
 
+ WaitForFutureCompletion(g_banner->ShowLastResult());
+
+ // When the BannerView has shown, move it.
+ LogMessage("Moving the banner to top-center.");
+ g_banner->MoveTo(admob::BannerView::kPositionTop);
+
+ WaitForFutureCompletion(g_banner->MoveToLastResult());
+
+ // When the BannerView has moved, move it again!
+ LogMessage("Moving the banner to (100, 200).");
+ g_banner->MoveTo(100, 200);
+
+ WaitForFutureCompletion(g_banner->MoveToLastResult());
+
  LogMessage("Creating the InterstitialAd.");
  g_int = new admob::InterstitialAd();
+ g_int->SetListener(&g_int_listener);
  g_int->Initialize(static_cast<admob::AdParent>(ad_parent),
  kInterstitialAdUnit);
 
@@ -159,23 +222,11 @@ extern "C" int common_main(void* ad_parent) {
  LogMessage("Showing the interstitial.");
  g_int->Show();
 
- // Wait until the user kills the app.
+// Wait until the user kills the app.
 #if defined(__ANDROID__)
  while (!ProcessAndroidEvents(1000)) {
  }
 #endif // defined(__ANDROID__)
 
  return 0;
 }
-
-void WaitForFutureCompletion(firebase::FutureBase future) {
-#if defined(__ANDROID__)
- while (!ProcessAndroidEvents(1000)) {
-#else
- while (true) {
-#endif // defined(__ANDROID__)
- if (future.Status() != ::firebase::kFutureStatus_Pending) {
- break;
- }
- }
-}

admob/testapp/src/ios/ios_main.mm

@@ -23,22 +23,22 @@ @interface FBAViewController : UIViewController
 
 @end
 
-extern "C" int common_main(void* ad_parent);
+extern "C" int common_main(firebase::admob::AdParent ad_parent);
 
 @implementation FBAViewController
 
 - (void)viewDidLoad {
  [super viewDidLoad];
  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
- common_main((__bridge void*)self.view);
+ common_main(self.view);
  });
 }
 
 @end
 
 static int exit_status = 0;
 
-// Log a message that can be viewed in "adb logcat".
+// Log a message that can be viewed in the console.
 int LogMessage(const char* format, ...) {
  va_list list;
  int rc = 0;

admob/testapp/src/main.h

@@ -20,10 +20,6 @@
 #include <jni.h>
 #endif // defined(__ANDROID__)
 
-#include "firebase/admob.h"
-#include "firebase/admob/types.h"
-#include "firebase/future.h"
-
 // Defined using -DANDROID_MAIN_APP_NAME=some_app_name when compiling this
 // file.
 #ifndef FIREBASE_TESTAPP_NAME
@@ -43,6 +39,4 @@ JNIEnv* GetJniEnv();
 jobject GetActivity();
 #endif // defined(__ANDROID__)
 
-void WaitForFutureCompletion(firebase::FutureBase future);
-
 #endif // FIREBASE_TESTAPP_MAIN_H_ // NOLINT

analytics/testapp/Podfile

@@ -3,5 +3,5 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # Analytics test application.
 target 'testapp' do
- pod 'Firebase/Core'
+ pod 'Firebase/Core', '3.1.1'
 end

analytics/testapp/build.gradle

@@ -19,43 +19,6 @@ allprojects {
 
 apply plugin: 'com.android.application'
 
-android {
- compileSdkVersion 23
- buildToolsVersion '23.0.1'
-
- sourceSets {
- main {
- jniLibs.srcDirs = ['libs']
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src/android/java']
- res.srcDirs = ['res']
- }
- }
-
- defaultConfig {
- applicationId 'com.google.android.analytics.testapp'
- minSdkVersion 14
- targetSdkVersion 23
- versionCode 1
- versionName '1.0'
- }
- buildTypes {
- release {
- // Proguard temporarily disabled until we have a template for
- // classes referenced from JNI that shouldn't be stripped.
- //minifyEnabled true
- //proguardFiles getDefaultProguardFile('proguard-android.txt')
- }
- }
-}
-
-dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.google.android.gms:firebase-measurement:8.5.4'
-}
-
-apply plugin: 'com.google.gms.google-services'
-
 // Pre-experimental Gradle plug-in NDK boilerplate below.
 // Right now the Firebase plug-in does not work with the experimental
 // Gradle plug-in so we're using ndk-build for the moment.
@@ -94,6 +57,44 @@ project.ext {
  }
 }
 
+android {
+ compileSdkVersion 23
+ buildToolsVersion '23.0.1'
+
+ sourceSets {
+ main {
+ jniLibs.srcDirs = ['libs']
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src/android/java']
+ res.srcDirs = ['res']
+ }
+ }
+
+ defaultConfig {
+ applicationId 'com.google.android.analytics.testapp'
+ minSdkVersion 14
+ targetSdkVersion 23
+ versionCode 1
+ versionName '1.0'
+ }
+ buildTypes {
+ release {
+ minifyEnabled true
+ proguardFile getDefaultProguardFile('proguard-android.txt')
+ proguardFile file(project.ext.firebase_cpp_sdk_dir + "/libs/android/app.pro")
+ proguardFile file(project.ext.firebase_cpp_sdk_dir + "/libs/android/analytics.pro")
+ proguardFile file('proguard.pro')
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile 'com.google.android.gms:firebase-measurement:8.5.4'
+}
+
+apply plugin: 'com.google.gms.google-services'
+
 task ndkBuildCompile(type:Exec) {
  description 'Use ndk-build to compile the C++ application.'
  commandLine("${project.ext.ndk_dir}${File.separator}ndk-build",

analytics/testapp/proguard.pro

@@ -0,0 +1 @@
+-keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }

analytics/testapp/readme.md

@@ -42,7 +42,7 @@ Building and Running the testapp
  to the Firebase backend.
  - Add the following frameworks from the Firebase C++ SDK to the project:
  - frameworks/ios/universal/firebase.framework
- - frameworks/ios/universal/firebase_analytics.framework
+ - frameworks/ios/universal/firebase\_analytics.framework
  - You will need to either,
  1. Check "Copy items if needed" when adding the frameworks, or
  2. Add the framework path in "Framework Search Paths"