Merge branch 'master' into Fyber-adapter-fix

lovoo · Sep 15, 2021 · edd979c · edd979c
2 parents a467a70 + c8ea5a6
commit edd979c
Show file tree

Hide file tree

Showing 35 changed files with 411 additions and 511 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 *.podspec
+.DS_Store
diff --git a/AdMob/CHANGELOG.md b/AdMob/CHANGELOG.md
@@ -1,4 +1,7 @@
 ## Changelog
+  * 8.10.0.0
+    * This version of the adapters has been certified with AdMob 8.10.0 and MoPub 5.18.0.
+
   * 8.9.0.0
     * This version of the adapters has been certified with AdMob 8.9.0 and MoPub 5.18.0.
 

diff --git a/AdMob/GoogleAdMobAdapterConfiguration.m b/AdMob/GoogleAdMobAdapterConfiguration.m
@@ -40,7 +40,7 @@ + (void)updateInitializationParameters:(NSDictionary *)parameters {
 #pragma mark - MPAdapterConfiguration
 
 - (NSString *)adapterVersion {
-    return @"8.9.0.0";
+    return @"8.10.0.0";
 }
 
 - (NSString *)biddingToken {

diff --git a/AppLovin/AppLovinAdapterConfiguration.m b/AppLovin/AppLovinAdapterConfiguration.m
@@ -20,7 +20,7 @@ @implementation AppLovinAdapterConfiguration
 
 static NSString *const kAppLovinSDKInfoPlistKey = @"AppLovinSdkKey";
 static NSString *const kAdapterErrorDomain = @"com.mopub.mopub-ios-sdk.mopub-applovin-adapters";
-static NSString *const kAdapterVersion = @"10.3.4.0";
+static NSString *const kAdapterVersion = @"10.3.5.0";
 
 static NSString *gSdkKey = nil;
 

diff --git a/AppLovin/CHANGELOG.md b/AppLovin/CHANGELOG.md
@@ -1,4 +1,7 @@
 ## Changelog
+   * 10.3.5.0
+     * This version of the adapters has been certified with AppLovin SDK 10.3.5 and MoPub SDK 5.18.0.
+
    * 10.3.4.0
      * This version of the adapters has been certified with AppLovin SDK 10.3.4 and MoPub SDK 5.18.0.
 

diff --git a/Fyber/CHANGELOG.md b/Fyber/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Changelog
-* 7.8.8.0
+* 7.8.9.0
+  * This version of the adapters has been certified with Fyber Marketplace 7.8.9 and MoPub SDK 5.18.0.
+
+  * 7.8.8.0
   * Added support for DV360 SCAR integration for full screen ads.
   * iOS 14.5 and SKAdNetwork 2.2 support - Xcode 12.5+ is not required anymore, 12.4+ required (in contrary to version 7.8.5).
   * Changed the SDK frameworks type from “.framework” to “.xcframework”. When integrating manually: “IASDKResources.bundle” is now inside ‘IASDKCore.xcframework’ and should be taken from there.

diff --git a/Fyber/FyberAdapterConfiguration.m b/Fyber/FyberAdapterConfiguration.m
@@ -28,7 +28,7 @@ + (void)initialize {
 #pragma mark - MPAdapterConfiguration
 
 - (NSString *)adapterVersion {
-    return @"7.8.8.0";
+    return @"7.8.9.0";
 }
 
 - (NSString *)biddingToken {

diff --git a/InMobi/CHANGELOG.md b/InMobi/CHANGELOG.md
@@ -1,4 +1,7 @@
 ## Changelog
+* 9.2.1.0
+     * This version of the adapters has been certified with InMobi 9.2.1 and MoPub SDK 5.18.0.
+
 * 9.2.0.1
      * Adjust minimium MoPub SDK version from 5.17.0 to 5.17. This allows integrations to use MoPub 5.17.x up to (but not including) 6.0.
      * Service release. No new features. 

diff --git a/InMobi/InMobiAdapterConfiguration.m b/InMobi/InMobiAdapterConfiguration.m
@@ -18,7 +18,7 @@ @implementation InMobiAdapterConfiguration
 #pragma mark - MPAdapterConfiguration
 
 - (NSString *)adapterVersion {
-    return @"9.2.0.1";
+    return @"9.2.1.0";
 }
 
 - (NSString *)biddingToken {

diff --git a/IronSource/CHANGELOG.md b/IronSource/CHANGELOG.md
@@ -1,4 +1,7 @@
 ## Changelog
+* 7.1.10.0.0
+    * This version of the adapters has been certified with ironSource 7.1.10.0 and MoPub SDK 5.18.0.
+
 * 7.1.8.0.0
     * This version of the adapters has been certified with ironSource 7.1.8.0 and MoPub SDK 5.18.0.
 

diff --git a/IronSource/IronSourceAdapterConfiguration.m b/IronSource/IronSourceAdapterConfiguration.m
@@ -32,7 +32,7 @@ + (void)updateInitializationParameters:(NSDictionary *)parameters {
 #pragma mark - MPAdapterConfiguration
 
 - (NSString *)adapterVersion {
-    return @"7.1.8.0.0";
+    return @"7.1.10.0.0";
 }
 
 - (NSString *)biddingToken {

diff --git a/Mintegral/CHANGELOG.md b/Mintegral/CHANGELOG.md
@@ -1,4 +1,10 @@
 ## Changelog
+* 7.0.1.0.0
+   * This version of the adapters has been certified with Mintegral 7.0.1.0 and MoPub 5.18.0.
+
+* 7.0.0.0.0
+   * This version of the adapters has been certified with Mintegral 7.0.0.0 and MoPub 5.18.0.
+
 * 6.9.6.0.0
    * This version of the adapters has been certified with Mintegral 6.9.6.0 and MoPub 5.18.0.
 

diff --git a/Mintegral/MintegralAdapterConfiguration.m b/Mintegral/MintegralAdapterConfiguration.m
@@ -17,7 +17,7 @@ @interface MintegralAdapterConfiguration()
 
 static NSString * const MintegralConfigurationKeyAppIdKey = @"appId";
 static NSString * const MintegralConfigurationKeyAppKey = @"appKey";
-static NSString * const kAdapterVersion = @"6.9.6.0.0";
+static NSString * const kAdapterVersion = @"7.0.1.0.0";
 static NSString * const kPluginNumber = @"Y+H6DFttYrPQYcIA+F2F+F5/Hv==";
 static NSString * const kNetworkName = @"mintegral";
 

diff --git a/Pangle/CHANGELOG.md b/Pangle/CHANGELOG.md
@@ -1,4 +1,7 @@
 ## Changelog
+   * 3.9.0.4.0
+     * This version of the adapters has been certified with Pangle 3.9.0.4 and MoPub SDK 5.18.0.
+
    * 3.8.1.0.0
      * This version of the adapters has been certified with Pangle 3.8.1.0 and MoPub SDK 5.18.0.
 

diff --git a/Pangle/PangleAdapterConfiguration.m b/Pangle/PangleAdapterConfiguration.m
@@ -11,7 +11,7 @@ @implementation PangleAdapterConfiguration
 static NSInteger mRewardAmount;
 static NSString *mMediaExtra;
 
-static NSString * const kAdapterVersion = @"3.8.1.0.0";
+static NSString * const kAdapterVersion = @"3.9.0.4.0";
 static NSString * const kAdapterErrorDomain = @"com.mopub.mopub-ios-sdk.mopub-pangle-adapters";
 
 typedef NS_ENUM(NSInteger, PangleAdapterErrorCode) {

diff --git a/UnityAds/CHANGELOG.md b/UnityAds/CHANGELOG.md
@@ -1,5 +1,8 @@
 
 ## Changelog
+ * 3.7.5.2
+  * Refactor and update adapters to use latest Unity APIs.
+
 * 3.7.5.1
   * Adjust minimium MoPub SDK version from 5.17.0 to 5.17. This allows integrations to use MoPub 5.17.x up to (but not including) 6.0.
   * Service release. No new features. 

diff --git a/UnityAds/NSError+UnityAdAdapter.h b/UnityAds/NSError+UnityAdAdapter.h
@@ -0,0 +1,17 @@
+#import <Foundation/Foundation.h>
+#import <UnityAds/UnityAds.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NSError (UnityAdAdapter)
+
++ (NSError *)errorWithBannerCode:(UADSBannerErrorCode)code;
++ (NSError *)errorWithDescription:(NSString *)description;
++ (NSError *)errorWithDescription:(NSString *)description reason:(NSString *)reason suggestion:(NSString *)suggestion;
++ (NSError *)errorWithAdAdapterErrorCode:(NSInteger)code description:(NSString *)description;
++ (NSError *)errorWithAdAdapterErrorCode:(NSInteger)code description:(NSString *)description suggestion:(NSString *)suggestion;
++ (NSError *)errorWithAdAdapterErrorCode:(NSInteger)code description:(NSString *)description reason:(NSString *)reason suggestion:(NSString *)suggestion;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/UnityAds/NSError+UnityAdAdapter.m b/UnityAds/NSError+UnityAdAdapter.m
@@ -0,0 +1,58 @@
+#import "NSError+UnityAdAdapter.h"
+
+static NSString * const kUnityAdAdapterErrorDomain = @"com.mopub.mopub-ios-sdk.mopub-unity-adapters";
+
+@interface NSString (Prefix)
+- (NSString *)addUnityPrefix;
+@end
+
+@implementation NSString (Prefix)
+- (NSString *)addUnityPrefix {
+    return [NSString stringWithFormat:@"[Unity Ads] %@", self];
+}
+@end
+
+@implementation NSError (UnityAdAdapter)
+
++ (NSError *)errorWithBannerCode:(UADSBannerErrorCode)code {
+    switch (code) {
+        case UADSBannerErrorCodeUnknown:
+            return [NSError errorWithDescription:@"Banner returned unknown error"];
+
+        case UADSBannerErrorCodeNativeError:
+            return [NSError errorWithDescription:@"Banner returned native error. Failed to initialize."];
+
+        case UADSBannerErrorCodeWebViewError:
+            return [NSError errorWithDescription:@"Banner returned WebView error. Failed to fetch banner size."];
+
+        case UADSBannerErrorCodeNoFillError:
+            return [NSError errorWithDescription:@"Banner returned no fill"];
+    }
+}
+
++ (NSError *)errorWithDescription:(NSString *)description {
+    return [NSError errorWithDescription:description reason:@"" suggestion:@""];
+}
+
++ (NSError *)errorWithDescription:(NSString *)description reason:(NSString *)reason suggestion:(NSString *)suggestion {
+    return [NSError errorWithAdAdapterErrorCode:0 description:description reason:reason suggestion:suggestion];
+}
+
++ (NSError *)errorWithAdAdapterErrorCode:(NSInteger)code description:(NSString *)description {
+    return [NSError errorWithAdAdapterErrorCode:code description:description reason:@"" suggestion:@""];
+}
+
++ (NSError *)errorWithAdAdapterErrorCode:(NSInteger)code description:(NSString *)description suggestion:(NSString *)suggestion {
+    return [NSError errorWithAdAdapterErrorCode:code description:description reason:@"" suggestion:suggestion];
+}
+
++ (NSError *)errorWithAdAdapterErrorCode:(NSInteger)code description:(NSString *)description reason:(NSString *)reason suggestion:(NSString *)suggestion {
+    NSDictionary *userInfo = @{
+        NSLocalizedDescriptionKey: [NSLocalizedString(description, nil) addUnityPrefix],
+        NSLocalizedFailureReasonErrorKey: NSLocalizedString(reason, nil),
+        NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(suggestion, nil)
+    };
+    return [NSError errorWithDomain:kUnityAdAdapterErrorDomain code:code userInfo:userInfo];
+}
+
+@end
diff --git a/UnityAds/UnityAdsAdapterConfiguration.h b/UnityAds/UnityAdsAdapterConfiguration.h
@@ -1,10 +1,3 @@
-//
-//  UnityAdsAdapterConfiguration.h
-//  MoPubSDK
-//
-//  Copyright © 2017 MoPub. All rights reserved.
-//
-
 #import <Foundation/Foundation.h>
 #if __has_include(<MoPub/MoPub.h>)
 #import <MoPub/MoPub.h>
@@ -29,6 +22,12 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (void)updateInitializationParameters:(NSDictionary *)parameters;
 
+/**
+ Initializes UnityAds sdk if it wasn't initialized before.
+ @param gameId Unique identifier for a game, given by Unity Ads admin tools or Unity editor.
+ */
++ (void)initializeIfNeeded:(NSString *)gameId complete:(void(^ _Nullable)(NSError * _Nullable))complete;
+
 // MPAdapterConfiguration
 @property (nonatomic, copy, readonly) NSString * adapterVersion;
 @property (nonatomic, copy, readonly) NSString * biddingToken;

diff --git a/UnityAds/UnityAdsAdapterConfiguration.m b/UnityAds/UnityAdsAdapterConfiguration.m
@@ -1,27 +1,18 @@
-//
-//  UnityAdsAdapterConfiguration.m
-//  MoPubSDK
-//
-//  Copyright © 2017 MoPub. All rights reserved.
-//
-
 #import <UnityAds/UnityAds.h>
 #import "UnityAdsAdapterConfiguration.h"
 #import "UnityRouter.h"
+#import "NSError+UnityAdAdapter.h"
 #if __has_include("MoPub.h")
 #import "MoPub.h"
 #import "MPLogging.h"
 #endif
 
 //Adapter version
-NSString *const ADAPTER_VERSION = @"3.7.5.1";
+NSString *const ADAPTER_VERSION = @"3.7.5.2";
 
 // Initialization configuration keys
 static NSString * const kUnityAdsGameId = @"gameId";
 
-// Errors
-static NSString * const kAdapterErrorDomain = @"com.mopub.mopub-ios-sdk.mopub-unity-adapters";
-
 typedef NS_ENUM(NSInteger, UnityAdsAdapterErrorCode) {
     UnityAdsAdapterErrorCodeMissingGameId,
 };
@@ -41,14 +32,22 @@ + (void)updateInitializationParameters:(NSDictionary *)parameters {
     }
 }
 
++ (void)initializeIfNeeded:(NSString *)gameId complete:(void(^ _Nullable)(NSError * _Nullable))complete; {
+    if (![UnityAds isInitialized]) {
+        [[UnityRouter sharedRouter] initializeWithGameId:gameId withCompletionHandler:^(NSError * _Nullable error) {
+            complete(error);
+        }];
+    }
+}
+
 #pragma mark - MPAdapterConfiguration
 
 - (NSString *)adapterVersion {
     return ADAPTER_VERSION;
 }
 
 - (NSString *)biddingToken {
-    return nil;
+    return [UnityAds getToken];
 }
 
 - (NSString *)moPubNetworkName {
@@ -63,7 +62,9 @@ - (void)initializeNetworkWithConfiguration:(NSDictionary<NSString *, id> *)confi
                                   complete:(void(^)(NSError *))complete {
     NSString * gameId = configuration[kUnityAdsGameId];
     if (gameId == nil) {
-        NSError * error = [NSError errorWithDomain:kAdapterErrorDomain code:UnityAdsAdapterErrorCodeMissingGameId userInfo:@{ NSLocalizedDescriptionKey: @"Unity Ads initialization skipped. The gameId is empty. Ensure it is properly configured on the MoPub dashboard." }];
+        NSError * error = [NSError errorWithAdAdapterErrorCode: UnityAdsAdapterErrorCodeMissingGameId
+                                                   description: @"Initialization skipped. The gameId is empty."
+                                                    suggestion: @"Ensure it is properly configured on the MoPub dashboard."];
         MPLogEvent([MPLogEvent error:error message:nil]);
 
         if (complete != nil) {
@@ -75,9 +76,6 @@ - (void)initializeNetworkWithConfiguration:(NSDictionary<NSString *, id> *)confi
     [[UnityRouter sharedRouter] initializeWithGameId:gameId withCompletionHandler:^(NSError * _Nullable error) {
         complete(error);
     }];
-
-    BOOL debugModeEnabled = (MPLogging.consoleLogLevel == MPBLogLevelDebug);
-    [UnityAds setDebugMode:debugModeEnabled];
 }
 
 @end