add SDK Ver 6.37.0

voyagegroup · Aug 30, 2024 · ee165ce · ee165ce
1 parent f868651
commit ee165ce
Show file tree

Hide file tree

Showing 16 changed files with 79 additions and 54 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               = "6.36.4"
+    s.version               = "6.37.0"
     s.author                = "fluct,Inc."
     s.requires_arc          = true
     s.static_framework      = true

diff --git a/FluctSDK.embeddedframework/FluctSDK.xcframework/Info.plist b/FluctSDK.embeddedframework/FluctSDK.xcframework/Info.plist
@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>FluctSDK.framework/FluctSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>FluctSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>FluctSDK.framework/FluctSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>FluctSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/FluctSDK.embeddedframework/FluctSDK.xcframework/ios-arm64/FluctSDK.framework/FluctSDK b/FluctSDK.embeddedframework/FluctSDK.xcframework/ios-arm64/FluctSDK.framework/FluctSDK
diff --git a/FluctSDK.embeddedframework/FluctSDK.xcframework/ios-arm64/FluctSDK.framework/Info.plist b/FluctSDK.embeddedframework/FluctSDK.xcframework/ios-arm64/FluctSDK.framework/Info.plist
diff --git a/...ddedframework/FluctSDK.xcframework/ios-arm64_x86_64-simulator/FluctSDK.framework/FluctSDK b/...ddedframework/FluctSDK.xcframework/ios-arm64_x86_64-simulator/FluctSDK.framework/FluctSDK
diff --git a/...edframework/FluctSDK.xcframework/ios-arm64_x86_64-simulator/FluctSDK.framework/Info.plist b/...edframework/FluctSDK.xcframework/ios-arm64_x86_64-simulator/FluctSDK.framework/Info.plist
diff --git a/...DK.xcframework/ios-arm64_x86_64-simulator/FluctSDK.framework/_CodeSignature/CodeDirectory b/...DK.xcframework/ios-arm64_x86_64-simulator/FluctSDK.framework/_CodeSignature/CodeDirectory
diff --git a/...framework/ios-arm64_x86_64-simulator/FluctSDK.framework/_CodeSignature/CodeRequirements-1 b/...framework/ios-arm64_x86_64-simulator/FluctSDK.framework/_CodeSignature/CodeRequirements-1
diff --git a/...DK.xcframework/ios-arm64_x86_64-simulator/FluctSDK.framework/_CodeSignature/CodeResources b/...DK.xcframework/ios-arm64_x86_64-simulator/FluctSDK.framework/_CodeSignature/CodeResources
@@ -130,7 +130,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		ZV2zzDgKAXK3PEHkWa3tETUSwKo=
+		iFshmSHMXHt0tflZd6tPTbOQqfY=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>

diff --git a/FluctSDK.embeddedframework/Resources/FluctSDKResources.bundle/Info.plist b/FluctSDK.embeddedframework/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               = "6.36.4"
+    s.version               = "6.37.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               = "6.36.4"
+    s.version               = "6.37.0"
     s.author                = "fluct,Inc."
     s.requires_arc          = true
     s.static_framework      = true

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

diff --git a/MaxMediationAdapterFluct/ALFluctMediationAdapter.m b/MaxMediationAdapterFluct/ALFluctMediationAdapter.m
@@ -11,6 +11,35 @@
 static NSString *const kGroupId = @"groupID";
 static NSString *const kUnitId = @"unitID";
 
+@interface ALFluctMediationAdapterParam : NSObject
+- (instancetype)initWithParameters:(nonnull id<MAAdapterResponseParameters>)params;
+@property (nonatomic, copy) NSString *groupId;
+@property (nonatomic, copy) NSString *unitId;
+@end
+
+@implementation ALFluctMediationAdapterParam
+- (instancetype)initWithParameters:(nonnull id<MAAdapterResponseParameters>)parameters {
+    self = [super init];
+    if (self) {
+        if ([parameters.customParameters objectForKey:kGroupId] && [parameters.customParameters objectForKey:kUnitId]) {
+            _groupId = parameters.customParameters[kGroupId];
+            _unitId = parameters.customParameters[kUnitId];
+        }
+        NSString *placementIdentifier = parameters.thirdPartyAdPlacementIdentifier;
+        NSArray<NSString *> *ids = [placementIdentifier componentsSeparatedByString:@","];
+        if (ids.count == 2) {
+            _groupId = ids[0];
+            _unitId = ids[1];
+        }
+        if ([_groupId length] == 0 || [_unitId length] == 0) {
+            return nil;
+        }
+    }
+    return self;
+}
+
+@end
+
 @interface ALFluctMediationAdapterRewardedVideoAdDelegate : NSObject <ALFluctRewardedVideoDelegateProxyItem>
 @property (nonatomic, weak) ALFluctMediationAdapter *parentAdapter;
 @property (nonatomic, strong) id<MARewardedAdapterDelegate> delegate;
