4.19.0

UnityTech · Dec 11, 2017 · 410088f · 410088f
1 parent 190ece1
commit 410088f
Show file tree

Hide file tree

Showing 71 changed files with 1,727 additions and 416 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,4 @@ TapJoyCustomEvent/
 MoPubSwiftSampleApp/
 /Pods
 AdNetworkSupport/InMobi/
+Jenkinsfile
diff --git a/AdNetworkSupport/Facebook/FacebookBannerCustomEvent.h b/AdNetworkSupport/Facebook/FacebookBannerCustomEvent.h
@@ -12,7 +12,7 @@
 #endif
 
 /*
- * Certified with Facebook Audience Network 4.26
+ * Certified with Facebook Audience Network 4.26.1
  */
 @interface FacebookBannerCustomEvent : MPBannerCustomEvent
 

diff --git a/AdNetworkSupport/Facebook/FacebookInterstitialCustomEvent.h b/AdNetworkSupport/Facebook/FacebookInterstitialCustomEvent.h
@@ -12,7 +12,7 @@
 #endif
 
 /*
- * Certified with Facebook Audience Network 4.26
+ * Certified with Facebook Audience Network 4.26.1
  */
 @interface FacebookInterstitialCustomEvent : MPInterstitialCustomEvent
 

diff --git a/AdNetworkSupport/Facebook/FacebookNativeCustomEvent.h b/AdNetworkSupport/Facebook/FacebookNativeCustomEvent.h
@@ -12,7 +12,7 @@
 #endif
 
 /*
- * Certified with Facebook Audience Network 4.26
+ * Certified with Facebook Audience Network 4.26.1
  */
 @interface FacebookNativeCustomEvent : MPNativeCustomEvent
 

diff --git a/AdNetworkSupport/Facebook/FacebookRewardedVideoCustomEvent.h b/AdNetworkSupport/Facebook/FacebookRewardedVideoCustomEvent.h
@@ -7,7 +7,7 @@
 #import "MPRewardedVideoCustomEvent.h"
 
 /*
- * Certified with Facebook Audience Network 4.26
+ * Certified with Facebook Audience Network 4.26.1
  */
 @interface FacebookRewardedVideoCustomEvent : MPRewardedVideoCustomEvent
 

diff --git a/AdNetworkSupport/Flurry/FlurryBannerCustomEvent.h b/AdNetworkSupport/Flurry/FlurryBannerCustomEvent.h
@@ -14,7 +14,7 @@
 #endif
 
 /*
- * Certified with Flurry 8.0.0
+ * Certified with Flurry 8.2.2
  */
 @interface FlurryBannerCustomEvent : MPBannerCustomEvent <FlurryAdBannerDelegate>
 

diff --git a/AdNetworkSupport/Flurry/FlurryInterstitialCustomEvent.h b/AdNetworkSupport/Flurry/FlurryInterstitialCustomEvent.h
@@ -14,7 +14,7 @@
 #endif
 
 /*
- * Certified with Flurry 8.0.0
+ * Certified with Flurry 8.2.2
  */
 @interface FlurryInterstitialCustomEvent : MPInterstitialCustomEvent<FlurryAdInterstitialDelegate>
 

diff --git a/AdNetworkSupport/Flurry/FlurryNativeAdAdapter.m b/AdNetworkSupport/Flurry/FlurryNativeAdAdapter.m
@@ -28,7 +28,7 @@ - (instancetype)initWithFlurryAdNative:(FlurryAdNative *)adNative
     if (self) {
         _adNative = adNative;
         _adNative.adDelegate = self;
-        
+
         _properties = [self convertAssetsToProperties:adNative];
     }
     return self;
@@ -50,7 +50,7 @@ - (NSDictionary *)convertAssetsToProperties:(FlurryAdNative *)adNative
                                                  @"appRating": kAdStarRatingKey,
                                                  @"callToAction": kAdCTATextKey
                                                  };
-    
+
     NSMutableDictionary *props = [NSMutableDictionary dictionary];
     for (int ix = 0; ix < adNative.assetList.count; ++ix) {
         FlurryAdNativeAsset* asset = [adNative.assetList objectAtIndex:ix];
@@ -67,12 +67,12 @@ - (NSDictionary *)convertAssetsToProperties:(FlurryAdNative *)adNative
         } else {
             value = asset.value;
         }
-        
+
         if (key && value) {
             [props setObject:value forKey:key];
         }
     }
-    
+
     return [props copy];
 }
 
@@ -108,12 +108,13 @@ - (BOOL)enableThirdPartyClickTracking
 
 - (void)willAttachToView:(UIView *)view
 {
-    self.adNative.trackingView = view;
     self.adNative.viewControllerForPresentation = [self.delegate viewControllerForPresentingModalView];
     // Can only set FlurryAdNative#videoViewContainer after setting viewControllerForPresentation
     if ([self.adNative isVideoAd]) {
         self.adNative.videoViewContainer = self.videoViewContainer;
     }
+
+    self.adNative.trackingView = view;
 }
 
 - (void)didDetachFromView:(UIView *)view

diff --git a/AdNetworkSupport/Flurry/FlurryNativeCustomEvent.h b/AdNetworkSupport/Flurry/FlurryNativeCustomEvent.h
@@ -13,7 +13,7 @@
 #endif
 
 /*
- * Certified with Flurry 8.0.0
+ * Certified with Flurry 8.2.2
  */
 @interface FlurryNativeCustomEvent : MPNativeCustomEvent
 

diff --git a/AdNetworkSupport/Flurry/FlurryNativeVideoAdRenderer.h b/AdNetworkSupport/Flurry/FlurryNativeVideoAdRenderer.h
@@ -13,7 +13,7 @@
 @class MPStaticNativeAdRendererSettings;
 
 /*
- * Certified with Flurry 8.0.0
+ * Certified with Flurry 8.2.2
  */
 @interface FlurryNativeVideoAdRenderer : NSObject <MPNativeAdRenderer>
 

diff --git a/AdNetworkSupport/Millennial/MPMillennialRewardedVideoCustomEvent.h b/AdNetworkSupport/Millennial/MPMillennialRewardedVideoCustomEvent.h
@@ -0,0 +1,23 @@
+//
+//  MPMillennialRewardedVideoCustomEvent.h
+//
+//  Created by Terence Worley on 8/25/16
+//  Copyright (c) 2016 MillennialMedia. All rights reserved.
+//
+
+#if __has_include(<MoPub/MoPub.h>)
+#import <MoPub/MoPub.h>
+#else
+#import "MoPub.h"
+#endif
+
+#import <MMAdSDK/MMAdSDK.h>
+
+/*
+ * Certified with Millennial Media 6.6.0
+ */
+@interface MPMillennialRewardedVideoCustomEvent : MPRewardedVideoCustomEvent
+
+@property (nonatomic, readonly) MMCreativeInfo* creativeInfo;
+
+@end
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
     #endif
     /*
-     * Certified with Facebook Audience Network 4.26
+     * Certified with Facebook Audience Network 4.26.1
      */
     @interface FacebookBannerCustomEvent : MPBannerCustomEvent
@@ Expand Down @@