Update preprocessor directives for iOS post build setup and add request agent to all ad requests from plugin.

Author: Ram Parameswaran

GoogleMobileAds.unitypackage

@@ -4,7 +4,7 @@
 using UnityEditor.Callbacks;
 using UnityEditor;
 
-#if UNITY_5
+#if (UNITY_5 && UNITY_IOS)
     using UnityEditor.iOS.Xcode;
 #endif
 
@@ -30,25 +30,27 @@ public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProj
 
         static void runPodUpdate(string path)
         {
-            // Copy the podfile into the project.
-            string podfile = "Assets/GoogleMobileAds/Editor/Podfile";
-            string destpodfile = path + "/Podfile";
-            if(!System.IO.File.Exists(destpodfile))
-            {
-                FileUtil.CopyFileOrDirectory(podfile, destpodfile);
-            }
+            #if !UNITY_CLOUD_BUILD
+                // Copy the podfile into the project.
+                string podfile = "Assets/GoogleMobileAds/Editor/Podfile";
+                string destpodfile = path + "/Podfile";
+                if(!System.IO.File.Exists(destpodfile))
+                {
+                    FileUtil.CopyFileOrDirectory(podfile, destpodfile);
+                }
 
-            try
-            {
-                CocoaPodHelper.Update(path);
-            }
-            catch (Exception e)
-            {
-                UnityEngine.Debug.Log("Could not create a new Xcode project with CocoaPods: " +
-                    e.Message);
-            }
+                try
+                {
+                    CocoaPodHelper.Update(path);
+                }
+                catch (Exception e)
+                {
+                    UnityEngine.Debug.Log("Could not create a new Xcode project with CocoaPods: " +
+                            e.Message);
+                }
+            #endif
 
-            #if UNITY_5
+            #if (UNITY_5 && UNITY_IOS)
                 string pbxprojPath = path + "/Unity-iPhone.xcodeproj/project.pbxproj";
                 PBXProject project = new PBXProject();
                 project.ReadFromString(File.ReadAllText(pbxprojPath));

source/plugin/Assets/GoogleMobileAds/Editor/PostProcessor.cs

@@ -141,13 +141,14 @@ public static AndroidJavaObject GetAdRequestJavaObject(AdRequest request)
                         "tagForChildDirectedTreatment",
                         request.TagForChildDirectedTreatment.GetValueOrDefault());
             }
+            // Denote that the request is coming from this Unity plugin.
+            adRequestBuilder.Call<AndroidJavaObject>("setRequestAgent",
+                    "unity-" + AdRequest.Version);
             AndroidJavaObject bundle = new AndroidJavaObject(BundleClassName);
             foreach (KeyValuePair<string, string> entry in request.Extras)
             {
                 bundle.Call("putString", entry.Key, entry.Value);
             }
-            // Denote that the request is coming from this Unity plugin.
-            bundle.Call("putInt", "unity", 1);
             AndroidJavaObject extras = new AndroidJavaObject(AdMobExtrasClassName, bundle);
             adRequestBuilder.Call<AndroidJavaObject>("addNetworkExtras", extras);
             return adRequestBuilder.Call<AndroidJavaObject>("build");

source/plugin/Assets/GoogleMobileAds/Platforms/Android/Utils.cs

@@ -44,6 +44,9 @@ internal static extern void GADUTagForChildDirectedTreatment(
         [DllImport("__Internal")]
         internal static extern void GADUSetExtra(IntPtr request, string key, string value);
 
+        [DllImport("__Internal")]
+        internal static extern void GADUSetRequestAgent(IntPtr request, string requestAgent);
+
         [DllImport("__Internal")]
         internal static extern void GADURelease(IntPtr obj);
 

source/plugin/Assets/GoogleMobileAds/Platforms/iOS/Externs.cs

@@ -92,33 +92,7 @@ public void CreateRewardBasedVideoAd()
         // Load an ad.
         public void LoadAd(AdRequest request, string adUnitId)
         {
-            IntPtr requestPtr = Externs.GADUCreateRequest();
-            foreach (string keyword in request.Keywords)
-            {
-                Externs.GADUAddKeyword(requestPtr, keyword);
-            }
-            foreach (string deviceId in request.TestDevices)
-            {
-                Externs.GADUAddTestDevice(requestPtr, deviceId);
-            }
-            if (request.Birthday.HasValue)
-            {
-                DateTime birthday = request.Birthday.GetValueOrDefault();
-                Externs.GADUSetBirthday(requestPtr, birthday.Year, birthday.Month, birthday.Day);
-            }
-            if (request.Gender.HasValue)
-            {
-                Externs.GADUSetGender(requestPtr, (int)request.Gender.GetValueOrDefault());
-            }
-            if (request.TagForChildDirectedTreatment.HasValue)
-            {
-                Externs.GADUTagForChildDirectedTreatment(
-                    requestPtr, request.TagForChildDirectedTreatment.GetValueOrDefault());
-            }
-            foreach (KeyValuePair<string, string> entry in request.Extras)
-            {
-                Externs.GADUSetExtra(requestPtr, entry.Key, entry.Value);
-            }
+            IntPtr requestPtr = Utils.BuildAdRequest(request);
             Externs.GADURequestRewardBasedVideoAd(
                 RewardBasedVideoAdPtr, requestPtr, adUnitId, userId);
             Externs.GADURelease(requestPtr);

source/plugin/Assets/GoogleMobileAds/Platforms/iOS/RewardBasedVideoAdClient.cs

@@ -50,6 +50,7 @@ public static IntPtr BuildAdRequest(AdRequest request)
             {
                 Externs.GADUSetExtra(requestPtr, entry.Key, entry.Value);
             }
+            Externs.GADUSetRequestAgent(requestPtr, "unity-" + AdRequest.Version);
             return requestPtr;
         }
     }