Merge pull request #32 from bidmachine/release/3.3.0

Release/3.3.0

Author: maninbox1

Assets/BidMachine/Api/BidMachine.cs

@@ -20,7 +20,7 @@ private static IBidMachine GetInstance()
             return client ??= BidMachineClientFactory.GetBidMachine();
         }
 
-        public static string BIDMACHINE_UNITY_PLUGIN_VERSION = "3.2.1.0";
+        public static string BIDMACHINE_UNITY_PLUGIN_VERSION = "3.3.0.0";
 
         /// <summary>
         /// Initializes BidMachine SDK.

Assets/BidMachine/Demo/BidMachineController.cs

@@ -21,19 +21,19 @@ public class BidMachineController : MonoBehaviour
     private BannerView bannerView;
     private readonly IAdListener<IBannerView> bannerListener = new BannerListener();
     private IAdRequest bannerRequest;
-    private readonly IAdRequestListener bannerRequestListener = new BannerRequestListener();
+    private readonly IAdAuctionRequestListener bannerRequestListener = new BannerRequestListener();
 
     private InterstitialAd interstitialAd;
     private readonly IInterstitialAdListener interstitialListener =
         new InterstitialListener();
     private IAdRequest interstitialRequest;
-    private readonly IAdRequestListener interstitialRequestListener =
+    private readonly IAdAuctionRequestListener interstitialRequestListener =
         new InterstitialRequestListener();
 
     private RewardedAd rewardedAd;
     private readonly IRewardedAdListener rewardedListener = new RewardedAdListener();
     private IAdRequest rewardedRequest;
-    private readonly IAdRequestListener rewardedRequestListener = new RewardedRequestListener();
+    private readonly IAdAuctionRequestListener rewardedRequestListener = new RewardedRequestListener();
 
     private void Start()
     {
@@ -324,7 +324,7 @@ public void onAdShown(IBannerView ad)
         }
     }
 
-    private class BannerRequestListener : IAdRequestListener
+    private class BannerRequestListener : IAdAuctionRequestListener
     {
         public void onRequestExpired(IAdRequest request)
         {
@@ -380,7 +380,7 @@ public void onAdShown(IInterstitialAd ad)
         }
     }
 
-    private class InterstitialRequestListener : IAdRequestListener
+    private class InterstitialRequestListener : IAdAuctionRequestListener
     {
         public void onRequestExpired(IAdRequest request)
         {
@@ -435,13 +435,13 @@ public void onAdShown(IRewardedAd ad)
             Debug.Log("BidMachine: RewardedAd: OnAdShown");
         }
 
-        public void onAdRewarded(IRewardedAd ad) 
+        public void onAdRewarded(IRewardedAd ad)
         {
             Debug.Log($"BidMachine: RewardedAd: OnAdRewarded");
         }
     }
 
-    private class RewardedRequestListener : IAdRequestListener
+    private class RewardedRequestListener : IAdAuctionRequestListener
     {
         public void onRequestExpired(IAdRequest request)
         {

Assets/BidMachine/Editor/BidMachineDependencies.xml

@@ -1,13 +1,13 @@
 <dependencies>
     <iosPods>
-        <iosPod name='BidMachine' version='3.2.1' minTargetSdk='13.0'/>
+        <iosPod name='BidMachine' version='3.3.0' minTargetSdk='13.0'/>
         <sources>
 			<source>[email protected]:bidmachine/CocoaPods-Specs.git</source>
 		</sources>
     </iosPods>
     <androidPackages>
-        <androidPackage spec='io.bidmachine:ads:3.2.1'/>
-        <androidPackage spec='io.bidmachine:ads.extensions.unity:3.2.1.3'/>
+        <androidPackage spec='io.bidmachine:ads:3.3.0'/>
+        <androidPackage spec='io.bidmachine:ads.extensions.unity:3.3.0.3'/>
         <repositories>
             <repository>https://artifactory.bidmachine.io/bidmachine</repository>
         </repositories>

Assets/BidMachine/Editor/RemoveHelper.cs

@@ -1,6 +1,6 @@
+#if UNITY_EDITOR
 #pragma warning disable 0649
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Text.RegularExpressions;
 using UnityEditor;
@@ -37,7 +37,7 @@ public static void RemovePlugin(bool isCleanBeforeUpdate = false)
                 });
                 new List<string>(Directory.GetFiles("Assets/Plugins/Android")).ForEach(file =>
                 {
-                    Regex re = new Regex("bidmachine", RegexOptions.IgnoreCase);
+                    Regex re = new("bidmachine", RegexOptions.IgnoreCase);
                     if (re.IsMatch(file))
                         File.Delete(file);
                     File.Delete(file + ".meta");
@@ -50,3 +50,4 @@ public static void RemovePlugin(bool isCleanBeforeUpdate = false)
         }
     }
 }
+#endif

Assets/Plugins/Android/mainTemplate.gradle

