From b4a59a01e67072b76be6fec557efd03fb0a5cc3d Mon Sep 17 00:00:00 2001
From: Samuel Stow <samuelstow@google.com>
Date: Fri, 27 Sep 2019 15:54:50 -0700
Subject: [PATCH] Prepare for release of version 4.0

PiperOrigin-RevId: 271665130
---
 ChangeLog.txt                                 | 19 +++++++++++++++++++
 .../app/src/main/AndroidManifest.xml          |  3 +--
 .../Assets/GoogleMobileAds/Api/AdRequest.cs   |  2 +-
 .../Editor/GoogleMobileAdsDependencies.xml    |  4 ++--
 .../Editor/ManifestProcessor.cs               |  6 ++----
 .../GoogleMobileAdsPlugin/AndroidManifest.xml |  8 +-------
 6 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 161f91f69..ff973f337 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,24 @@
 Google Mobile Ads Unity Plugin Change Log
 
+**************
+Version 4.0.0
+**************
+
+Plugin:
+- Breaking change: The Android library included in this plugin is now distributed as an aar, and
+  lives at `Assets/Plugins/Android/googlemobileads-unity.aar'. If you are upgrading from a previous
+  version, remove the `Assets/Plugins/Android/GoogleMobileAdsPlugin' folder prior to importing this
+  latest version of the plugin.
+- Added proguard support on Android.
+- Update Android Google Mobile Ads SDK version to 18.2.0.
+- Fixed a bug where the AdSize.SMART_BANNER banner size did not work on Unity 2019.2+.
+- Added assertion to stop Android builds when Google Mobile Ads settings are invalid.
+
+Built and tested with:
+- Google Play services 18.2.0
+- Google Mobile Ads iOS SDK 7.50.0
+- Unity Jar Resolver 1.2.125
+
 **************
 Version 3.18.3
 **************
diff --git a/source/android-library/app/src/main/AndroidManifest.xml b/source/android-library/app/src/main/AndroidManifest.xml
index e703d1800..2278476b1 100644
--- a/source/android-library/app/src/main/AndroidManifest.xml
+++ b/source/android-library/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 This Google Mobile Ads plugin library manifest will get merged with your
-application's manifest, adding the necessary activity and permissions
+application's manifest, adding the necessary metadata
 required for displaying ads.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -9,4 +9,3 @@ required for displaying ads.
 
   <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
-
diff --git a/source/plugin/Assets/GoogleMobileAds/Api/AdRequest.cs b/source/plugin/Assets/GoogleMobileAds/Api/AdRequest.cs
index fd63c8db4..21c211a76 100644
--- a/source/plugin/Assets/GoogleMobileAds/Api/AdRequest.cs
+++ b/source/plugin/Assets/GoogleMobileAds/Api/AdRequest.cs
@@ -21,7 +21,7 @@ namespace GoogleMobileAds.Api
 {
     public class AdRequest
     {
-        public const string Version = "3.18.3";
+        public const string Version = "4.0.0";
         public const string TestDeviceSimulator = "SIMULATOR";
 
         private AdRequest(Builder builder)
diff --git a/source/plugin/Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml b/source/plugin/Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml
index 29e2acbd0..258936637 100644
--- a/source/plugin/Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml
+++ b/source/plugin/Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml
@@ -1,6 +1,6 @@
 <dependencies>
   <androidPackages>
-    <androidPackage spec="com.google.android.gms:play-services-ads:18.1.1">
+    <androidPackage spec="com.google.android.gms:play-services-ads:18.2.0">
       <repositories>
         <repository>https://maven.google.com/</repository>
       </repositories>
@@ -8,7 +8,7 @@
   </androidPackages>
 
   <iosPods>
-    <iosPod name="Google-Mobile-Ads-SDK" version="~> 7.48">
+    <iosPod name="Google-Mobile-Ads-SDK" version="~> 7.50">
       <sources>
         <source>https://github.com/CocoaPods/Specs</source>
       </sources>
diff --git a/source/plugin/Assets/GoogleMobileAds/Editor/ManifestProcessor.cs b/source/plugin/Assets/GoogleMobileAds/Editor/ManifestProcessor.cs
index 7236393ec..7dea99982 100644
--- a/source/plugin/Assets/GoogleMobileAds/Editor/ManifestProcessor.cs
+++ b/source/plugin/Assets/GoogleMobileAds/Editor/ManifestProcessor.cs
@@ -5,13 +5,11 @@
 using System.Linq;
 using System.Xml.Linq;
 
-#if UNITY_2018_1_OR_NEWER
 using UnityEditor;
+using UnityEditor.Build;
+#if UNITY_2018_1_OR_NEWER
 using UnityEditor.Build.Reporting;
-#else
-using UnityEditor;
 #endif
-using UnityEditor.Build;
 using UnityEngine;
 
 using GoogleMobileAds.Editor;
diff --git a/source/plugin/Assets/Plugins/Android/GoogleMobileAdsPlugin/AndroidManifest.xml b/source/plugin/Assets/Plugins/Android/GoogleMobileAdsPlugin/AndroidManifest.xml
index 986f6aee4..77ba64495 100644
--- a/source/plugin/Assets/Plugins/Android/GoogleMobileAdsPlugin/AndroidManifest.xml
+++ b/source/plugin/Assets/Plugins/Android/GoogleMobileAdsPlugin/AndroidManifest.xml
@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 This Google Mobile Ads plugin library manifest will get merged with your
-application's manifest, adding the necessary activity and permissions
+application's manifest, adding the necessary metadata
 required for displaying ads.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.unity.ads"
     android:versionName="1.0"
     android:versionCode="1">
-  <uses-sdk android:minSdkVersion="14"
-      android:targetSdkVersion="19" />
   <application>
     <uses-library android:required="false" android:name="org.apache.http.legacy"/>
-    <!-- Your AdMob App ID will look similar to this sample ID: ca-app-pub-3940256099942544~3347511713 -->
-    <meta-data
-    android:name="com.google.android.gms.ads.APPLICATION_ID"
-    android:value="[ADMOB APPLICATION ID]"/>
   </application>
 </manifest>