MoPub SDK Version 3.0.0

BinaryProjects/ANSDK.xcodeproj/project.pbxproj

@@ -384,6 +384,8 @@
 		8A944E2619D5AFCE007AAAB0 /* MPTableViewAdManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPTableViewAdManager.h; sourceTree = "<group>"; };
 		8A944E2719D5AFCE007AAAB0 /* MPTableViewAdPlacer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPTableViewAdPlacer.h; sourceTree = "<group>"; };
 		8A944E2819D5AFCE007AAAB0 /* MRAID.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = MRAID.bundle; sourceTree = "<group>"; };
+		8AC662A219DC9DDA004025D5 /* MPServerAdPositioning.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPServerAdPositioning.h; sourceTree = "<group>"; };
+		8AC662A319DC9E07004025D5 /* MoPub-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MoPub-Bridging-Header.h"; sourceTree = "<group>"; };
 		8AD5154019D214CA002E53D6 /* libANSDKAmazonAdapter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libANSDKAmazonAdapter.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		8AD5155519D216E6002E53D6 /* ANAdAdapterBannerAmazon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANAdAdapterBannerAmazon.h; sourceTree = "<group>"; };
 		8AD5155619D216E6002E53D6 /* ANAdAdapterBannerAmazon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ANAdAdapterBannerAmazon.m; sourceTree = "<group>"; };
@@ -691,16 +693,16 @@
 			children = (
 				8A944E0819D5AFCD007AAAB0 /* libMoPubSDK.a */,
 				8A944E0919D5AFCD007AAAB0 /* LICENSE-MOPUB */,
+				8AC662A319DC9E07004025D5 /* MoPub-Bridging-Header.h */,
 				8A944E0A19D5AFCD007AAAB0 /* MPAdBrowserController.xib */,
 				8A944E0B19D5AFCD007AAAB0 /* MPAdConversionTracker.h */,
-				8A944E1119D5AFCD007AAAB0 /* MPCloseButtonX.png */,
-				8A944E1219D5AFCD007AAAB0 /* [email protected] */,
-				8A944E2819D5AFCE007AAAB0 /* MRAID.bundle */,
 				8A944E0C19D5AFCD007AAAB0 /* MPAdPositioning.h */,
 				8A944E0D19D5AFCD007AAAB0 /* MPAdView.h */,
 				8A944E0E19D5AFCD007AAAB0 /* MPBannerCustomEvent.h */,
 				8A944E0F19D5AFCD007AAAB0 /* MPBannerCustomEventDelegate.h */,
 				8A944E1019D5AFCD007AAAB0 /* MPClientAdPositioning.h */,
+				8A944E1119D5AFCD007AAAB0 /* MPCloseButtonX.png */,
+				8A944E1219D5AFCD007AAAB0 /* [email protected] */,
 				8A944E1319D5AFCD007AAAB0 /* MPCollectionViewAdPlacer.h */,
 				8A944E1419D5AFCD007AAAB0 /* MPConstants.h */,
 				8A944E1519D5AFCD007AAAB0 /* MPInterstitialAdController.h */,
@@ -718,10 +720,12 @@
 				8A944E2119D5AFCD007AAAB0 /* MPNativeAdSourceDelegate.h */,
 				8A944E2219D5AFCD007AAAB0 /* MPNativeCustomEvent.h */,
 				8A944E2319D5AFCD007AAAB0 /* MPNativeCustomEventDelegate.h */,
+				8AC662A219DC9DDA004025D5 /* MPServerAdPositioning.h */,
 				8A944E2419D5AFCE007AAAB0 /* MPStreamAdPlacementData.h */,
 				8A944E2519D5AFCE007AAAB0 /* MPStreamAdPlacer.h */,
 				8A944E2619D5AFCE007AAAB0 /* MPTableViewAdManager.h */,
 				8A944E2719D5AFCE007AAAB0 /* MPTableViewAdPlacer.h */,
+				8A944E2819D5AFCE007AAAB0 /* MRAID.bundle */,
 			);
 			path = MoPubSDK;
 			sourceTree = "<group>";

mediation/mediatedviews/MoPub/MoPubSDK/MPAdPositioning.h

@@ -10,6 +10,6 @@
 @interface MPAdPositioning : NSObject <NSCopying>
 
 @property (nonatomic, assign) NSUInteger repeatingInterval;
