Merge RC1.16 to Github

appnexus · May 15, 2014 · e431079 · e431079
2 parents fe4a8ed + 8796361
commit e431079
Show file tree

Hide file tree

Showing 112 changed files with 2,232 additions and 866 deletions.
diff --git a/ANSDK.xcodeproj/project.pbxproj b/ANSDK.xcodeproj/project.pbxproj
@@ -93,6 +93,7 @@
 /* Begin PBXFileReference section */
 		EC2E96D71911A147001A42EF /* ANANJAMImplementation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANANJAMImplementation.h; sourceTree = "<group>"; };
 		EC2E96D81911A147001A42EF /* ANANJAMImplementation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ANANJAMImplementation.m; sourceTree = "<group>"; };
+		8A629C1D1912A68000A295CE /* ANBasicConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ANBasicConfig.h; sourceTree = "<group>"; };
 		EC3905F8186693AA0017959C /* ANTargetingParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANTargetingParameters.h; sourceTree = "<group>"; };
 		EC3905F9186693B50017959C /* ANTargetingParameters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ANTargetingParameters.m; sourceTree = "<group>"; };
 		EC3E5CDC1843C6D50070315E /* libANSDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libANSDK.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -247,20 +248,20 @@
 		EC3E5D141843C7560070315E /* internal */ = {
 			isa = PBXGroup;
 			children = (
-				EC7AB08218887E5300C27B1E /* ANLogManager.m */,
 				EC3E5D151843C7560070315E /* ANAdFetcher.h */,
 				EC3E5D161843C7560070315E /* ANAdFetcher.m */,
-				EC3E5D171843C7560070315E /* ANAdResponse.h */,
-				EC3E5D181843C7560070315E /* ANAdResponse.m */,
 				EC9B3449187DEB6900013F79 /* ANAdRequestUrl.h */,
 				EC9B3448187DEB6900013F79 /* ANAdRequestUrl.m */,
+				EC3E5D171843C7560070315E /* ANAdResponse.h */,
+				EC3E5D181843C7560070315E /* ANAdResponse.m */,
 				EC3E5D1A1843C7560070315E /* ANAdView.m */,
 				EC3E5D1B1843C7560070315E /* ANAdViewDelegate.h */,
 				EC3E5D1C1843C7560070315E /* ANAdWebViewController.h */,
 				EC3E5D1D1843C7560070315E /* ANAdWebViewController.m */,
 				EC2E96D71911A147001A42EF /* ANANJAMImplementation.h */,
 				EC2E96D81911A147001A42EF /* ANANJAMImplementation.m */,
 				EC3E5D1E1843C7560070315E /* ANBannerAdView.m */,
+				8A629C1D1912A68000A295CE /* ANBasicConfig.h */,
 				EC3E5D1F1843C7560070315E /* ANBrowserViewController.h */,
 				EC3E5D201843C7560070315E /* ANBrowserViewController.m */,
 				EC3E5D231843C7560070315E /* ANGlobal.h */,
@@ -273,6 +274,7 @@
 				EC3E5D2C1843C7560070315E /* ANLocation.m */,
 				EC3E5D2D1843C7560070315E /* ANLogging.h */,
 				EC3E5D2E1843C7560070315E /* ANLogging.m */,
+				EC7AB08218887E5300C27B1E /* ANLogManager.m */,
 				EC3E5D2F1843C7560070315E /* ANMediatedAd.h */,
 				EC3E5D301843C7560070315E /* ANMediatedAd.m */,
 				EC3E5D311843C7560070315E /* ANMediationAdViewController.h */,

diff --git a/ANSDKAdMob.xcodeproj/project.pbxproj b/ANSDKAdMob.xcodeproj/project.pbxproj
@@ -33,6 +33,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		8A46BA3C1917E4EA00F4ADE1 /* ANBasicConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ANBasicConfig.h; path = sdk/internal/ANBasicConfig.h; sourceTree = SOURCE_ROOT; };
 		EC142D8018BBB4B9003989A0 /* GADAdSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GADAdSize.h; sourceTree = "<group>"; };
 		EC142D8118BBB4B9003989A0 /* GADCustomEventBanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GADCustomEventBanner.h; sourceTree = "<group>"; };
 		EC142D8218BBB4B9003989A0 /* GADCustomEventBannerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GADCustomEventBannerDelegate.h; sourceTree = "<group>"; };
@@ -91,6 +92,7 @@
 		EC2A47571845447900D29747 /* AdMob */ = {
 			isa = PBXGroup;
 			children = (
+				8A46BA3C1917E4EA00F4ADE1 /* ANBasicConfig.h */,
 				EC2A47581845447900D29747 /* ANGADCustomBannerAd.h */,
 				EC2A47591845447900D29747 /* ANGADCustomBannerAd.m */,
 				EC2A475A1845447900D29747 /* ANGADCustomInterstitialAd.h */,

diff --git a/ANSDKFull.xcodeproj/project.pbxproj b/ANSDKFull.xcodeproj/project.pbxproj
@@ -7,8 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		A8ED40DA1905BA3E009069FC /* MillennialMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A8ED40D91905BA3E009069FC /* MillennialMedia.framework */; };
+		A8ED40DB1905BA50009069FC /* MillennialMedia.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = A8ED40D91905BA3E009069FC /* MillennialMedia.framework */; };
 		EC3905FD1866948A0017959C /* ANTargetingParameters.h in Copy Files */ = {isa = PBXBuildFile; fileRef = EC3905FC1866947D0017959C /* ANTargetingParameters.h */; };
-		EC3E5DB41843EB3E0070315E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EC3E5DB31843EB3E0070315E /* Foundation.framework */; };
 		EC3E5E0D1843ECF30070315E /* ANAdAdapterBannerAdMob.m in Sources */ = {isa = PBXBuildFile; fileRef = EC3E5DE31843ECF20070315E /* ANAdAdapterBannerAdMob.m */; };
 		EC3E5E0E1843ECF30070315E /* ANAdAdapterInterstitialAdMob.m in Sources */ = {isa = PBXBuildFile; fileRef = EC3E5DE51843ECF20070315E /* ANAdAdapterInterstitialAdMob.m */; };
 		EC3E5E0F1843ECF30070315E /* ANAdAdapterBanneriAd.m in Sources */ = {isa = PBXBuildFile; fileRef = EC3E5DE81843ECF20070315E /* ANAdAdapterBanneriAd.m */; };
@@ -17,7 +18,6 @@
 		EC3E5E141843ECF30070315E /* ANAdAdapterInterstitialMillennialMedia.m in Sources */ = {isa = PBXBuildFile; fileRef = EC3E5E0A1843ECF30070315E /* ANAdAdapterInterstitialMillennialMedia.m */; };
 		EC3E5E151843ECF30070315E /* ANAdAdapterMillennialMediaBase.m in Sources */ = {isa = PBXBuildFile; fileRef = EC3E5E0C1843ECF30070315E /* ANAdAdapterMillennialMediaBase.m */; };
 		EC3E5E1B1843ED4A0070315E /* libGoogleAdMobAds.a in Copy Files */ = {isa = PBXBuildFile; fileRef = EC3E5DFE1843ECF20070315E /* libGoogleAdMobAds.a */; };
-		EC3E5E1C1843ED4A0070315E /* libMMSDK_5.1.1.a in Copy Files */ = {isa = PBXBuildFile; fileRef = EC3E5E011843ECF20070315E /* libMMSDK_5.1.1.a */; };
 		EC6AAED31885F52800CD2FDC /* ANAdAdapterBannerDFP.m in Sources */ = {isa = PBXBuildFile; fileRef = EC6AAECE1885F34900CD2FDC /* ANAdAdapterBannerDFP.m */; };
 		EC6AAED41885F52800CD2FDC /* ANAdAdapterInterstitialDFP.m in Sources */ = {isa = PBXBuildFile; fileRef = EC6AAED01885F34900CD2FDC /* ANAdAdapterInterstitialDFP.m */; };
 		EC7AB0881888814300C27B1E /* ANLogManager.h in Copy Files */ = {isa = PBXBuildFile; fileRef = EC7AB0871888813300C27B1E /* ANLogManager.h */; };
@@ -38,6 +38,7 @@
 			dstPath = "$(PRODUCT_NAME)";
 			dstSubfolderSpec = 16;
 			files = (
+				A8ED40DB1905BA50009069FC /* MillennialMedia.framework in Copy Files */,
 				EC7AB0881888814300C27B1E /* ANLogManager.h in Copy Files */,
 				EC3905FD1866948A0017959C /* ANTargetingParameters.h in Copy Files */,
 				ECF23E7718452AEF00A94DE8 /* ANAdProtocol.h in Copy Files */,
@@ -48,14 +49,16 @@
 				ECF23E7C18452AEF00A94DE8 /* ANLocation.h in Copy Files */,
 				ECF23E7D18452AEF00A94DE8 /* ANSDKResources.bundle in Copy Files */,
 				EC3E5E1B1843ED4A0070315E /* libGoogleAdMobAds.a in Copy Files */,
-				EC3E5E1C1843ED4A0070315E /* libMMSDK_5.1.1.a in Copy Files */,
 			);
 			name = "Copy Files";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		8A9C610C19195928008CF74C /* ANBasicConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ANBasicConfig.h; path = sdk/internal/ANBasicConfig.h; sourceTree = SOURCE_ROOT; };
+		A816BFA41905AD3200346C79 /* MillennialMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MillennialMedia.framework; path = ../../../mm/MMSDK/MillennialMedia.framework; sourceTree = "<group>"; };
+		A8ED40D91905BA3E009069FC /* MillennialMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MillennialMedia.framework; path = mediation/mediatedviews/libs/MMSDK/MillennialMedia.framework; sourceTree = "<group>"; };
 		EC3905FC1866947D0017959C /* ANTargetingParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANTargetingParameters.h; sourceTree = "<group>"; };
 		EC3E5DB01843EB3E0070315E /* libANSDKFull.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libANSDKFull.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		EC3E5DB31843EB3E0070315E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -123,7 +126,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EC3E5DB41843EB3E0070315E /* Foundation.framework in Frameworks */,
+				A8ED40DA1905BA3E009069FC /* MillennialMedia.framework in Frameworks */,
 				ECF23E7618452AE100A94DE8 /* libANSDK.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -155,6 +158,8 @@
 		EC3E5DB21843EB3E0070315E /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				A8ED40D91905BA3E009069FC /* MillennialMedia.framework */,
+				A816BFA41905AD3200346C79 /* MillennialMedia.framework */,
 				EC3E5DEB1843ECF20070315E /* libs */,
 				EC3E5DB31843EB3E0070315E /* Foundation.framework */,
 				EC3E5DC11843EB3E0070315E /* XCTest.framework */,
@@ -165,6 +170,7 @@
 		EC3E5DE11843ECF20070315E /* AdMob */ = {
 			isa = PBXGroup;
 			children = (
+				8A9C610C19195928008CF74C /* ANBasicConfig.h */,
 				EC3E5DE21843ECF20070315E /* ANAdAdapterBannerAdMob.h */,
 				EC3E5DE31843ECF20070315E /* ANAdAdapterBannerAdMob.m */,
 				EC3E5DE41843ECF20070315E /* ANAdAdapterInterstitialAdMob.h */,
@@ -334,7 +340,7 @@
 		EC3E5DA81843EB3E0070315E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0510;
 				ORGANIZATIONNAME = AppNexus;
 			};
 			buildConfigurationList = EC3E5DAB1843EB3E0070315E /* Build configuration list for PBXProject "ANSDKFull" */;
@@ -388,7 +394,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -426,7 +431,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -458,6 +462,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DSTROOT = /tmp/ANSDKFull.dst;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/mediation/mediatedviews/libs/MMSDK",
+				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
 				LIBRARY_SEARCH_PATHS = (
@@ -476,6 +484,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DSTROOT = /tmp/ANSDKFull.dst;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/mediation/mediatedviews/libs/MMSDK",
+				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
 				LIBRARY_SEARCH_PATHS = (

diff --git a/ANSDKFull.xcodeproj/xcshareddata/xcschemes/ANSDKFull.xcscheme b/ANSDKFull.xcodeproj/xcshareddata/xcschemes/ANSDKFull.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ANSDKMoPub.xcodeproj/project.pbxproj b/ANSDKMoPub.xcodeproj/project.pbxproj
@@ -11,27 +11,29 @@
 		ECF23EC8184534D000A94DE8 /* libANSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ECF23EC7184534D000A94DE8 /* libANSDK.a */; };
 		ECF23ECE184534E400A94DE8 /* ANMoPubMediationBanner.m in Sources */ = {isa = PBXBuildFile; fileRef = ECF23ECB184534E400A94DE8 /* ANMoPubMediationBanner.m */; };
 		ECF23ECF184534E400A94DE8 /* ANMoPubMediationInterstitial.m in Sources */ = {isa = PBXBuildFile; fileRef = ECF23ECD184534E400A94DE8 /* ANMoPubMediationInterstitial.m */; };
-		ECF23ED0184534FD00A94DE8 /* ANMoPubMediationBanner.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = ECF23ECA184534E400A94DE8 /* ANMoPubMediationBanner.h */; };
-		ECF23ED1184534FD00A94DE8 /* ANMoPubMediationInterstitial.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = ECF23ECC184534E400A94DE8 /* ANMoPubMediationInterstitial.h */; };
-		ECF23FBE184537B500A94DE8 /* ANSDKResources.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = ECF23EC6184534D000A94DE8 /* ANSDKResources.bundle */; };
+		ECF23ED0184534FD00A94DE8 /* ANMoPubMediationBanner.h in Copy Files */ = {isa = PBXBuildFile; fileRef = ECF23ECA184534E400A94DE8 /* ANMoPubMediationBanner.h */; };
+		ECF23ED1184534FD00A94DE8 /* ANMoPubMediationInterstitial.h in Copy Files */ = {isa = PBXBuildFile; fileRef = ECF23ECC184534E400A94DE8 /* ANMoPubMediationInterstitial.h */; };
+		ECF23FBE184537B500A94DE8 /* ANSDKResources.bundle in Copy Files */ = {isa = PBXBuildFile; fileRef = ECF23EC6184534D000A94DE8 /* ANSDKResources.bundle */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		ECF23E941845340900A94DE8 /* CopyFiles */ = {
+		ECF23E941845340900A94DE8 /* Copy Files */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "$(PRODUCT_NAME)";
 			dstSubfolderSpec = 16;
 			files = (
-				ECF23FBE184537B500A94DE8 /* ANSDKResources.bundle in CopyFiles */,
-				ECF23ED0184534FD00A94DE8 /* ANMoPubMediationBanner.h in CopyFiles */,
-				ECF23ED1184534FD00A94DE8 /* ANMoPubMediationInterstitial.h in CopyFiles */,
+				ECF23FBE184537B500A94DE8 /* ANSDKResources.bundle in Copy Files */,
+				ECF23ED0184534FD00A94DE8 /* ANMoPubMediationBanner.h in Copy Files */,
+				ECF23ED1184534FD00A94DE8 /* ANMoPubMediationInterstitial.h in Copy Files */,
 			);
+			name = "Copy Files";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		8A46BA3B1917E42B00F4ADE1 /* ANBasicConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ANBasicConfig.h; path = sdk/internal/ANBasicConfig.h; sourceTree = SOURCE_ROOT; };
 		EC3905FF186694CA0017959C /* ANTargetingParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANTargetingParameters.h; sourceTree = "<group>"; };
 		ECF23E961845340900A94DE8 /* libANSDKMoPub.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libANSDKMoPub.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		ECF23E991845340900A94DE8 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -115,6 +117,7 @@
 		ECF23EC9184534E400A94DE8 /* MoPub */ = {
 			isa = PBXGroup;
 			children = (
+				8A46BA3B1917E42B00F4ADE1 /* ANBasicConfig.h */,
 				ECF23ECA184534E400A94DE8 /* ANMoPubMediationBanner.h */,
 				ECF23ECB184534E400A94DE8 /* ANMoPubMediationBanner.m */,
 				ECF23ECC184534E400A94DE8 /* ANMoPubMediationInterstitial.h */,
@@ -145,7 +148,7 @@
 			buildPhases = (
 				ECF23E921845340900A94DE8 /* Sources */,
 				ECF23E931845340900A94DE8 /* Frameworks */,
-				ECF23E941845340900A94DE8 /* CopyFiles */,
+				ECF23E941845340900A94DE8 /* Copy Files */,
 			);
 			buildRules = (
 			);