From 993432c3f1120a236894f2fc754b6d1dc9ddf5c8 Mon Sep 17 00:00:00 2001
From: Liming Xie <liming.xie@gmail.com>
Date: Wed, 31 May 2017 23:34:39 +0800
Subject: [PATCH 1/4] create branch for admob with firebase

---
 README.md    | 4 ++++
 package.json | 6 +++---
 plugin.xml   | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index d8acf8c..1db5c00 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,10 @@ Cordova / PhoneGap Plugin for Google Ads, including AdMob / DFP (doubleclick for
 
 This Cordova / PhoneGap plugin enables displaying mobile Ads with single line of javascript code. Designed for the use in HTML5-based cross-platform hybrid games and other applications.
 
+This version is used with Firebase, and compatible with other plugins using Firebase, such as FCM.
+
+If you don't plan to include Firebase in your app, use the standalone version cordova-plugin-admobpro.
+
 ## History
 
 Community-driven project. Designed and maintained by [Raymond Xie](http://github.com/floatinghotpot/) since August 2014. It also features integration in AngularJS projects via [ngCordova] (http://www.ngcordova.com).
diff --git a/package.json b/package.json
index 9ad9366..7e51e76 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "cordova-plugin-admobpro",
+  "name": "cordova-plugin-admobpro-firebase",
   "version": "2.29.0",
-  "description": "Ultimate Cordova Plugin for Google AdMob and DFP to monetize hybrid apps. Show mobile Ad with single line of JavaScript. Compatible with Cordova CLI, PhoneGap Build, Intel XDK/Crosswalk, Google ChromeApp, Ionic, Meteor, etc.",
+  "description": "Ultimate Cordova Plugin for Google AdMob and DFP to monetize hybrid apps. Used with Firebase. If you don't plan to include Firebase in your app, use the standalone version cordova-plugin-admobpro.",
   "cordova": {
-    "id": "cordova-plugin-admobpro",
+    "id": "cordova-plugin-admobpro-firebase",
     "platforms": [
       "android",
       "ios",
diff --git a/plugin.xml b/plugin.xml
index af76ba4..92d4985 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,11 +2,11 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
-        id="cordova-plugin-admobpro"
+        id="cordova-plugin-admobpro-firebase"
         version="2.29.0">
       
     <name>AdMob Plugin Pro</name>
-    <description>Ultimate Cordova Plugin for Google AdMob and DFP to monetize hybrid apps. Show mobile Ad with single line of JavaScript. Compatible with Cordova CLI, PhoneGap Build, Intel XDK/Crosswalk, Google ChromeApp, Ionic, Meteor, etc.</description>
+    <description>Ultimate Cordova Plugin for Google AdMob and DFP to monetize hybrid apps. Used with Firebase. If you don't plan to include Firebase in your app, use the standalone version cordova-plugin-admobpro.</description>
     <author>Liming Xie</author>
     <license>MIT</license>
     <keywords>rjfun,admob,google,ad</keywords>
@@ -45,7 +45,7 @@
         <source-file src="src/android/AdMobPlugin.java" target-dir="src/com/rjfun/cordova/admob" />
 
         <!-- cordova CLI using gradle and it working well -->
-        <framework src="com.google.android.gms:play-services-ads:+" />
+        <framework src="com.google.firebase:firebase-ads:+" />
         <!-- but unfortunately, build.phonegap.com, Intel XDK, and some other tools still use ant -->
         <!-- dependency id="cordova-plugin-googleplayservices"/ -->
      </platform>
@@ -72,7 +72,7 @@
         <source-file src="src/android/AdMobPlugin.java" target-dir="src/com/rjfun/cordova/admob" />
 
         <!-- amazon-fireos still using ant, AND default android r19 -->
-        <!-- framework src="com.google.android.gms:play-services-ads:+" /-->
+        <!-- framework src="com.google.firebase:firebase-ads:+" /-->
         <dependency id="cordova-plugin-googleplayservices"/>
      </platform>
 

From c599f2ef8f2e413d9102d72240925e4e5230f00d Mon Sep 17 00:00:00 2001
From: Liming Xie <liming.xie@gmail.com>
Date: Mon, 13 Nov 2017 23:48:39 +0800
Subject: [PATCH 2/4] merge recent changes

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index c5b9684..0d3545e 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   "name": "cordova-plugin-admobpro-firebase",
   "version": "2.29.28",
   "description": "Ultimate Cordova Plugin for Google AdMob and DFP to monetize hybrid apps. Show mobile Ad with single line of JavaScript. Compatible with Cordova CLI, PhoneGap Build, Intel XDK/Crosswalk, Google ChromeApp, Ionic, Meteor, etc.",

From 856d1d7995ce29beaaef62ca1a5203bcdd440bfe Mon Sep 17 00:00:00 2001
From: Liming Xie <liming.xie@gmail.com>
Date: Tue, 24 Apr 2018 23:15:31 +0800
Subject: [PATCH 3/4] merge update

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index df7324f..caa4d42 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   "name": "cordova-plugin-admobpro-firebase",
   "version": "2.31.5",
   "description": "Ultimate Cordova Plugin for Google AdMob and DFP to monetize hybrid apps. Show mobile Ad with single line of JavaScript. Compatible with Cordova CLI, PhoneGap Build, Intel XDK/Crosswalk, Google ChromeApp, Ionic, Meteor, etc.",

From 37dda73875b80d0f6bdb4f4077dfd7692e9abe68 Mon Sep 17 00:00:00 2001
From: Liming Xie <liming.xie@gmail.com>
Date: Wed, 24 Oct 2018 21:29:49 +0800
Subject: [PATCH 4/4] fix

---
 package.json |  2 +-
 plugin.xml   | 19 +------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index dd75fc9..22495b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-admobpro-firebase",
-  "version": "2.35.3",
+  "version": "2.35.4",
   "description": "Ultimate Cordova Plugin for Google AdMob and DFP to monetize hybrid apps. Show mobile Ad with single line of JavaScript. Compatible with Cordova CLI, PhoneGap Build, Intel XDK/Crosswalk, Google ChromeApp, Ionic, Meteor, etc.",
   "cordova": {
     "id": "cordova-plugin-admobpro-firebase",
diff --git a/plugin.xml b/plugin.xml
index 02c399c..162ff01 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-admobpro-firebase"
-        version="2.35.3">
+        version="2.35.4">
       
     <name>AdMob Plugin Pro</name>
     <description>Ultimate Cordova Plugin for Google AdMob and DFP to monetize hybrid apps. Used with Firebase. If you don't plan to include Firebase in your app, use the standalone version cordova-plugin-admobpro.</description>
@@ -56,17 +56,7 @@
         </config-file>
         <source-file src="src/android/AdMobMediation.java" target-dir="src/com/rjfun/cordova/admob" />
         <source-file src="src/android/AdMobPlugin.java" target-dir="src/com/rjfun/cordova/admob" />
-<<<<<<< HEAD
-
-        <!-- cordova CLI using gradle and it working well -->
-	    <preference name="PLAY_SERVICES_VERSION" default="16.0.0"/>
-	    <framework src="com.google.firebase:firebase-ads:$PLAY_SERVICES_VERSION" />
-        <!-- but unfortunately, build.phonegap.com, Intel XDK, and some other tools still use ant -->
-        <!-- dependency id="cordova-plugin-googleplayservices"/ -->
-     </platform>
-=======
     </platform>
->>>>>>> master
      
     <!-- same as android, but use ant instead of gradle -->
     <platform name="amazon-fireos">
@@ -92,13 +82,6 @@
         </config-file>
         <source-file src="src/android/AdMobMediation.java" target-dir="src/com/rjfun/cordova/admob" />
         <source-file src="src/android/AdMobPlugin.java" target-dir="src/com/rjfun/cordova/admob" />
-<<<<<<< HEAD
-
-        <!-- amazon-fireos still using ant, AND default android r19 -->
-        <!-- framework src="com.google.firebase:firebase-ads:+" /-->
-        <dependency id="cordova-plugin-googleplayservices"/>
-=======
->>>>>>> master
      </platform>
 
     <!-- ios -->