@@ -4,8 +4,8 @@ apply plugin: 'com.android.library'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 // Android Resolver Dependencies Start
-    implementation 'io.bidmachine:ads.extensions.unity:3.2.1.3' // Assets/BidMachine/Editor/BidMachineDependencies.xml:10
-    implementation 'io.bidmachine:ads:3.2.1' // Assets/BidMachine/Editor/BidMachineDependencies.xml:9
+    implementation 'io.bidmachine:ads.extensions.unity:3.3.0.3' // Assets/BidMachine/Editor/BidMachineDependencies.xml:10
+    implementation 'io.bidmachine:ads:3.3.0' // Assets/BidMachine/Editor/BidMachineDependencies.xml:9
 // Android Resolver Dependencies End
 **DEPS**}
 

Assets/Plugins/iOS/BidMachine/Utils/AdRequest/AdRequestLoader.swift

@@ -11,13 +11,13 @@ import BidMachine
 final class AdRequestLoader<T: BidMachineAdProtocol> {
     enum RequestError: Error {
         case noAd
-        case unableToGetConfig
+        case unableToGetPlacement
         case underlying(Error)
         case unableToCastToProvidedType
     }
-
+    
     typealias Ad = T
-
+    
     private let bidMachine: BidMachineSdk
 
     init(bidMachine: BidMachineSdk) {
@@ -28,42 +28,54 @@ final class AdRequestLoader<T: BidMachineAdProtocol> {
         request: AdRequest,
         callback: @escaping (Result<Ad, RequestError>) -> Void
     ) {
-        guard let config = self.createConfiguration(for: request) else {
-            callback(.failure(.unableToGetConfig))
-            return
-        }
-        bidMachine.ad(config) { ad, error in
-            if let error {
-                callback(.failure(.underlying(error)))
-                return
-            }
-            guard let ad else {
-                callback(.failure(.noAd))
-                return
+        do {
+            let adRequest = try createAuctionRequest(from: request)
+            bidMachine.ad(request: adRequest) { ad, error in
+                if let error = error {
+                    callback(.failure(.underlying(error)))
+                    return
+                }
+                guard let ad = ad else {
+                    callback(.failure(.noAd))
+                    return
+                }
+                guard let casted = ad as? Ad else {
+                    callback(.failure(.unableToCastToProvidedType))
+                    return
+                }
+                callback(.success(casted))
             }
-            guard let casted = ad as? Ad else {
-                callback(.failure(.unableToCastToProvidedType))
-                return
-            }
-            callback(.success(casted))
+        } catch let error as RequestError {
+            callback(.failure(error))
+        } catch {
+            callback(.failure(.underlying(error)))
         }
     }
-
-    private func createConfiguration(for adRequest: AdRequest) -> BidMachineRequestConfigurationProtocol? {
-        guard let config = try? bidMachine.requestConfiguration(adRequest.format) else {
-            return nil
-        }
-        config.populate { builder in
-            builder.withUnitConfigurations(adRequest.configurations)
+    
+    private func createAuctionRequest(from adRequest: AdRequest) throws -> BidMachineAuctionRequest {
+#warning("timeout setting is not available since 3.3.0")
+        
+        // Get placement safely
+        guard let placement = try? bidMachine.placement(from: adRequest.format, builder: { builder in
+            if let placementId = adRequest.placementId {
+                builder.withPlacementId(placementId)
+            }
             builder.withCustomParameters(adRequest.customParams)
-
+        }) else {
+            throw RequestError.unableToGetPlacement
+        }
+        
+        // Create auction request
+        let request = bidMachine.auctionRequest(placement: placement) { builder in
             adRequest.priceFloors.forEach {
                 builder.appendPriceFloor($0.value, $0.key)
             }
-            adRequest.payload.apply { builder.withPayload($0) }
-            adRequest.placementId.apply { builder.withPlacementId($0) }
-            adRequest.timeout.apply { builder.withTimeout($0) }
+            if let payload = adRequest.payload {
+                builder.withPayload(payload)
+            }
+            builder.withUnitConfigurations(adRequest.configurations)
         }
-        return config
+        
+        return request
     }
 }

Assets/README.md

@@ -4,7 +4,7 @@
 
 1.1 Download the latest version of the BidMachine Unity Plugin, which includes the newest Android and iOS BidMachine SDK with significant improvements.
 
-1.2 To import the BidMachine Unity plugin, either double-click on the `BidMachine-Unity-Plugin-3.2.1.0.unitypackage` file or navigate to `Assets → Import Package → Custom Package` in the Unity editor. Ensure all files are selected in the Importing Package window, then click `Import`.
+1.2 To import the BidMachine Unity plugin, either double-click on the `BidMachine-Unity-Plugin-3.3.0.0.unitypackage` file or navigate to `Assets → Import Package → Custom Package` in the Unity editor. Ensure all files are selected in the Importing Package window, then click `Import`.
 
 ## Step 2. Project configuration
 

ProjectSettings/AndroidResolverDependencies.xml

@@ -1,7 +1,7 @@
 <dependencies>
   <packages>
-    <package>io.bidmachine:ads.extensions.unity:3.2.1.3</package>
-    <package>io.bidmachine:ads:3.2.1</package>
+    <package>io.bidmachine:ads.extensions.unity:3.3.0.3</package>
+    <package>io.bidmachine:ads:3.3.0</package>
   </packages>
   <files />
   <settings>

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.50f1
-m_EditorVersionWithRevision: 2022.3.50f1 (c3db7f8bf9b1)
+m_EditorVersion: 2022.3.42f1
+m_EditorVersionWithRevision: 2022.3.42f1 (2dcb6a0abc42)