@@ -86,43 +115,39 @@ - (void)loadRewardedAdForParameters:(nonnull id<MAAdapterResponseParameters>)par
                                                                                                                    userInfo:@{NSLocalizedDescriptionKey : @"FluctSDK dose not deliver ads to this user to comply with GDPR, CCPA, COPPA"}]]];
         return;
     }
+    ALFluctMediationAdapterParam *param = [[ALFluctMediationAdapterParam alloc] initWithParameters:parameters];
 
-    /*
-     * 歴史的理由で`customParameters`に各種枠IDを入れているが、
-     * 現行のAppLovinドキュメントでは`thirdPartyAdPlacementIdentifier`を利用するよう指示がある為、
-     * 今後どうすべきか、もし変更する場合既存枠をどうするか、は検討が必要
-     * https://developers.applovin.com/en/demand-partners/building-a-custom-adapter/#ios
-     */
-    NSString *placementIdentifier = parameters.thirdPartyAdPlacementIdentifier;
-    NSString *groupID = parameters.customParameters[kGroupId];
-    NSString *unitID = parameters.customParameters[kUnitId];
+    [self log:@"Loading rewarded ad for group id: %@, unit id: %@", param.groupId, param.unitId];
 
-    [self log:@"Loading rewarded ad for placemet id: %@, group id: %@, unit id: %@", placementIdentifier, groupID, unitID];
+    if (!param) {
+        [delegate didFailToLoadRewardedAdWithError:[ALFluctMediationAdapter maxErrorFromFluctError:[NSError errorWithDomain:FSSVideoErrorSDKDomain
+                                                                                                                       code:FSSVideoErrorBadRequest
+                                                                                                                   userInfo:@{NSLocalizedDescriptionKey : @"FluctSDK dose not deliver ads to invalid group_id and/or unit_id"}]]];
+        return;
+    }
 
     self.rewardedAdapterDelegate = [[ALFluctMediationAdapterRewardedVideoAdDelegate alloc] initWithParentAdapter:self
                                                                                                        andNotify:delegate];
     [ALFluctRewardedVideoDelegateProxy.sharedInstance registerDelegate:self.rewardedAdapterDelegate
-                                                               groupId:groupID
-                                                                unitId:unitID];
+                                                               groupId:param.groupId
+                                                                unitId:param.unitId];
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         FSSRewardedVideo.sharedInstance.delegate = ALFluctRewardedVideoDelegateProxy.sharedInstance;
     });
 
