Merge pull request #74 from Poing-Studios/change-request-agent

Change request agent
poingstudios · Nov 11, 2023 · c503750 · c503750
2 parents ab568a6 + db9263d
commit c503750
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 29 deletions.
diff --git a/.github/workflows/release_ios.yml b/.github/workflows/release_ios.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: "macos-latest"
     strategy:
       matrix:
-        GODOT_VERSIONS: [4.1, 4.1.1, 4.1.2]
+        GODOT_VERSIONS: [4.1, 4.1.1, 4.1.2, 4.1.3]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/PoingGodotAdMob/Podfile.lock b/PoingGodotAdMob/Podfile.lock
@@ -1,24 +1,24 @@
 PODS:
   - AdColony (4.9.0)
   - FBAudienceNetwork (6.12.0)
-  - Google-Mobile-Ads-SDK (10.12.0):
+  - Google-Mobile-Ads-SDK (10.13.0):
     - GoogleAppMeasurement (< 11.0, >= 7.0)
     - GoogleUserMessagingPlatform (>= 1.1)
-  - GoogleAppMeasurement (10.16.0):
-    - GoogleAppMeasurement/AdIdSupport (= 10.16.0)
+  - GoogleAppMeasurement (10.17.0):
+    - GoogleAppMeasurement/AdIdSupport (= 10.17.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
     - GoogleUtilities/MethodSwizzler (~> 7.11)
     - GoogleUtilities/Network (~> 7.11)
     - "GoogleUtilities/NSData+zlib (~> 7.11)"
     - nanopb (< 2.30910.0, >= 2.30908.0)
-  - GoogleAppMeasurement/AdIdSupport (10.16.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 10.16.0)
+  - GoogleAppMeasurement/AdIdSupport (10.17.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 10.17.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
     - GoogleUtilities/MethodSwizzler (~> 7.11)
     - GoogleUtilities/Network (~> 7.11)
     - "GoogleUtilities/NSData+zlib (~> 7.11)"
     - nanopb (< 2.30910.0, >= 2.30908.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (10.16.0):
+  - GoogleAppMeasurement/WithoutAdIdSupport (10.17.0):
     - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
     - GoogleUtilities/MethodSwizzler (~> 7.11)
     - GoogleUtilities/Network (~> 7.11)
@@ -34,33 +34,33 @@ PODS:
     - Google-Mobile-Ads-SDK (~> 10.0)
     - VungleSDK-iOS (= 6.12.3)
   - GoogleUserMessagingPlatform (2.1.0)
-  - GoogleUtilities/AppDelegateSwizzler (7.11.5):
+  - GoogleUtilities/AppDelegateSwizzler (7.12.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.11.5):
+  - GoogleUtilities/Environment (7.12.0):
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.11.5):
+  - GoogleUtilities/Logger (7.12.0):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (7.11.5):
+  - GoogleUtilities/MethodSwizzler (7.12.0):
     - GoogleUtilities/Logger
-  - GoogleUtilities/Network (7.11.5):
+  - GoogleUtilities/Network (7.12.0):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.11.5)"
-  - GoogleUtilities/Reachability (7.11.5):
+  - "GoogleUtilities/NSData+zlib (7.12.0)"
+  - GoogleUtilities/Reachability (7.12.0):
     - GoogleUtilities/Logger
-  - nanopb (2.30909.0):
-    - nanopb/decode (= 2.30909.0)
-    - nanopb/encode (= 2.30909.0)
-  - nanopb/decode (2.30909.0)
-  - nanopb/encode (2.30909.0)
+  - nanopb (2.30909.1):
+    - nanopb/decode (= 2.30909.1)
+    - nanopb/encode (= 2.30909.1)
+  - nanopb/decode (2.30909.1)
+  - nanopb/encode (2.30909.1)
   - PromisesObjC (2.3.1)
   - VungleSDK-iOS (6.12.3)
 
 DEPENDENCIES:
-  - Google-Mobile-Ads-SDK (= 10.12.0)
+  - Google-Mobile-Ads-SDK (= 10.13.0)
   - GoogleMobileAdsMediationAdColony (= 4.9.0.2)
   - GoogleMobileAdsMediationFacebook (= 6.12.0.1)
   - GoogleMobileAdsMediationVungle (= 6.12.3.0)
@@ -83,14 +83,14 @@ SPEC REPOS:
 SPEC CHECKSUMS:
   AdColony: 4f3738dc633d7aaa8ec60729df973076cc8e97ed
   FBAudienceNetwork: e0fcc9091fced34910ed0b6da06f129db46ac9e6
-  Google-Mobile-Ads-SDK: 976fdf273815674eed30b8aafffedb3c25b055e4
-  GoogleAppMeasurement: 079d7632810e9d9704a99932547ba1554acc4342
+  Google-Mobile-Ads-SDK: 517003a1a2430005da3e85df4d061cd7de107a5a
+  GoogleAppMeasurement: 4dcddfc7f102825c1c4e6422cb35567b101881a7
   GoogleMobileAdsMediationAdColony: 739e508a44288b54d59d4deb211340008d46d8f5
   GoogleMobileAdsMediationFacebook: d0dfe773d6009ddd2ee0dfded681a7a2c56a315b
   GoogleMobileAdsMediationVungle: 967c32401bc395dc66fd4f2f177c594165c3802f
   GoogleUserMessagingPlatform: dce302b8f1b84d6e945812ee7a15c3f65a102cbf
-  GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
-  nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
+  GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
+  nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
   VungleSDK-iOS: 27725029a42dfb9e39c67956637233fde1ee1797
 

diff --git a/PoingGodotAdMob/src/ads/config/libs/ads-pods.txt b/PoingGodotAdMob/src/ads/config/libs/ads-pods.txt
@@ -1 +1 @@
-pod 'Google-Mobile-Ads-SDK', '10.12.0'
+pod 'Google-Mobile-Ads-SDK', '10.13.0'
diff --git a/PoingGodotAdMob/src/ads/converters/GodotDictionaryToObject.mm b/PoingGodotAdMob/src/ads/converters/GodotDictionaryToObject.mm
@@ -42,8 +42,13 @@ + (GADAdSize)convertDictionaryToGADAdSize:(Dictionary)adSizeDictionary{
 
 + (GADRequest *)convertDictionaryToGADRequest:(Dictionary)adRequestDictionary withKeywords:(PackedStringArray)keywords{
     GADRequest *request = [GADRequest request];
-    request.requestAgent = [NSString stringWithFormat:@"poingstudiosgodot-%@", PLUGIN_VERSION];
-
+    String googleRequestAgent = adRequestDictionary["google_request_agent"];
+
+    NSString *requestAgentNSString = [NSString stringWithUTF8String:googleRequestAgent.utf8().get_data()];
+
+    request.requestAgent = requestAgentNSString;
+    NSLog(@"requestAgentNSString: %@", requestAgentNSString);
+
     Dictionary mediationExtras = adRequestDictionary["mediation_extras"];
 
     for (int i = 0; i < mediationExtras.size(); i++) {
@@ -149,7 +154,6 @@ + (UMPDebugSettings *)convertDictionaryToUMPDebugSettings:(Dictionary)umpDebugSe
     }
 
     debugSettings.testDeviceIdentifiers = convertedArray;
-    NSLog(@"finish");
 
     return debugSettings;
 }

diff --git a/PoingGodotAdMob/src/ads/helpers/PluginConfiguration.h b/PoingGodotAdMob/src/ads/helpers/PluginConfiguration.h
@@ -23,6 +23,6 @@
 #ifndef PluginConfiguration_h
 #define PluginConfiguration_h
 
-static NSString *const PLUGIN_VERSION = @"3.0.1";
+static NSString *const PLUGIN_VERSION = @"3.0.2";
 
 #endif /* PluginConfiguration_h */