add SDK Ver 5.10.0

voyagegroup · Aug 21, 2019 · 32c4f4b · 32c4f4b
1 parent abdb198
commit 32c4f4b
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 46 deletions.
diff --git a/FluctSDK-MediationAdapter.podspec b/FluctSDK-MediationAdapter.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
     s.name                  = "FluctSDK-MediationAdapter"
     s.summary               = "Mediation Adapter for FluctSDK ad Framework"
     s.license               = { :type => "Copyright", :text => "Copyright (c) fluct,Inc. All rights reserved." }
-    s.version               = "5.9.0"
+    s.version               = "5.10.0"
     s.author                = "fluct,Inc."
     s.requires_arc          = true
     s.static_framework      = true

diff --git a/FluctSDK.embeddedframework/FluctSDK.framework/FluctSDK b/FluctSDK.embeddedframework/FluctSDK.framework/FluctSDK
diff --git a/FluctSDK.embeddedframework/FluctSDK.framework/Info.plist b/FluctSDK.embeddedframework/FluctSDK.framework/Info.plist
diff --git a/FluctSDK.embeddedframework/FluctSDK.framework/Resources/FluctSDKResources.bundle/Assets.car b/FluctSDK.embeddedframework/FluctSDK.framework/Resources/FluctSDKResources.bundle/Assets.car
diff --git a/FluctSDK.embeddedframework/FluctSDK.framework/Resources/FluctSDKResources.bundle/Info.plist b/FluctSDK.embeddedframework/FluctSDK.framework/Resources/FluctSDKResources.bundle/Info.plist
diff --git a/FluctSDK.podspec b/FluctSDK.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
     s.name                  = "FluctSDK"
     s.summary               = "FluctSDK ad Framework"
     s.license               = { :type => "Copyright", :text => "Copyright (c) fluct,Inc. All rights reserved." }
-    s.version               = "5.9.0"
+    s.version               = "5.10.0"
     s.author                = "fluct,Inc."
     s.requires_arc          = true
     s.homepage              = "https://fluct.jp/"

diff --git a/GoogleMobileAdsMediationFluct.podspec b/GoogleMobileAdsMediationFluct.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
     s.name                  = "GoogleMobileAdsMediationFluct"
     s.summary               = "fluct adapter used for mediation with the Google Mobile Ads SDK"
     s.license               = { :type => "Copyright", :text => "Copyright (c) fluct,Inc. All rights reserved." }
-    s.version               = "5.9.0"
+    s.version               = "5.10.0"
     s.author                = "fluct,Inc."
     s.requires_arc          = true
     s.static_framework      = true

diff --git a/GoogleMobileAdsMediationFluct/GADMAdapterFluctExtras.h b/GoogleMobileAdsMediationFluct/GADMAdapterFluctExtras.h
@@ -0,0 +1,21 @@
+//
+//  GADMAdapterFluctExtras.h
+//  FluctSDK
+//
+//  Copyright © 2019 fluct, Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+@import GoogleMobileAds;
+@import FluctSDK;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GADMAdapterFluctExtras : NSObject <GADAdNetworkExtras>
+
+@property (nonatomic, nullable) FSSRewardedVideoSetting *setting;
+@property (nonatomic, nullable) FSSAdRequestTargeting *targeting;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/GoogleMobileAdsMediationFluct/GADMAdapterFluctExtras.m b/GoogleMobileAdsMediationFluct/GADMAdapterFluctExtras.m
@@ -0,0 +1,12 @@
+//
+//  GADMAdapterFluctExtras.m
+//  FluctSDK
+//
+//  Copyright © 2019 fluct, Inc. All rights reserved.
+//
+
+#import "GADMAdapterFluctExtras.h"
+
+@implementation GADMAdapterFluctExtras
+
+@end
diff --git a/GoogleMobileAdsMediationFluct/GADMAdapterFluctRewardedAd.m b/GoogleMobileAdsMediationFluct/GADMAdapterFluctRewardedAd.m
@@ -6,7 +6,9 @@
 //
 
 #import "GADMAdapterFluctRewardedAd.h"
+#import "GADMAdapterFluctExtras.h"
 #import "GADMFluctError.h"
+
 @import FluctSDK;
 
 @interface GADMAdapterFluctRewardedAd () <FSSRewardedVideoDelegate>
@@ -37,8 +39,17 @@ - (void)loadRewardedAdForAdConfiguration:(GADMediationRewardedAdConfiguration *)
     self.completionHandler = completionHandler;
 
     FSSRewardedVideo.sharedInstance.delegate = self;
