diff --git a/Adapters/AdmobAdapter/OMAdMobAdapter.m b/Adapters/AdmobAdapter/OMAdMobAdapter.m index 68e841f..51af542 100644 --- a/Adapters/AdmobAdapter/OMAdMobAdapter.m +++ b/Adapters/AdmobAdapter/OMAdMobAdapter.m @@ -4,7 +4,7 @@ #import "OMAdMobAdapter.h" #import "OMAdMobClass.h" -static NSString * const AdmobAdapterVersion = @"3.1.0"; +static NSString * const AdmobAdapterVersion = @"3.1.1"; static BOOL admobNpaAd = NO; @implementation OMAdMobAdapter @@ -15,15 +15,18 @@ + (NSString*)adapterVerison { + (NSString*)adNetworkVersion { NSString *sdkVersion = @""; - Class sdkClass = NSClassFromString(@"GADRequest"); - if(sdkClass && [sdkClass respondsToSelector:@selector(sdkVersion)]){ - sdkVersion = [sdkClass sdkVersion]; + Class admobClass = NSClassFromString(@"GADMobileAds"); + if (admobClass && [admobClass respondsToSelector:@selector(sharedInstance)]) { + GADMobileAds *admob = [admobClass sharedInstance]; + if(admob && [admob respondsToSelector:@selector(sdkVersion)]){ + sdkVersion = [admob sdkVersion]; + } } return sdkVersion; } + (NSString*)minimumSupportVersion { - return @"7.42.0"; + return @"afma-sdk-i-v7.42.0"; } diff --git a/Adapters/AdmobAdapter/OMAdMobBanner.m b/Adapters/AdmobAdapter/OMAdMobBanner.m index 7fe978d..f40eeb9 100644 --- a/Adapters/AdmobAdapter/OMAdMobBanner.m +++ b/Adapters/AdmobAdapter/OMAdMobBanner.m @@ -24,7 +24,7 @@ - (void)loadAd { } if (requestClass && [requestClass respondsToSelector:@selector(request)]) { GADRequest *request = [requestClass request]; - if (![OMAdMobAdapter npaAd] && NSClassFromString(@"GADExtras")) { + if ([OMAdMobAdapter npaAd] && NSClassFromString(@"GADExtras")) { GADExtras *extras = [[NSClassFromString(@"GADExtras") alloc] init]; extras.additionalParameters = @{@"npa": @"1"}; [request registerAdNetworkExtras:extras]; diff --git a/Adapters/AdmobAdapter/OMAdMobClass.h b/Adapters/AdmobAdapter/OMAdMobClass.h index f7f1221..8b1dd02 100644 --- a/Adapters/AdmobAdapter/OMAdMobClass.h +++ b/Adapters/AdmobAdapter/OMAdMobClass.h @@ -39,6 +39,7 @@ typedef void (^GADInitializationCompletionHandler)(GADInitializationStatus *_Non @interface GADMobileAds : NSObject + (nonnull GADMobileAds *)sharedInstance; +@property(nonatomic, nonnull, readonly) NSString *sdkVersion; @property(nonatomic, readonly, strong, nonnull) GADRequestConfiguration *requestConfiguration; + (void)configureWithApplicationID:(NSString *)applicationID; - (void)startWithCompletionHandler:(nullable GADInitializationCompletionHandler)completionHandler; diff --git a/Adapters/AdmobAdapter/OMAdMobInterstitial.m b/Adapters/AdmobAdapter/OMAdMobInterstitial.m index 0acb317..84d5218 100644 --- a/Adapters/AdmobAdapter/OMAdMobInterstitial.m +++ b/Adapters/AdmobAdapter/OMAdMobInterstitial.m @@ -25,7 +25,7 @@ - (void)loadAd { _admobInterstitial = [[GADInterstitialClass alloc] initWithAdUnitID:_pid]; _admobInterstitial.delegate = self; GADRequest *request = [GADRequestClass request]; - if (![OMAdMobAdapter npaAd] && NSClassFromString(@"GADExtras")) { + if ([OMAdMobAdapter npaAd] && NSClassFromString(@"GADExtras")) { GADExtras *extras = [[NSClassFromString(@"GADExtras") alloc] init]; extras.additionalParameters = @{@"npa": @"1"}; [request registerAdNetworkExtras:extras]; diff --git a/Adapters/AdmobAdapter/OMAdMobNative.m b/Adapters/AdmobAdapter/OMAdMobNative.m index 2fa4785..379d3ec 100644 --- a/Adapters/AdmobAdapter/OMAdMobNative.m +++ b/Adapters/AdmobAdapter/OMAdMobNative.m @@ -49,7 +49,7 @@ - (void)loadAd{ } if (_adLoader && requestClass && [requestClass respondsToSelector:@selector(request)] && _canLoadRequest) { GADRequest *request = [requestClass request]; - if (![OMAdMobAdapter npaAd] && NSClassFromString(@"GADExtras")) { + if ([OMAdMobAdapter npaAd] && NSClassFromString(@"GADExtras")) { GADExtras *extras = [[NSClassFromString(@"GADExtras") alloc] init]; extras.additionalParameters = @{@"npa": @"1"}; [request registerAdNetworkExtras:extras]; diff --git a/Adapters/AdmobAdapter/OMAdMobRewardedVideo.m b/Adapters/AdmobAdapter/OMAdMobRewardedVideo.m index ed2caba..b2c543f 100644 --- a/Adapters/AdmobAdapter/OMAdMobRewardedVideo.m +++ b/Adapters/AdmobAdapter/OMAdMobRewardedVideo.m @@ -31,7 +31,7 @@ - (void)loadAd { __weak __typeof(self) weakSelf = self; GADRequest *request = [requestClass request]; - if (![OMAdMobAdapter npaAd] && NSClassFromString(@"GADExtras")) { + if ([OMAdMobAdapter npaAd] && NSClassFromString(@"GADExtras")) { GADExtras *extras = [[NSClassFromString(@"GADExtras") alloc] init]; extras.additionalParameters = @{@"npa": @"1"}; [request registerAdNetworkExtras:extras]; diff --git a/OpenMediation.podspec b/OpenMediation.podspec index 2bac4cb..69bc090 100644 --- a/OpenMediation.podspec +++ b/OpenMediation.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'OpenMediation' - s.version = '1.3.2' + s.version = '1.3.3' s.summary = 'OpenMediation SDK for iOS' s.homepage = 'https://github.com/AdTiming/OpenMediation-iOS' s.description = <<-DESC diff --git a/OpenMediation/OpenMediaitonSegments/OMMediations.m b/OpenMediation/OpenMediaitonSegments/OMMediations.m index 19f6fba..b79714d 100644 --- a/OpenMediation/OpenMediaitonSegments/OMMediations.m +++ b/OpenMediation/OpenMediaitonSegments/OMMediations.m @@ -11,8 +11,9 @@ @interface AdTiming : NSObject + (NSString *)SDKVersion; @end -@interface GADRequest : NSObject -+ (NSString *)sdkVersion; +@interface GADMobileAds : NSObject ++ (nonnull GADMobileAds *)sharedInstance; +@property(nonatomic, nonnull, readonly) NSString *sdkVersion; @end @interface VungleSDK : NSObject @@ -127,7 +128,7 @@ - (instancetype)init { _adnSdkClassMap = @{ @(OMAdNetworkAdTiming):@"AdTiming", - @(OMAdNetworkAdMob):@"GADRequest", + @(OMAdNetworkAdMob):@"GADMobileAds", @(OMAdNetworkFacebook):@"FBAdSettings", @(OMAdNetworkUnityAds):@"UnityAds", @(OMAdNetworkVungle):@"VungleSDK", @@ -174,8 +175,11 @@ - (NSString*)adnSDKVersion:(OMAdNetwork)adnID { break; case OMAdNetworkAdMob: { - if (sdkClass && [sdkClass respondsToSelector:@selector(sdkVersion)]) { - sdkVersion = [sdkClass sdkVersion]; + if (sdkClass && [sdkClass respondsToSelector:@selector(sharedInstance)]) { + GADMobileAds *admob = [sdkClass sharedInstance]; + if(admob && [admob respondsToSelector:@selector(sdkVersion)]){ + sdkVersion = [admob sdkVersion]; + } } } break; diff --git a/OpenMediation/OpenMediationConstant.h b/OpenMediation/OpenMediationConstant.h index be20d8f..4c65746 100644 --- a/OpenMediation/OpenMediationConstant.h +++ b/OpenMediation/OpenMediationConstant.h @@ -4,7 +4,7 @@ #ifndef OpenMediationConstant_h #define OpenMediationConstant_h -#define OPENMEDIATION_SDK_VERSION @"1.3.1" +#define OPENMEDIATION_SDK_VERSION @"1.3.3" typedef NS_ENUM(NSInteger, OMAdNetwork) { OMAdNetworkAdTiming = 1, diff --git a/OpenMediationDemo/Info.plist b/OpenMediationDemo/Info.plist index 918c14e..4f60653 100644 --- a/OpenMediationDemo/Info.plist +++ b/OpenMediationDemo/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.3.1 + 1.3.2 CFBundleVersion 1 GADApplicationIdentifier diff --git a/Podfile b/Podfile index 116b025..6ae88b8 100644 --- a/Podfile +++ b/Podfile @@ -3,26 +3,26 @@ platform :ios, '10.0' source 'https://github.com/CocoaPods/Specs.git' target 'OpenMediationDemo' do - pod 'AdTimingSDK', '4.3.1' - pod 'Google-Mobile-Ads-SDK', '7.62.0' + pod 'AdTimingSDK', '4.3.2' + pod 'Google-Mobile-Ads-SDK', '7.64.0' pod 'FBAudienceNetwork', '5.10.1' - pod 'UnityAds', '3.4.6' + pod 'UnityAds', '3.4.8' pod 'VungleSDK-iOS', '6.7.0' - pod 'AdColony', '4.1.5' + pod 'AdColony', '4.3.1' pod 'AppLovinSDK', '6.13.1' pod 'mopub-ios-sdk', '5.13.1' pod 'TapjoySDK', '12.6.1' pod 'ChartboostSDK', '8.2.0' - pod 'Bytedance-UnionAD', '3.0.0.2' - pod 'MintegralAdSDK/RewardVideoAd', '6.3.1' - pod 'MintegralAdSDK/InterstitialVideoAd', '6.3.1' - pod 'MintegralAdSDK/BannerAd', '6.3.1' - pod 'MintegralAdSDK/SplashAd', '6.3.1' - pod 'MintegralAdSDK/BidRewardVideoAd', '6.3.1' - pod 'MintegralAdSDK/BidInterstitialVideoAd', '6.3.1' - pod 'MintegralAdSDK/BidBannerAd', '6.3.1' + pod 'Bytedance-UnionAD', '3.1.0.5' + pod 'MintegralAdSDK/RewardVideoAd', '6.3.7' + pod 'MintegralAdSDK/InterstitialVideoAd', '6.3.7' + pod 'MintegralAdSDK/BannerAd', '6.3.7' + pod 'MintegralAdSDK/SplashAd', '6.3.7' + pod 'MintegralAdSDK/BidRewardVideoAd', '6.3.7' + pod 'MintegralAdSDK/BidInterstitialVideoAd', '6.3.7' + pod 'MintegralAdSDK/BidBannerAd', '6.3.7' pod 'GDTMobSDK', '4.11.8' - pod 'IronSourceSDK','6.17.0' + pod 'IronSourceSDK','7.0.0' pod 'ChartboostHelium', '2.0.0' pod 'Fyber_Marketplace_SDK','7.5.4' end diff --git a/README.md b/README.md index 56aaa25..f511f58 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # OpenMediation SDK for iOS -[![CocoaPods Compatible](http://img.shields.io/badge/pod-v1.3.2-blue.svg)](https://github.com/AdTiming/OpenMediation-iOS) +[![CocoaPods Compatible](http://img.shields.io/badge/pod-v1.3.3-blue.svg)](https://github.com/AdTiming/OpenMediation-iOS) [![Platform](https://img.shields.io/badge/platform-iOS%209%2B-brightgreen.svg?style=flat)](https://github.com/AdTiming/OpenMediation-iOS) [![License](https://img.shields.io/github/license/AdTiming/OpenMediation-iOS)](https://github.com/AdTiming/OpenMediation-iOS/blob/master/LICENSE) @@ -26,7 +26,7 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '9.0' target 'TargetName' do - pod 'OpenMediation', '~> 1.3.2' + pod 'OpenMediation', '~> 1.3.3' end ```