-@property (nonatomic, retain, readonly) NSMutableOrderedSet *fixedPositions;
+@property (nonatomic, strong, readonly) NSMutableOrderedSet *fixedPositions;
 
 @end

mediation/mediatedviews/MoPub/MoPubSDK/MPAdView.h

@@ -44,7 +44,7 @@ typedef enum
  * @warning **Important**: Before releasing an instance of `MPAdView`, you must set its delegate
  * property to `nil`.
  */
-@property (nonatomic, assign) id<MPAdViewDelegate> delegate;
+@property (nonatomic, weak) id<MPAdViewDelegate> delegate;
 
 /** @name Setting Request Parameters */
 
@@ -67,7 +67,7 @@ typedef enum
  * On the MoPub website, keyword targeting options can be found under the "Advanced Targeting"
  * section when managing campaigns.
  */
-@property (nonatomic, retain) NSString *keywords;
+@property (nonatomic, copy) NSString *keywords;
 
 /**
  * A `CLLocation` object representing a user's location that should be passed to the MoPub ad server

mediation/mediatedviews/MoPub/MoPubSDK/MPBannerCustomEvent.h

@@ -88,6 +88,6 @@
  * and your `MPAdView`'s delegate of the progress of your custom event.
  *
  */
-@property (nonatomic, assign) id<MPBannerCustomEventDelegate> delegate;
+@property (nonatomic, weak) id<MPBannerCustomEventDelegate> delegate;
 
 @end

mediation/mediatedviews/MoPub/MoPubSDK/MPCollectionViewAdPlacer.h

@@ -8,6 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "MPClientAdPositioning.h"
+#import "MPServerAdPositioning.h"
 
 @class MPNativeAdRequestTargeting;
 

mediation/mediatedviews/MoPub/MoPubSDK/MPConstants.h

@@ -2,7 +2,6 @@
 //  MPConstants.h
 //  MoPub
 //
-//  Created by Nafis Jamal on 2/9/11.
 //  Copyright 2011 MoPub, Inc. All rights reserved.
 //
 
@@ -14,13 +13,13 @@
 #define HOSTNAME_FOR_TESTING        @"testing.ads.mopub.com"
 #define DEFAULT_PUB_ID              @"agltb3B1Yi1pbmNyDAsSBFNpdGUYkaoMDA"
 #define MP_SERVER_VERSION           @"8"
-#define MP_SDK_VERSION              @"2.4.0"
+#define MP_SDK_VERSION              @"3.0.0"
 
 // Sizing constants.
-#define MOPUB_BANNER_SIZE           CGSizeMake(320, 50)
-#define MOPUB_MEDIUM_RECT_SIZE      CGSizeMake(300, 250)
-#define MOPUB_LEADERBOARD_SIZE      CGSizeMake(728, 90)
-#define MOPUB_WIDE_SKYSCRAPER_SIZE  CGSizeMake(160, 600)
+extern CGSize const MOPUB_BANNER_SIZE;
+extern CGSize const MOPUB_MEDIUM_RECT_SIZE;
+extern CGSize const MOPUB_LEADERBOARD_SIZE;
+extern CGSize const MOPUB_WIDE_SKYSCRAPER_SIZE;
 
 // Miscellaneous constants.
 #define MINIMUM_REFRESH_INTERVAL            5.0

mediation/mediatedviews/MoPub/MoPubSDK/MPInterstitialAdController.h

@@ -38,7 +38,7 @@
 /**
  * The delegate (`MPInterstitialAdControllerDelegate`) of the interstitial ad object.
  */
-@property (nonatomic, assign) id<MPInterstitialAdControllerDelegate> delegate;
+@property (nonatomic, weak) id<MPInterstitialAdControllerDelegate> delegate;
 
 /** @name Setting Request Parameters */
 

mediation/mediatedviews/MoPub/MoPubSDK/MPInterstitialCustomEvent.h

@@ -81,6 +81,6 @@
  *
  */
 
-@property (nonatomic, assign) id<MPInterstitialCustomEventDelegate> delegate;
+@property (nonatomic, weak) id<MPInterstitialCustomEventDelegate> delegate;
 
 @end

mediation/mediatedviews/MoPub/MoPubSDK/MPNativeAdData.h