-    [[FSSRewardedVideo sharedInstance] loadRewardedVideoWithGroupId:self.groupID
-                                                             unitId:self.unitID];
+
+    GADMAdapterFluctExtras *extras = adConfiguration.extras;
+    if (extras) {
+        FSSRewardedVideo.sharedInstance.setting = extras.setting;
+        [[FSSRewardedVideo sharedInstance] loadRewardedVideoWithGroupId:self.groupID
+                                                                 unitId:self.unitID
+                                                              targeting:extras.targeting];
+        return;
+    }
+
+    [[FSSRewardedVideo sharedInstance] loadRewardedVideoWithGroupId:self.groupID unitId:self.unitID];
 }
 
 - (void)presentFromViewController:(nonnull UIViewController *)viewController {

diff --git a/GoogleMobileAdsMediationFluct/GADMediationAdapterFluct.m b/GoogleMobileAdsMediationFluct/GADMediationAdapterFluct.m
@@ -6,8 +6,10 @@
 //
 
 #import "GADMediationAdapterFluct.h"
+#import "GADMAdapterFluctExtras.h"
 #import "GADMAdapterFluctRewardedAd.h"
 #import "GADMFluctError.h"
+
 @import FluctSDK;
 
 @interface GADMediationAdapterFluct ()
@@ -60,7 +62,7 @@ + (GADVersionNumber)version {
 }
 
 + (nullable Class<GADAdNetworkExtras>)networkExtrasClass {
-    return nil;
+    return [GADMAdapterFluctExtras class];
 }
 
 - (void)loadRewardedAdForAdConfiguration:(GADMediationRewardedAdConfiguration *)adConfiguration completionHandler:(GADMediationRewardedLoadCompletionHandler)completionHandler {

diff --git a/README.md b/README.md
@@ -17,6 +17,9 @@ FluctSDK-iOSの[Wiki](https://github.com/voyagegroup/FluctSDK-iOS/wiki)を参照
 
 # FluctSDK Release Note
 
+## V5.10.0 2019/08/21
+* GoogleMobileAdsのカスタムイベントでオプション設定ができる機能を追加
+
 ## V5.9.0 2019/08/14
 * 動画リワード広告表示時のイベントをログ出力する機能を追加
 * アドサーバーへのリクエストにおける不具合の修正

diff --git a/SampleApp/Objective-C/Podfile.lock b/SampleApp/Objective-C/Podfile.lock
@@ -1,37 +1,37 @@
 PODS:
   - AdColony (3.3.8.1)
   - AppLovinSDK (5.1.2)
-  - FluctSDK (5.9.0)
-  - FluctSDK-MediationAdapter (5.9.0):
-    - FluctSDK-MediationAdapter/AdColony (= 5.9.0)
-    - FluctSDK-MediationAdapter/AdCorsa (= 5.9.0)
-    - FluctSDK-MediationAdapter/AppLovin (= 5.9.0)
-    - FluctSDK-MediationAdapter/maio (= 5.9.0)
-    - FluctSDK-MediationAdapter/Mintegral (= 5.9.0)
-    - FluctSDK-MediationAdapter/nend (= 5.9.0)
-    - FluctSDK-MediationAdapter/Tapjoy (= 5.9.0)
-    - FluctSDK-MediationAdapter/UnityAds (= 5.9.0)
-  - FluctSDK-MediationAdapter/AdColony (5.9.0):
+  - FluctSDK (5.10.0)
+  - FluctSDK-MediationAdapter (5.10.0):
+    - FluctSDK-MediationAdapter/AdColony (= 5.10.0)
+    - FluctSDK-MediationAdapter/AdCorsa (= 5.10.0)
+    - FluctSDK-MediationAdapter/AppLovin (= 5.10.0)
+    - FluctSDK-MediationAdapter/maio (= 5.10.0)
+    - FluctSDK-MediationAdapter/Mintegral (= 5.10.0)
+    - FluctSDK-MediationAdapter/nend (= 5.10.0)
+    - FluctSDK-MediationAdapter/Tapjoy (= 5.10.0)
+    - FluctSDK-MediationAdapter/UnityAds (= 5.10.0)
+  - FluctSDK-MediationAdapter/AdColony (5.10.0):
     - AdColony
     - FluctSDK
-  - FluctSDK-MediationAdapter/AdCorsa (5.9.0):
+  - FluctSDK-MediationAdapter/AdCorsa (5.10.0):
     - FluctSDK
     - GlossomAds
-  - FluctSDK-MediationAdapter/AppLovin (5.9.0):
+  - FluctSDK-MediationAdapter/AppLovin (5.10.0):
     - AppLovinSDK
     - FluctSDK
-  - FluctSDK-MediationAdapter/maio (5.9.0):
+  - FluctSDK-MediationAdapter/maio (5.10.0):
     - FluctSDK
     - MaioSDK
-  - FluctSDK-MediationAdapter/Mintegral (5.9.0):
+  - FluctSDK-MediationAdapter/Mintegral (5.10.0):
     - FluctSDK
-  - FluctSDK-MediationAdapter/nend (5.9.0):
+  - FluctSDK-MediationAdapter/nend (5.10.0):
     - FluctSDK
     - NendSDK_iOS
-  - FluctSDK-MediationAdapter/Tapjoy (5.9.0):
+  - FluctSDK-MediationAdapter/Tapjoy (5.10.0):
     - FluctSDK
     - TapjoySDK
-  - FluctSDK-MediationAdapter/UnityAds (5.9.0):
+  - FluctSDK-MediationAdapter/UnityAds (5.10.0):
     - FluctSDK
     - UnityAds
   - GlossomAds (2.0.0)
@@ -63,8 +63,8 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AdColony: 21c9cdcc780854d406e213cb1e5ef9f2b165cca3
   AppLovinSDK: 5a6c0ab59aaed00da1bc95d54e2065266ab3b379
-  FluctSDK: aaae3d152423803b745937440cc0863e98308aaf
-  FluctSDK-MediationAdapter: c941d955c6d7bca9a58ef6762a58aa4e12e6ffd8
+  FluctSDK: 3fba22cb6b990119844491d608d55d324536529b
+  FluctSDK-MediationAdapter: 23b39e72d71f3d3fd5553f23352c35050401fb18
   GlossomAds: 0bd35eccb23cfacbe1577e24c03e90e1ab1a975c
   MaioSDK: 6ad318ee8198b1e4399812791e09f8e317493f39
   NendSDK_iOS: 0e86624061da461eb5a8e825e7b955e556f61541

diff --git a/SampleApp/Swift/SDK/Podfile.lock b/SampleApp/Swift/SDK/Podfile.lock
@@ -1,37 +1,37 @@
 PODS:
   - AdColony (3.3.8.1)
   - AppLovinSDK (5.1.2)
-  - FluctSDK (5.9.0)
-  - FluctSDK-MediationAdapter (5.9.0):
-    - FluctSDK-MediationAdapter/AdColony (= 5.9.0)
-    - FluctSDK-MediationAdapter/AdCorsa (= 5.9.0)
-    - FluctSDK-MediationAdapter/AppLovin (= 5.9.0)
-    - FluctSDK-MediationAdapter/maio (= 5.9.0)
-    - FluctSDK-MediationAdapter/Mintegral (= 5.9.0)
-    - FluctSDK-MediationAdapter/nend (= 5.9.0)
-    - FluctSDK-MediationAdapter/Tapjoy (= 5.9.0)
-    - FluctSDK-MediationAdapter/UnityAds (= 5.9.0)
-  - FluctSDK-MediationAdapter/AdColony (5.9.0):
+  - FluctSDK (5.10.0)
+  - FluctSDK-MediationAdapter (5.10.0):
+    - FluctSDK-MediationAdapter/AdColony (= 5.10.0)
+    - FluctSDK-MediationAdapter/AdCorsa (= 5.10.0)
+    - FluctSDK-MediationAdapter/AppLovin (= 5.10.0)
+    - FluctSDK-MediationAdapter/maio (= 5.10.0)
+    - FluctSDK-MediationAdapter/Mintegral (= 5.10.0)
+    - FluctSDK-MediationAdapter/nend (= 5.10.0)
+    - FluctSDK-MediationAdapter/Tapjoy (= 5.10.0)
+    - FluctSDK-MediationAdapter/UnityAds (= 5.10.0)
+  - FluctSDK-MediationAdapter/AdColony (5.10.0):
     - AdColony
     - FluctSDK
-  - FluctSDK-MediationAdapter/AdCorsa (5.9.0):
+  - FluctSDK-MediationAdapter/AdCorsa (5.10.0):
     - FluctSDK
     - GlossomAds
-  - FluctSDK-MediationAdapter/AppLovin (5.9.0):
+  - FluctSDK-MediationAdapter/AppLovin (5.10.0):
     - AppLovinSDK
     - FluctSDK
-  - FluctSDK-MediationAdapter/maio (5.9.0):
+  - FluctSDK-MediationAdapter/maio (5.10.0):
     - FluctSDK
     - MaioSDK
-  - FluctSDK-MediationAdapter/Mintegral (5.9.0):
+  - FluctSDK-MediationAdapter/Mintegral (5.10.0):
     - FluctSDK
-  - FluctSDK-MediationAdapter/nend (5.9.0):
+  - FluctSDK-MediationAdapter/nend (5.10.0):
     - FluctSDK
     - NendSDK_iOS
-  - FluctSDK-MediationAdapter/Tapjoy (5.9.0):
+  - FluctSDK-MediationAdapter/Tapjoy (5.10.0):
     - FluctSDK
     - TapjoySDK
-  - FluctSDK-MediationAdapter/UnityAds (5.9.0):
+  - FluctSDK-MediationAdapter/UnityAds (5.10.0):
     - FluctSDK
     - UnityAds
   - GlossomAds (2.0.0)
@@ -63,8 +63,8 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AdColony: 21c9cdcc780854d406e213cb1e5ef9f2b165cca3
   AppLovinSDK: 5a6c0ab59aaed00da1bc95d54e2065266ab3b379
-  FluctSDK: aaae3d152423803b745937440cc0863e98308aaf
-  FluctSDK-MediationAdapter: c941d955c6d7bca9a58ef6762a58aa4e12e6ffd8
+  FluctSDK: 3fba22cb6b990119844491d608d55d324536529b
+  FluctSDK-MediationAdapter: 23b39e72d71f3d3fd5553f23352c35050401fb18
   GlossomAds: 0bd35eccb23cfacbe1577e24c03e90e1ab1a975c
   MaioSDK: 6ad318ee8198b1e4399812791e09f8e317493f39
   NendSDK_iOS: 0e86624061da461eb5a8e825e7b955e556f61541