-    [FSSRewardedVideo.sharedInstance loadRewardedVideoWithGroupId:groupID
-                                                           unitId:unitID];
+    [FSSRewardedVideo.sharedInstance loadRewardedVideoWithGroupId:param.groupId
+                                                           unitId:param.unitId];
 }
 
 - (void)showRewardedAdForParameters:(nonnull id<MAAdapterResponseParameters>)parameters
                           andNotify:(nonnull id<MARewardedAdapterDelegate>)delegate {
-    NSString *placementIdentifier = parameters.thirdPartyAdPlacementIdentifier;
-    NSString *groupID = parameters.customParameters[kGroupId];
-    NSString *unitID = parameters.customParameters[kUnitId];
+    ALFluctMediationAdapterParam *param = [[ALFluctMediationAdapterParam alloc] initWithParameters:parameters];
 
-    [self log:@"Showing rewarded ad for placemet id: %@, group id: %@, unit id: %@", placementIdentifier, groupID, unitID];
+    [self log:@"Showing rewarded ad for group id: %@, unit id: %@", param.groupId, param.unitId];
 
-    [FSSRewardedVideo.sharedInstance presentRewardedVideoAdForGroupId:groupID
-                                                               unitId:unitID
+    [FSSRewardedVideo.sharedInstance presentRewardedVideoAdForGroupId:param.groupId
+                                                               unitId:param.unitId
                                                    fromViewController:[ALUtils topViewControllerFromKeyWindow]];
     [delegate didDisplayRewardedAd];
 }

diff --git a/SampleApp/Objective-C/Podfile.lock b/SampleApp/Objective-C/Podfile.lock
@@ -35,30 +35,30 @@ PODS:
   - BURelyFoundation_Global/Zip (1.0.0.0):
     - BURelyFoundation_Global/Foundation
   - FiveAd (2.7.20240411)
-  - FluctSDK (6.36.4)
-  - FluctSDK-MediationAdapter/AppLovin (6.36.4):
+  - FluctSDK (6.37.0)
+  - FluctSDK-MediationAdapter/AppLovin (6.37.0):
     - AppLovinSDK (= 12.4.1)
     - FluctSDK (>= 6.14.0)
-  - FluctSDK-MediationAdapter/Five (6.36.4):
+  - FluctSDK-MediationAdapter/Five (6.37.0):
     - FiveAd (= 2.7.20240411)
     - FluctSDK (>= 6.14.0)
-  - FluctSDK-MediationAdapter/maio (6.36.4):
+  - FluctSDK-MediationAdapter/maio (6.37.0):
     - FluctSDK (>= 6.14.0)
     - MaioSDK-v2 (= 2.1.5)
-  - FluctSDK-MediationAdapter/Pangle (6.36.4):
+  - FluctSDK-MediationAdapter/Pangle (6.37.0):
     - Ads-Global (= 6.1.0.6)
     - FluctSDK (>= 6.14.0)
-  - FluctSDK-MediationAdapter/UnityAds (6.36.4):
+  - FluctSDK-MediationAdapter/UnityAds (6.37.0):
     - FluctSDK (>= 6.14.0)
     - UnityAds (= 4.12.1)
   - Google-Mobile-Ads-SDK (11.1.0):
     - GoogleUserMessagingPlatform (>= 1.1)
-  - GoogleMobileAdsMediationFluct (6.36.4):
+  - GoogleMobileAdsMediationFluct (6.37.0):
     - FluctSDK (>= 6.12.1)
     - Google-Mobile-Ads-SDK (>= 9.8.0)
   - GoogleUserMessagingPlatform (2.2.0)
   - MaioSDK-v2 (2.1.5)
-  - MaxMediationAdapterFluct (6.36.4):
+  - MaxMediationAdapterFluct (6.37.0):
     - AppLovinSDK (>= 12.4.1)
     - FluctSDK (>= 6.19.0)
   - UnityAds (4.12.1)
@@ -101,13 +101,13 @@ SPEC CHECKSUMS:
   AppLovinSDK: c57ad0d34625c971d2db127f8ef60570b28ff51a
   BURelyFoundation_Global: d8099571ab7a0767ec0a334052108e33ff6d8a3f
   FiveAd: 27375ac7fde76085544389cc090d744149fdbe78
-  FluctSDK: fb418fbdd21b9947344ff9c442f984aed0c00be0
-  FluctSDK-MediationAdapter: 89d5d9a2b3f50505238b06e9b98eebb9d23a4d2a
+  FluctSDK: f39d38e7eda29b524084ed6e09b7194bd89c413c
+  FluctSDK-MediationAdapter: 84dbd948bc9bda5fb7170124a0e6b51bab0d5012
   Google-Mobile-Ads-SDK: 4a1f2ccef63660f9a74efc6a6ea979483d421aaa
-  GoogleMobileAdsMediationFluct: a056985cbe365b403903fd34ac47df2000ee9ba8
+  GoogleMobileAdsMediationFluct: 56dd471119f684cb8fa3ab7be3d305ed6f6723c9
   GoogleUserMessagingPlatform: d31dbfb40ec02c5d9683029815c5d5a7f46389ee
   MaioSDK-v2: 548968f22aa62f4955780d24f197eb205148082c
-  MaxMediationAdapterFluct: 979b70fa5326febb24695191b2ea409b3cfaf221
+  MaxMediationAdapterFluct: 98244dbdeffaf1a3b5e6c4404b002656c8fa6436
   UnityAds: f89ac1e717f5d566a58479a5b7cb9ed3a744cae3
 
 PODFILE CHECKSUM: c61ebc569a4f7d73340bd85750e2a46f96f9084c

diff --git a/SampleApp/Swift/Podfile.lock b/SampleApp/Swift/Podfile.lock
@@ -35,30 +35,30 @@ PODS:
   - BURelyFoundation_Global/Zip (1.0.0.0):
     - BURelyFoundation_Global/Foundation
   - FiveAd (2.7.20240411)
-  - FluctSDK (6.36.4)
-  - FluctSDK-MediationAdapter/AppLovin (6.36.4):
+  - FluctSDK (6.37.0)
+  - FluctSDK-MediationAdapter/AppLovin (6.37.0):
     - AppLovinSDK (= 12.4.1)
     - FluctSDK (>= 6.14.0)
-  - FluctSDK-MediationAdapter/Five (6.36.4):
+  - FluctSDK-MediationAdapter/Five (6.37.0):
     - FiveAd (= 2.7.20240411)
     - FluctSDK (>= 6.14.0)
-  - FluctSDK-MediationAdapter/maio (6.36.4):
+  - FluctSDK-MediationAdapter/maio (6.37.0):
     - FluctSDK (>= 6.14.0)
     - MaioSDK-v2 (= 2.1.5)
-  - FluctSDK-MediationAdapter/Pangle (6.36.4):
+  - FluctSDK-MediationAdapter/Pangle (6.37.0):
     - Ads-Global (= 6.1.0.6)
     - FluctSDK (>= 6.14.0)
-  - FluctSDK-MediationAdapter/UnityAds (6.36.4):
+  - FluctSDK-MediationAdapter/UnityAds (6.37.0):
     - FluctSDK (>= 6.14.0)
     - UnityAds (= 4.12.1)
   - Google-Mobile-Ads-SDK (11.1.0):
     - GoogleUserMessagingPlatform (>= 1.1)
-  - GoogleMobileAdsMediationFluct (6.36.4):
+  - GoogleMobileAdsMediationFluct (6.37.0):
     - FluctSDK (>= 6.12.1)
     - Google-Mobile-Ads-SDK (>= 9.8.0)
   - GoogleUserMessagingPlatform (2.2.0)
   - MaioSDK-v2 (2.1.5)
-  - MaxMediationAdapterFluct (6.36.4):
+  - MaxMediationAdapterFluct (6.37.0):
     - AppLovinSDK (>= 12.4.1)
     - FluctSDK (>= 6.19.0)
   - UnityAds (4.12.1)
@@ -101,13 +101,13 @@ SPEC CHECKSUMS:
   AppLovinSDK: c57ad0d34625c971d2db127f8ef60570b28ff51a
   BURelyFoundation_Global: d8099571ab7a0767ec0a334052108e33ff6d8a3f
   FiveAd: 27375ac7fde76085544389cc090d744149fdbe78
-  FluctSDK: fb418fbdd21b9947344ff9c442f984aed0c00be0
-  FluctSDK-MediationAdapter: 89d5d9a2b3f50505238b06e9b98eebb9d23a4d2a
+  FluctSDK: f39d38e7eda29b524084ed6e09b7194bd89c413c
+  FluctSDK-MediationAdapter: 84dbd948bc9bda5fb7170124a0e6b51bab0d5012
   Google-Mobile-Ads-SDK: 4a1f2ccef63660f9a74efc6a6ea979483d421aaa
-  GoogleMobileAdsMediationFluct: a056985cbe365b403903fd34ac47df2000ee9ba8
+  GoogleMobileAdsMediationFluct: 56dd471119f684cb8fa3ab7be3d305ed6f6723c9
   GoogleUserMessagingPlatform: d31dbfb40ec02c5d9683029815c5d5a7f46389ee
   MaioSDK-v2: 548968f22aa62f4955780d24f197eb205148082c
-  MaxMediationAdapterFluct: 979b70fa5326febb24695191b2ea409b3cfaf221
+  MaxMediationAdapterFluct: 98244dbdeffaf1a3b5e6c4404b002656c8fa6436
   UnityAds: f89ac1e717f5d566a58479a5b7cb9ed3a744cae3
 
 PODFILE CHECKSUM: b2342549e8173b7d8f6de4bb18b654e3985f60c1