Skip to content

Commit

Permalink
Update AdNetwork SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
OpenMediationProject committed Sep 2, 2020
1 parent 2a4b836 commit 18bf007
Show file tree
Hide file tree
Showing 12 changed files with 40 additions and 32 deletions.
13 changes: 8 additions & 5 deletions Adapters/AdmobAdapter/OMAdMobAdapter.m
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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";
}


Expand Down
2 changes: 1 addition & 1 deletion Adapters/AdmobAdapter/OMAdMobBanner.m
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
1 change: 1 addition & 0 deletions Adapters/AdmobAdapter/OMAdMobClass.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Adapters/AdmobAdapter/OMAdMobInterstitial.m
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion Adapters/AdmobAdapter/OMAdMobNative.m
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion Adapters/AdmobAdapter/OMAdMobRewardedVideo.m
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion OpenMediation.podspec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 9 additions & 5 deletions OpenMediation/OpenMediaitonSegments/OMMediations.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ @interface AdTiming : NSObject
+ (NSString *)SDKVersion;
@end

@interface GADRequest : NSObject <NSCopying>
+ (NSString *)sdkVersion;
@interface GADMobileAds : NSObject
+ (nonnull GADMobileAds *)sharedInstance;
@property(nonatomic, nonnull, readonly) NSString *sdkVersion;
@end

@interface VungleSDK : NSObject
Expand Down Expand Up @@ -127,7 +128,7 @@ - (instancetype)init {

_adnSdkClassMap = @{
@(OMAdNetworkAdTiming):@"AdTiming",
@(OMAdNetworkAdMob):@"GADRequest",
@(OMAdNetworkAdMob):@"GADMobileAds",
@(OMAdNetworkFacebook):@"FBAdSettings",
@(OMAdNetworkUnityAds):@"UnityAds",
@(OMAdNetworkVungle):@"VungleSDK",
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion OpenMediation/OpenMediationConstant.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion OpenMediationDemo/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.3.1</string>
<string>1.3.2</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>GADApplicationIdentifier</key>
Expand Down
26 changes: 13 additions & 13 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand All @@ -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
```

Expand Down

0 comments on commit 18bf007

Please sign in to comment.