Version 3.0.2 of the Google Mobile Ads Plugin

googleads · Mar 3, 2016 · 4faac16 · 4faac16
1 parent 723fdd3
commit 4faac16
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 64 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,5 +1,24 @@
 Google Mobile Ads Unity Plugin Change Log
 
+*************
+Version 3.0.2
+*************
+- Fix compatibility issues with Google Mobile Ads iOS SDK 7.7.0
+
+Built and tested with:
+- Google Play Services 8.4.0
+- Google Mobile Ads iOS SDK 7.7.0
+
+*************
+Version 3.0.1
+*************
+- Update preprocessor directives for iOS post build setup
+- Add request agent to all ad requests from plugin
+
+Built and tested with:
+- Google Play Services 8.4.0
+- Google Mobile Ads iOS SDK 7.6.0
+
 *************
 Version 3.0.0
 *************

diff --git a/GoogleMobileAds.unitypackage b/GoogleMobileAds.unitypackage
diff --git a/source/android-library/app/src/main/java/com/google/unity/ads/RewardBasedVideo.java b/source/android-library/app/src/main/java/com/google/unity/ads/RewardBasedVideo.java
@@ -112,20 +112,6 @@ public void onRewardedVideoAdLeftApplication() {
         });
     }
 
-    /**
-     * Sets user id for reward based video ad.
-     *
-     * @param userId The userId to be used for reward based video ad requests.
-     */
-    public void setUserId(final String userId) {
-        activity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                rewardBasedVideo.setUserId(userId);
-            }
-        });
-    }
-
     /**
      * Loads a reward based video ad.
      *

diff --git a/source/plugin/Assets/GoogleMobileAds/Api/AdRequest.cs b/source/plugin/Assets/GoogleMobileAds/Api/AdRequest.cs
@@ -20,7 +20,7 @@ namespace GoogleMobileAds.Api
 {
     public class AdRequest
     {
-        public const string Version = "3.0.0";
+        public const string Version = "3.0.2";
         public const string TestDeviceSimulator = "SIMULATOR";
 
         public class Builder

diff --git a/source/plugin/Assets/GoogleMobileAds/Common/IRewardBasedVideoAdClient.cs b/source/plugin/Assets/GoogleMobileAds/Common/IRewardBasedVideoAdClient.cs
@@ -35,13 +35,6 @@ internal interface IRewardBasedVideoAdClient
         // Ad event fired when the reward based video ad is leaving the application.
         event EventHandler<EventArgs> OnAdLeavingApplication;
 
-        // UserId for reward based video ad requests.
-        String UserId
-        {
-            get;
-            set;
-        }
-
         // Creates a reward based video ad and adds it to the view hierarchy.
         void CreateRewardBasedVideoAd();
 

diff --git a/source/plugin/Assets/GoogleMobileAds/Platforms/Android/RewardBasedVideoAdClient.cs b/source/plugin/Assets/GoogleMobileAds/Platforms/Android/RewardBasedVideoAdClient.cs
@@ -26,7 +26,6 @@ namespace GoogleMobileAds.Android
     internal class RewardBasedVideoAdClient : AndroidJavaProxy, IRewardBasedVideoAdClient
     {
         private AndroidJavaObject androidRewardBasedVideo;
-        private String userId;
 
         public event EventHandler<EventArgs> OnAdLoaded = delegate {};
         public event EventHandler<AdFailedToLoadEventArgs> OnAdFailedToLoad = delegate {};
@@ -36,16 +35,6 @@ internal class RewardBasedVideoAdClient : AndroidJavaProxy, IRewardBasedVideoAdC
         public event EventHandler<Reward> OnAdRewarded = delegate {};
         public event EventHandler<EventArgs> OnAdLeavingApplication = delegate {};
 
-        public String UserId
-        {
-            get { return userId; }
-            set
-            {
-                userId = value;
-                SetUserId(value);
-            }
-        }
-
         public RewardBasedVideoAdClient()
             : base(Utils.UnityRewardBasedVideoAdListenerClassName)
         {
@@ -62,10 +51,6 @@ public void CreateRewardBasedVideoAd() {
             androidRewardBasedVideo.Call("create");
         }
 
-        public void SetUserId(string userId) {
-            androidRewardBasedVideo.Call("setUserId", userId);
-        }
-
         public void LoadAd(AdRequest request, string adUnitId) {
             androidRewardBasedVideo.Call("loadAd", Utils.GetAdRequestJavaObject(request), adUnitId);
         }
@@ -132,4 +117,5 @@ void onAdLeftApplication()
     }
 }
 
-#endif
+#endif
+
diff --git a/source/plugin/Assets/GoogleMobileAds/Platforms/iOS/Externs.cs b/source/plugin/Assets/GoogleMobileAds/Platforms/iOS/Externs.cs
@@ -127,7 +127,7 @@ internal static extern void GADUSetInterstitialCallbacks(
 
         [DllImport("__Internal")]
         internal static extern void GADURequestRewardBasedVideoAd(
-            IntPtr bannerView, IntPtr request, string adUnitId, string userId);
+            IntPtr bannerView, IntPtr request, string adUnitId);
 
         [DllImport("__Internal")]
         internal static extern void GADUSetRewardBasedVideoAdCallbacks(

diff --git a/source/plugin/Assets/GoogleMobileAds/Platforms/iOS/RewardBasedVideoAdClient.cs b/source/plugin/Assets/GoogleMobileAds/Platforms/iOS/RewardBasedVideoAdClient.cs
@@ -52,7 +52,6 @@ internal delegate void GADURewardBasedVideoAdWillLeaveApplicationCallback(
         public event EventHandler<EventArgs> OnAdLeavingApplication = delegate {};
 
         private IntPtr rewardBasedVideoAdPtr;
-        private string userId;
 
         // This property should be used when setting the rewardBasedVideoPtr.
         private IntPtr RewardBasedVideoAdPtr {
@@ -64,12 +63,6 @@ private IntPtr RewardBasedVideoAdPtr {
             }
         }
 
-        public String UserId
-        {
-            get { return userId; }
-            set { userId = value; }
-        }
-
         #region IGoogleMobileAdsRewardBasedVideoClient implementation
 
         // Creates a reward based video.
@@ -94,7 +87,7 @@ public void LoadAd(AdRequest request, string adUnitId)
         {
             IntPtr requestPtr = Utils.BuildAdRequest(request);
             Externs.GADURequestRewardBasedVideoAd(
-                RewardBasedVideoAdPtr, requestPtr, adUnitId, userId);
+                RewardBasedVideoAdPtr, requestPtr, adUnitId);
             Externs.GADURelease(requestPtr);
         }
 

diff --git a/source/plugin/Assets/PlayServicesResolver/Editor/DefaultResolver.cs b/source/plugin/Assets/PlayServicesResolver/Editor/DefaultResolver.cs
@@ -203,7 +203,8 @@ internal virtual string ProcessAar(string dir, string aarFile)
 
                 System.Diagnostics.Process p = new System.Diagnostics.Process();
                 p.StartInfo.UseShellExecute = false;
-                p.StartInfo.Arguments = "xvf " + Path.GetFullPath(aarFile);
+                p.StartInfo.Arguments = "xvf " +
+                    "\"" + Path.GetFullPath(aarFile) + "\"";
                 p.StartInfo.CreateNoWindow = true;
                 p.StartInfo.RedirectStandardOutput = false;
                 p.StartInfo.RedirectStandardError = true;

diff --git a/source/plugin/Assets/PlayServicesResolver/Editor/PlayServicesResolver.cs b/source/plugin/Assets/PlayServicesResolver/Editor/PlayServicesResolver.cs
@@ -93,9 +93,7 @@ static IResolver Resolver
                 if (_resolver == null)
                 {
                     // create the latest resolver known.
-                    Type type = Type.GetType(CurrentResolverName, true);
-
-                    _resolver = Activator.CreateInstance(type) as IResolver;
+                    _resolver = Activator.CreateInstance("GooglePlayServices", CurrentResolverName) as IResolver;
                 }
                 return _resolver;
             }

diff --git a/source/plugin/Assets/Plugins/iOS/GADUInterface.m b/source/plugin/Assets/Plugins/iOS/GADUInterface.m
@@ -59,8 +59,7 @@ GADUTypeBannerRef GADUCreateInterstitial(GADUTypeInterstitialClientRef *intersti
 
 /// Creates a GADURewardBasedVideo and returns its reference.
 GADUTypeRewardBasedVideoAdRef GADUCreateRewardBasedVideoAd(
-    GADUTypeRewardBasedVideoAdClientRef *rewardBasedVideoAdClient, const char *adUnitID,
-    const char *userID) {
+    GADUTypeRewardBasedVideoAdClientRef *rewardBasedVideoAdClient) {
   GADURewardBasedVideoAd *rewardBasedVideoAd = [[GADURewardBasedVideoAd alloc]
       initWithRewardBasedVideoClientReference:rewardBasedVideoAdClient];
   GADUObjectCache *cache = [GADUObjectCache sharedInstance];
@@ -232,14 +231,12 @@ void GADURequestInterstitial(GADUTypeInterstitialRef interstitial, GADUTypeReque
 
 /// Makes a rewarded video ad request.
 void GADURequestRewardBasedVideoAd(GADUTypeRewardBasedVideoAdRef rewardBasedVideoAd,
-                                   GADUTypeRequestRef request, const char *adUnitID,
-                                   const char *userID) {
+                                   GADUTypeRequestRef request, const char *adUnitID) {
   GADURewardBasedVideoAd *internalRewardBasedVideoAd =
       (__bridge GADURewardBasedVideoAd *)rewardBasedVideoAd;
   GADURequest *internalRequest = (__bridge GADURequest *)request;
   [internalRewardBasedVideoAd loadRequest:[internalRequest request]
-                             withAdUnitID:GADUStringFromUTF8String(adUnitID)
-                                   userID:GADUStringFromUTF8String(userID)];
+                             withAdUnitID:GADUStringFromUTF8String(adUnitID)];
 }
 
 /// Removes an object from the cache.

diff --git a/source/plugin/Assets/Plugins/iOS/GADURewardBasedVideoAd.h b/source/plugin/Assets/Plugins/iOS/GADURewardBasedVideoAd.h
@@ -39,9 +39,7 @@
 @property(nonatomic, assign) GADURewardBasedVideoAdWillLeaveApplicationCallback willLeaveCallback;
 
 /// Makes an ad request. Additional targeting options can be supplied with a request object.
-- (void)loadRequest:(GADRequest *)request
-       withAdUnitID:(NSString *)adUnitID
-             userID:(NSString *)userID;
+- (void)loadRequest:(GADRequest *)request withAdUnitID:(NSString *)adUnitID;
 
 /// Returns YES if the reward based video is ready to be displayed.
 - (BOOL)isReady;

diff --git a/source/plugin/Assets/Plugins/iOS/GADURewardBasedVideoAd.m b/source/plugin/Assets/Plugins/iOS/GADURewardBasedVideoAd.m
@@ -34,10 +34,8 @@ - (void)dealloc {
   _rewardBasedVideo.delegate = nil;
 }
 
-- (void)loadRequest:(GADRequest *)request
-       withAdUnitID:(NSString *)adUnitID
-             userID:(NSString *)userID {
-  [self.rewardBasedVideo loadRequest:request withAdUnitID:adUnitID userID:userID];
+- (void)loadRequest:(GADRequest *)request withAdUnitID:(NSString *)adUnitID {
+  [self.rewardBasedVideo loadRequest:request withAdUnitID:adUnitID];
 }
 
 - (BOOL)isReady {