@@ -12,7 +12,7 @@
 @interface MPNativeAdData : NSObject
 
 @property (nonatomic, copy) NSString *adUnitID;
-@property (nonatomic, retain) MPNativeAd *ad;
+@property (nonatomic, strong) MPNativeAd *ad;
 @property (nonatomic, assign) Class renderingClass;
 
 @end

mediation/mediatedviews/MoPub/MoPubSDK/MPNativeAdRequest.h

@@ -32,7 +32,7 @@ typedef void(^MPNativeAdRequestHandler)(MPNativeAdRequest *request,
  * An object representing targeting parameters that can be passed to the MoPub ad server to
  * serve more relevant advertising.
  */
-@property (nonatomic, retain) MPNativeAdRequestTargeting *targeting;
+@property (nonatomic, strong) MPNativeAdRequestTargeting *targeting;
 
 /** @name Initializing and Starting an Ad Request */
 

mediation/mediatedviews/MoPub/MoPubSDK/MPNativeAdRequestTargeting.h

@@ -49,6 +49,6 @@
  *
  * The MoPub ad server will attempt to only return the assets in desiredAssets.
  */
-@property (nonatomic, retain) NSSet *desiredAssets;
+@property (nonatomic, strong) NSSet *desiredAssets;
 
 @end

mediation/mediatedviews/MoPub/MoPubSDK/MPNativeAdSource.h

@@ -11,7 +11,7 @@
 
 @interface MPNativeAdSource : NSObject
 
-@property (nonatomic, assign) id <MPNativeAdSourceDelegate> delegate;
+@property (nonatomic, weak) id <MPNativeAdSourceDelegate> delegate;
 
 + (instancetype)source;
 - (void)loadAdsWithAdUnitIdentifier:(NSString *)identifier andTargeting:(MPNativeAdRequestTargeting *)targeting;

mediation/mediatedviews/MoPub/MoPubSDK/MPNativeCustomEvent.h

@@ -64,6 +64,6 @@
  * The `delegate` object defines several methods that you should call in order to inform MoPub
  * of the progress of your custom event.
  */
-@property (nonatomic, assign) id<MPNativeCustomEventDelegate> delegate;
+@property (nonatomic, weak) id<MPNativeCustomEventDelegate> delegate;
 
 @end

mediation/mediatedviews/MoPub/MoPubSDK/MPServerAdPositioning.h

@@ -0,0 +1,12 @@
+//
+//  MPServerAdPositioning.h
+//  MoPub
+//
+//  Copyright (c) 2014 MoPub. All rights reserved.
+//
+
+#import "MPAdPositioning.h"
+
+@interface MPServerAdPositioning : MPAdPositioning
+
+@end

mediation/mediatedviews/MoPub/MoPubSDK/MPStreamAdPlacer.h

@@ -55,12 +55,12 @@
  * It calculates an on-screen range and uses a small look-ahead to place ads where the user is
  * likely to view them.
  */
-@property (nonatomic, retain) NSArray *visibleIndexPaths;
+@property (nonatomic, strong) NSArray *visibleIndexPaths;
 
-@property (nonatomic, assign) UIViewController *viewController;
-@property (nonatomic, assign) id<MPStreamAdPlacerDelegate> delegate;
-@property (nonatomic, readonly) MPAdPositioning *adPositioning;
-@property (nonatomic, readonly) Class defaultAdRenderingClass;
+@property (nonatomic, weak) UIViewController *viewController;
+@property (nonatomic, weak) id<MPStreamAdPlacerDelegate> delegate;
+@property (nonatomic, readonly, copy) MPAdPositioning *adPositioning;
+@property (nonatomic, readonly, assign) Class defaultAdRenderingClass;
 
 /**
  * Creates and returns a new ad placer that can display ads in a stream.

mediation/mediatedviews/MoPub/MoPubSDK/MPTableViewAdPlacer.h

@@ -8,6 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "MPClientAdPositioning.h"
+#import "MPServerAdPositioning.h"
 
 @class MPNativeAdRequestTargeting;
 

mediation/mediatedviews/MoPub/MoPubSDK/MRAID.bundle/mraid.js

@@ -17,6 +17,9 @@
   // Establish the root mraidbridge object.
   var mraidbridge = window.mraidbridge = {};
 
+  // native SDK is ready to process mraid commands.
+  var nativeSDKFiredReady = false;
+
   // Listeners for bridge events.
   var listeners = {};
 
@@ -29,6 +32,7 @@
   //////////////////////////////////////////////////////////////////////////////////////////////////
 
   mraidbridge.fireReadyEvent = function() {
+    nativeSDKFiredReady = true;
     mraidbridge.fireEvent('ready');
   };
 
@@ -63,6 +67,12 @@
   };
 
   mraidbridge.executeNativeCall = function(command) {
+    if (!nativeSDKFiredReady) {
+        console.log('rejecting ' + command + ' because mraid is not ready');
+        mraidbridge.fireErrorEvent('mraid is not ready', command);
+        return;
+    }
+
     var call = 'mraid://' + command;
 
     var key, value;

mediation/mediatedviews/MoPub/MoPubSDK/MoPub-Bridging-Header.h

@@ -0,0 +1,27 @@
+//
+//  MoPub-Bridging-Header.h
+//  MoPubSDK
+//
+//  Copyright (c) 2014 MoPub. All rights reserved.
+//
+
+#import "MPAdConversionTracker.h"
+#import "MPAdView.h"
+#import "MPBannerCustomEvent.h"
+#import "MPBannerCustomEventDelegate.h"
+#import "MPConstants.h"
+#import "MPInterstitialAdController.h"
+#import "MPInterstitialCustomEvent.h"
+#import "MPInterstitialCustomEventDelegate.h"
+
+#import "MPNativeAd.h"
+#import "MPNativeAdAdapter.h"
+#import "MPNativeCustomEvent.h"
+#import "MPNativeAdError.h"
+#import "MPNativeAdRendering.h"
+#import "MPNativeAdRequest.h"
+#import "MPNativeAdRequestTargeting.h"
+#import "MPTableViewAdManager.h"
+
+#import "MPCollectionViewAdPlacer.h"
+#import "MPTableViewAdPlacer.h"

mediation/mediatedviews/README.txt

@@ -1,6 +1,6 @@
-Update 9/30/14
+Update 10/01/14
 AdMob SDK Version 6.12.0
 Amazon SDK Version 2.1.2
 Facebook SDK Version 3.18.2
 Millennial Media SDK Version 5.4.1
-MoPub SDK Version 2.4.0
+MoPub SDK Version 3.0.0

tests/MediationAdapterApp/Base.lproj/Main.storyboard

@@ -3,7 +3,6 @@
     <dependencies>
         <deployment defaultVersion="1536" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
         <!--Mediation Adapter View Controller-->
@@ -18,21 +17,21 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
+                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="aeR-tn-bir">
+                                <rect key="frame" x="290" y="290" width="20" height="20"/>
+                            </activityIndicatorView>
                             <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hzI-ME-wpN">
-                                <rect key="frame" x="16" y="438" width="568" height="162"/>
+                                <rect key="frame" x="0.0" y="438" width="600" height="162"/>
                                 <connections>
                                     <outlet property="dataSource" destination="vXZ-lx-hvc" id="13O-1i-eyH"/>
                                     <outlet property="delegate" destination="vXZ-lx-hvc" id="dBU-ow-lGD"/>
                                 </connections>
                             </pickerView>
-                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="aeR-tn-bir">
-                                <rect key="frame" x="290" y="290" width="20" height="20"/>
-                            </activityIndicatorView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstAttribute="trailingMargin" secondItem="hzI-ME-wpN" secondAttribute="trailing" id="B3t-4Q-GyT"/>
-                            <constraint firstItem="hzI-ME-wpN" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="BCP-5B-IGf"/>
+                            <constraint firstItem="hzI-ME-wpN" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="0oN-Gg-0Uw"/>
+                            <constraint firstAttribute="trailing" secondItem="hzI-ME-wpN" secondAttribute="trailing" id="SUM-5Z-bJm"/>
                             <constraint firstAttribute="centerY" secondItem="aeR-tn-bir" secondAttribute="centerY" id="U7r-n3-5Ha"/>
                             <constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="hzI-ME-wpN" secondAttribute="bottom" id="j2c-vn-Guv"/>
                             <constraint firstAttribute="centerX" secondItem="aeR-tn-bir" secondAttribute="centerX" id="uYH-z2-5Ua"/>