diff --git a/CHANGELOG.md b/CHANGELOG.md index 79b476f39..14b140806 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## Version 4.20.1 (March 12, 2018) +- **Bug Fixes** + - Fixes compatibility issues with some fullscreen ads on iPhone X + ## Version 4.20.0 (February 20, 2018) - **Bug Fixes** - Fixed ad expiration check for rewarded ad formats diff --git a/MoPubSDK/Internal/HTML/MPAdWebViewAgent.m b/MoPubSDK/Internal/HTML/MPAdWebViewAgent.m index afd95f5cf..0fea74d6f 100644 --- a/MoPubSDK/Internal/HTML/MPAdWebViewAgent.m +++ b/MoPubSDK/Internal/HTML/MPAdWebViewAgent.m @@ -125,6 +125,7 @@ - (void)loadConfiguration:(MPAdConfiguration *)configuration self.view = nil; } self.view = [[MPWebView alloc] initWithFrame:self.frame]; + self.view.shouldConformToSafeArea = [self isInterstitialAd]; self.view.delegate = self; [self.view addGestureRecognizer:self.userInteractionRecognizer]; diff --git a/MoPubSDK/Internal/HTML/MPWebView.h b/MoPubSDK/Internal/HTML/MPWebView.h index b0557f4fe..d6a4c5049 100644 --- a/MoPubSDK/Internal/HTML/MPWebView.h +++ b/MoPubSDK/Internal/HTML/MPWebView.h @@ -53,6 +53,16 @@ typedef void (^MPWebViewJavascriptEvaluationCompletionHandler)(id result, NSErro @property (weak, nonatomic) id delegate; +// When set to `YES`, `shouldConformToSafeArea` sets constraints on the WKWebView to always stay within the safe area +// using the MPWebView's safeAreaLayoutGuide. Otherwise, the WKWebView will be constrained directly to MPWebView's +// anchors to fill the whole container. Default is `NO`. +// +// This property has no effect on versions of iOS less than 11 or phones other than iPhone X. +// +// This property has no effect on UIWebView-based MPWebViews, as UIWebView only supports springs and struts, however +// this should not be an issue because UIWebView doesn't seem to be glitchy with the safe area. +@property (nonatomic, assign) BOOL shouldConformToSafeArea; + @property (nonatomic, readonly, getter=isLoading) BOOL loading; // These methods and properties are non-functional below iOS 9. If you call or try to set them, they'll do nothing. diff --git a/MoPubSDK/Internal/HTML/MPWebView.m b/MoPubSDK/Internal/HTML/MPWebView.m index 469cf3228..7ed89ecc9 100644 --- a/MoPubSDK/Internal/HTML/MPWebView.m +++ b/MoPubSDK/Internal/HTML/MPWebView.m @@ -26,6 +26,8 @@ @interface MPWebView () *wkWebViewLayoutConstraints; + @property (nonatomic, assign) BOOL hasMovedToWindow; @end @@ -113,6 +115,9 @@ - (void)setUpStepsForceUIWebView:(BOOL)forceUIWebView { // set default scalesPageToFit self.scalesPageToFit = NO; + // set default `shouldConformToSafeArea` + self.shouldConformToSafeArea = NO; + // configure like the old MPAdWebView self.backgroundColor = [UIColor clearColor]; self.opaque = NO; @@ -167,6 +172,7 @@ - (void)didMoveToWindow { && [self.wkWebView.superview isEqual:gOffscreenView]) { self.wkWebView.frame = self.bounds; [self addSubview:self.wkWebView]; + [self constrainWebViewShouldUseSafeArea:self.shouldConformToSafeArea]; self.hasMovedToWindow = YES; // Don't keep OffscreenView if we don't need it; it can always be re-allocated again later @@ -218,6 +224,42 @@ - (void)dealloc { [self cleanUpOffscreenView]; } +- (void)setShouldConformToSafeArea:(BOOL)shouldConformToSafeArea { + _shouldConformToSafeArea = shouldConformToSafeArea; + + if (self.hasMovedToWindow) { + [self constrainWebViewShouldUseSafeArea:shouldConformToSafeArea]; + } +} + +- (void)constrainWebViewShouldUseSafeArea:(BOOL)shouldUseSafeArea { + if (@available(iOS 11.0, *)) { + self.wkWebView.translatesAutoresizingMaskIntoConstraints = NO; + + if (self.wkWebViewLayoutConstraints) { + [NSLayoutConstraint deactivateConstraints:self.wkWebViewLayoutConstraints]; + } + + if (shouldUseSafeArea) { + self.wkWebViewLayoutConstraints = @[ + [self.wkWebView.topAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.topAnchor], + [self.wkWebView.leadingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.leadingAnchor], + [self.wkWebView.trailingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.trailingAnchor], + [self.wkWebView.bottomAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.bottomAnchor], + ]; + } else { + self.wkWebViewLayoutConstraints = @[ + [self.wkWebView.topAnchor constraintEqualToAnchor:self.topAnchor], + [self.wkWebView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor], + [self.wkWebView.trailingAnchor constraintEqualToAnchor:self.trailingAnchor], + [self.wkWebView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor], + ]; + } + + [NSLayoutConstraint activateConstraints:self.wkWebViewLayoutConstraints]; + } +} + - (BOOL)isLoading { return self.uiWebView ? self.uiWebView.isLoading : self.wkWebView.isLoading; } diff --git a/MoPubSDK/Internal/MRAID/MRController.m b/MoPubSDK/Internal/MRAID/MRController.m index a7f960290..7f7569ab0 100644 --- a/MoPubSDK/Internal/MRAID/MRController.m +++ b/MoPubSDK/Internal/MRAID/MRController.m @@ -144,6 +144,7 @@ - (void)loadAdWithConfiguration:(MPAdConfiguration *)configuration self.mraidWebView = [self buildMRAIDWebViewWithFrame:self.mraidDefaultAdFrame forceUIWebView:self.shouldUseUIWebView]; + self.mraidWebView.shouldConformToSafeArea = [self isInterstitialAd]; self.mraidBridge = [[MPInstanceProvider sharedProvider] buildMRBridgeWithWebView:self.mraidWebView delegate:self]; self.mraidAdView = [[MPInstanceProvider sharedProvider] buildMRAIDMPClosableViewWithFrame:self.mraidDefaultAdFrame diff --git a/MoPubSDK/MPConstants.h b/MoPubSDK/MPConstants.h index dcc7ab2fc..257a61910 100644 --- a/MoPubSDK/MPConstants.h +++ b/MoPubSDK/MPConstants.h @@ -14,7 +14,7 @@ #define DEFAULT_PUB_ID @"agltb3B1Yi1pbmNyDAsSBFNpdGUYkaoMDA" #define MP_SERVER_VERSION @"8" #define MP_BUNDLE_IDENTIFIER @"com.mopub.mopub" -#define MP_SDK_VERSION @"4.20.0" +#define MP_SDK_VERSION @"4.20.1" // Sizing constants. extern CGSize const MOPUB_BANNER_SIZE; diff --git a/MoPubSDKFramework/Info.plist b/MoPubSDKFramework/Info.plist index 5a3398e7d..25ce37796 100644 --- a/MoPubSDKFramework/Info.plist +++ b/MoPubSDKFramework/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.20.0 + 4.20.1 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/README.md b/README.md index aee2a26a9..98ea04aed 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ The MoPub SDK is distributed as source code that you can include in your applica Includes everything you need to serve HTML and MRAID advertisements. Third party ad networks and Native MoPub advertisements are not included. -The current version of the SDK is 4.20.0 +The current version of the SDK is 4.20.1 ## Integrate @@ -46,15 +46,12 @@ More detailed class documentation is available in the repo under the `ClassDocum Please view the [changelog](https://github.com/mopub/mopub-ios-sdk/blob/master/CHANGELOG.md) for details. - **Bug Fixes** - - Fixed ad expiration check for rewarded ad formats - -- **Ad Network Mediation Updates** - - Network mediation adapters are now in a separate repository to enable an independent release cadence and faster updates to the adapters. Please find the new location [here](https://github.com/mopub/mopub-ios-mediation). + - Fixes compatibility issues with some fullscreen ads on iPhone X See the [Getting Started Guide](https://github.com/mopub/mopub-ios-sdk/wiki/Getting-Started#app-transport-security-settings) for instructions on setting up ATS in your app. ### Disabling Viewability Measurement -There are a few options for opting out of viewability measurement: +There are a few options for opting out of viewability measurement: ##### Opting Out in a Manual Integration Before dragging the MoPubSDK folder into your Xcode project, simply delete the “Moat” folder to opt out of Moat or the “Avid” folder to opt out of IAS in MoPubSDK/Viewability/. If you would like to opt out of both, delete both folders. ##### Opting Out in a CocoaPods Integration diff --git a/SampleApps/SwiftSampleApp/MoPubSwiftSampleApp.xcodeproj/project.pbxproj b/SampleApps/SwiftSampleApp/MoPubSwiftSampleApp.xcodeproj/project.pbxproj index 67a6c2adb..284f21f64 100644 --- a/SampleApps/SwiftSampleApp/MoPubSwiftSampleApp.xcodeproj/project.pbxproj +++ b/SampleApps/SwiftSampleApp/MoPubSwiftSampleApp.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 425A274AA0F4F65B9A2E4FA5 /* Pods_MoPubSwiftSampleApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D0DD05041053D9B7EB4B2DA /* Pods_MoPubSwiftSampleApp.framework */; }; 57A22BA81AD317000064A85B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57A22BA71AD317000064A85B /* AppDelegate.swift */; }; 57A22BAD1AD317000064A85B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 57A22BAB1AD317000064A85B /* Main.storyboard */; }; 57A22BAF1AD317000064A85B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 57A22BAE1AD317000064A85B /* Images.xcassets */; }; @@ -43,6 +44,7 @@ 57CE76241AD8347B0003830D /* MPAdTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57CE76221AD8347B0003830D /* MPAdTableViewController.swift */; }; 57CE76281AD837150003830D /* MPUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57CE76271AD837150003830D /* MPUtility.swift */; }; 57CE76291AD837150003830D /* MPUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57CE76271AD837150003830D /* MPUtility.swift */; }; + B798145DAC123509E23EFD8E /* libPods-MoPubSwiftSampleApp+CustomEvents.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 795630B5805669E7FEAE0E03 /* libPods-MoPubSwiftSampleApp+CustomEvents.a */; }; BC6462861DA2DE760046E206 /* PassKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC6462851DA2DE760046E206 /* PassKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; BC6462881DA2DE830046E206 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC6462871DA2DE830046E206 /* AddressBook.framework */; }; BC64628A1DA2DEBE0046E206 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC6462891DA2DEBE0046E206 /* AddressBookUI.framework */; }; @@ -64,14 +66,10 @@ BC6462AA1DA2DFB80046E206 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC6462A91DA2DFB80046E206 /* UIKit.framework */; }; BCE9193B1D7641D600A759CB /* MPSampleVideoNativeAdView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCE9193A1D7641D600A759CB /* MPSampleVideoNativeAdView.swift */; }; BCE9193C1D76424E00A759CB /* MPSampleVideoNativeAdView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCE9193A1D7641D600A759CB /* MPSampleVideoNativeAdView.swift */; }; - E45B386BD3319473E28E6BC1 /* libPods-MoPubSwiftSampleApp+CustomEvents.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E025D6801443FF2E736864EA /* libPods-MoPubSwiftSampleApp+CustomEvents.a */; }; - FC7C6A6051BB2F6A6B709BFB /* Pods_MoPubSwiftSampleApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5305A00CADC201359ECECA7A /* Pods_MoPubSwiftSampleApp.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 258A944FAD6DAA2BB9162F4B /* Pods-MoPubSwiftSampleApp+CustomEvents.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MoPubSwiftSampleApp+CustomEvents.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MoPubSwiftSampleApp+CustomEvents/Pods-MoPubSwiftSampleApp+CustomEvents.debug.xcconfig"; sourceTree = ""; }; - 3EA4814667D7277BA008986B /* Pods-MoPubSwiftSampleApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MoPubSwiftSampleApp.release.xcconfig"; path = "Pods/Target Support Files/Pods-MoPubSwiftSampleApp/Pods-MoPubSwiftSampleApp.release.xcconfig"; sourceTree = ""; }; - 5305A00CADC201359ECECA7A /* Pods_MoPubSwiftSampleApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MoPubSwiftSampleApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1D0DD05041053D9B7EB4B2DA /* Pods_MoPubSwiftSampleApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MoPubSwiftSampleApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 57A22BA21AD317000064A85B /* MoPubSwiftSampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MoPubSwiftSampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 57A22BA61AD317000064A85B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 57A22BA71AD317000064A85B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -93,7 +91,10 @@ 57CE74C41AD6F86D0003830D /* MoPubSwiftSampleApp+CustomEvents.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "MoPubSwiftSampleApp+CustomEvents.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 57CE76221AD8347B0003830D /* MPAdTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MPAdTableViewController.swift; sourceTree = ""; }; 57CE76271AD837150003830D /* MPUtility.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MPUtility.swift; sourceTree = ""; }; - AD7BF4DB662C55C7B4581A36 /* Pods-MoPubSwiftSampleApp+CustomEvents.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MoPubSwiftSampleApp+CustomEvents.release.xcconfig"; path = "Pods/Target Support Files/Pods-MoPubSwiftSampleApp+CustomEvents/Pods-MoPubSwiftSampleApp+CustomEvents.release.xcconfig"; sourceTree = ""; }; + 6521AD46F910E5BED95B0D1A /* Pods-MoPubSwiftSampleApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MoPubSwiftSampleApp.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MoPubSwiftSampleApp/Pods-MoPubSwiftSampleApp.debug.xcconfig"; sourceTree = ""; }; + 795630B5805669E7FEAE0E03 /* libPods-MoPubSwiftSampleApp+CustomEvents.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MoPubSwiftSampleApp+CustomEvents.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 7EF7CFE4A1D05C8D64203581 /* Pods-MoPubSwiftSampleApp+CustomEvents.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MoPubSwiftSampleApp+CustomEvents.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MoPubSwiftSampleApp+CustomEvents/Pods-MoPubSwiftSampleApp+CustomEvents.debug.xcconfig"; sourceTree = ""; }; + 9AD95AA13128A9EFB90D0055 /* Pods-MoPubSwiftSampleApp+CustomEvents.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MoPubSwiftSampleApp+CustomEvents.release.xcconfig"; path = "Pods/Target Support Files/Pods-MoPubSwiftSampleApp+CustomEvents/Pods-MoPubSwiftSampleApp+CustomEvents.release.xcconfig"; sourceTree = ""; }; BC6462851DA2DE760046E206 /* PassKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PassKit.framework; path = System/Library/Frameworks/PassKit.framework; sourceTree = SDKROOT; }; BC6462871DA2DE830046E206 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; }; BC6462891DA2DEBE0046E206 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; }; @@ -116,8 +117,7 @@ BCD87FB21DAD8F4E008234D3 /* MoPubSwiftSampleApp-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MoPubSwiftSampleApp-Bridging-Header.h"; sourceTree = ""; }; BCD87FE51DAD9165008234D3 /* MoPubSwiftSampleApp-CustomEvent-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MoPubSwiftSampleApp-CustomEvent-Bridging-Header.h"; sourceTree = ""; }; BCE9193A1D7641D600A759CB /* MPSampleVideoNativeAdView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MPSampleVideoNativeAdView.swift; sourceTree = ""; }; - C8366036FDB115486D7483A3 /* Pods-MoPubSwiftSampleApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MoPubSwiftSampleApp.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MoPubSwiftSampleApp/Pods-MoPubSwiftSampleApp.debug.xcconfig"; sourceTree = ""; }; - E025D6801443FF2E736864EA /* libPods-MoPubSwiftSampleApp+CustomEvents.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MoPubSwiftSampleApp+CustomEvents.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + EC52642BCCA6A12FD4DF8435 /* Pods-MoPubSwiftSampleApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MoPubSwiftSampleApp.release.xcconfig"; path = "Pods/Target Support Files/Pods-MoPubSwiftSampleApp/Pods-MoPubSwiftSampleApp.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -125,7 +125,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FC7C6A6051BB2F6A6B709BFB /* Pods_MoPubSwiftSampleApp.framework in Frameworks */, + 425A274AA0F4F65B9A2E4FA5 /* Pods_MoPubSwiftSampleApp.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -152,7 +152,7 @@ BC64628A1DA2DEBE0046E206 /* AddressBookUI.framework in Frameworks */, BC6462881DA2DE830046E206 /* AddressBook.framework in Frameworks */, BC6462861DA2DE760046E206 /* PassKit.framework in Frameworks */, - E45B386BD3319473E28E6BC1 /* libPods-MoPubSwiftSampleApp+CustomEvents.a in Frameworks */, + B798145DAC123509E23EFD8E /* libPods-MoPubSwiftSampleApp+CustomEvents.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -181,30 +181,19 @@ BC6462A51DA2DFA70046E206 /* SystemConfiguration.framework */, BC6462A71DA2DFAC0046E206 /* Twitter.framework */, BC6462A91DA2DFB80046E206 /* UIKit.framework */, - E025D6801443FF2E736864EA /* libPods-MoPubSwiftSampleApp+CustomEvents.a */, - 5305A00CADC201359ECECA7A /* Pods_MoPubSwiftSampleApp.framework */, + 1D0DD05041053D9B7EB4B2DA /* Pods_MoPubSwiftSampleApp.framework */, + 795630B5805669E7FEAE0E03 /* libPods-MoPubSwiftSampleApp+CustomEvents.a */, ); name = Frameworks; sourceTree = ""; }; - 539251359168531AB6BD539A /* Pods */ = { - isa = PBXGroup; - children = ( - C8366036FDB115486D7483A3 /* Pods-MoPubSwiftSampleApp.debug.xcconfig */, - 3EA4814667D7277BA008986B /* Pods-MoPubSwiftSampleApp.release.xcconfig */, - 258A944FAD6DAA2BB9162F4B /* Pods-MoPubSwiftSampleApp+CustomEvents.debug.xcconfig */, - AD7BF4DB662C55C7B4581A36 /* Pods-MoPubSwiftSampleApp+CustomEvents.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; 57A22B991AD317000064A85B = { isa = PBXGroup; children = ( 57A22BA41AD317000064A85B /* MoPubSwiftSampleApp */, 57A22BA31AD317000064A85B /* Products */, 48A411F8736D04269EAA92A3 /* Frameworks */, - 539251359168531AB6BD539A /* Pods */, + 5C6F1507A98A23E79245848C /* Pods */, ); sourceTree = ""; }; @@ -278,6 +267,17 @@ path = Views; sourceTree = ""; }; + 5C6F1507A98A23E79245848C /* Pods */ = { + isa = PBXGroup; + children = ( + 6521AD46F910E5BED95B0D1A /* Pods-MoPubSwiftSampleApp.debug.xcconfig */, + EC52642BCCA6A12FD4DF8435 /* Pods-MoPubSwiftSampleApp.release.xcconfig */, + 7EF7CFE4A1D05C8D64203581 /* Pods-MoPubSwiftSampleApp+CustomEvents.debug.xcconfig */, + 9AD95AA13128A9EFB90D0055 /* Pods-MoPubSwiftSampleApp+CustomEvents.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -285,12 +285,12 @@ isa = PBXNativeTarget; buildConfigurationList = 57A22BC11AD317000064A85B /* Build configuration list for PBXNativeTarget "MoPubSwiftSampleApp" */; buildPhases = ( - C079CBC2897D5EBF909F4773 /* [CP] Check Pods Manifest.lock */, + CD6A15D3474C788CB23DE989 /* [CP] Check Pods Manifest.lock */, 57A22B9E1AD317000064A85B /* Sources */, 57A22B9F1AD317000064A85B /* Frameworks */, 57A22BA01AD317000064A85B /* Resources */, - 81A576604598392C57E13F4B /* [CP] Embed Pods Frameworks */, - 40A932E326A1CB95C51009DC /* [CP] Copy Pods Resources */, + 814D5AFE7F7D078434ED9786 /* [CP] Embed Pods Frameworks */, + CA2752FB596C520FD09DBB39 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -305,12 +305,12 @@ isa = PBXNativeTarget; buildConfigurationList = 57CE74C11AD6F86D0003830D /* Build configuration list for PBXNativeTarget "MoPubSwiftSampleApp+CustomEvents" */; buildPhases = ( - B0E45430A2011DAA1E1F435A /* [CP] Check Pods Manifest.lock */, + CE6F6E85ECE2A509CD959CE2 /* [CP] Check Pods Manifest.lock */, 57CE73F21AD6F86D0003830D /* Sources */, 57CE74971AD6F86D0003830D /* Frameworks */, 57CE74AB1AD6F86D0003830D /* Resources */, - 715572FB843DE335F70656D3 /* [CP] Embed Pods Frameworks */, - F89F88211599F98F730C1FC8 /* [CP] Copy Pods Resources */, + 92D390FAFAA4ED2AD44846DB /* [CP] Embed Pods Frameworks */, + 4A9CA82FDFA47343BC2E0984 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -386,13 +386,13 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 40A932E326A1CB95C51009DC /* [CP] Copy Pods Resources */ = { + 4A9CA82FDFA47343BC2E0984 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp/Pods-MoPubSwiftSampleApp-resources.sh", + "${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp+CustomEvents/Pods-MoPubSwiftSampleApp+CustomEvents-resources.sh", "${PODS_ROOT}/../../../MoPubSDK/Internal/Common/MPAdBrowserController.xib", "${PODS_ROOT}/../../../MoPubSDK/Resources/MPCloseBtn.png", "${PODS_ROOT}/../../../MoPubSDK/Resources/MPCloseBtn@2x.png", @@ -414,68 +414,88 @@ "${PODS_ROOT}/../../../MoPubSDK/Resources/MPUnmutedBtn@2x.png", "${PODS_ROOT}/../../../MoPubSDK/Resources/MPUnmutedBtn@3x.png", "${PODS_ROOT}/../../../MoPubSDK/Resources/MRAID.bundle", + "${PODS_ROOT}/TapjoySDK/TapjoySDK_iOS_v11.11.1/Libraries/Tapjoy.embeddedframework/Resources/TapjoyResources.bundle", + "${PODS_ROOT}/TapjoySDK/TapjoySDK_iOS_v11.11.1/Libraries/Tapjoy.embeddedframework/Tapjoy.framework/Versions/A/Resources/TapjoyResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPAdBrowserController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCountdownTimer.html", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn@2x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn@3x.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MRAID.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TapjoyResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp/Pods-MoPubSwiftSampleApp-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp+CustomEvents/Pods-MoPubSwiftSampleApp+CustomEvents-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 715572FB843DE335F70656D3 /* [CP] Embed Pods Frameworks */ = { + 814D5AFE7F7D078434ED9786 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp/Pods-MoPubSwiftSampleApp-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/mopub-ios-sdk-framework/MoPub.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MoPub.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp+CustomEvents/Pods-MoPubSwiftSampleApp+CustomEvents-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp/Pods-MoPubSwiftSampleApp-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 81A576604598392C57E13F4B /* [CP] Embed Pods Frameworks */ = { + 92D390FAFAA4ED2AD44846DB /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp/Pods-MoPubSwiftSampleApp-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/mopub-ios-sdk-framework/MoPub.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MoPub.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp/Pods-MoPubSwiftSampleApp-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp+CustomEvents/Pods-MoPubSwiftSampleApp+CustomEvents-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - B0E45430A2011DAA1E1F435A /* [CP] Check Pods Manifest.lock */ = { + CA2752FB596C520FD09DBB39 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-MoPubSwiftSampleApp+CustomEvents-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp/Pods-MoPubSwiftSampleApp-resources.sh\"\n"; showEnvVarsInLog = 0; }; - C079CBC2897D5EBF909F4773 /* [CP] Check Pods Manifest.lock */ = { + CD6A15D3474C788CB23DE989 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -493,65 +513,22 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - F89F88211599F98F730C1FC8 /* [CP] Copy Pods Resources */ = { + CE6F6E85ECE2A509CD959CE2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp+CustomEvents/Pods-MoPubSwiftSampleApp+CustomEvents-resources.sh", - "${PODS_ROOT}/../../../MoPubSDK/Internal/Common/MPAdBrowserController.xib", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPCloseBtn.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPCloseBtn@2x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPCloseBtn@3x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPCloseButtonX.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPCloseButtonX@2x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPCloseButtonX@3x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPCountdownTimer.html", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPDAAIcon.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPDAAIcon@2x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPDAAIcon@3x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPMutedBtn.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPMutedBtn@2x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPMutedBtn@3x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPPlayBtn.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPPlayBtn@2x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPPlayBtn@3x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPUnmutedBtn.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPUnmutedBtn@2x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MPUnmutedBtn@3x.png", - "${PODS_ROOT}/../../../MoPubSDK/Resources/MRAID.bundle", - "${PODS_ROOT}/TapjoySDK/TapjoySDK_iOS_v11.11.1/Libraries/Tapjoy.embeddedframework/Resources/TapjoyResources.bundle", - "${PODS_ROOT}/TapjoySDK/TapjoySDK_iOS_v11.11.1/Libraries/Tapjoy.embeddedframework/Tapjoy.framework/Versions/A/Resources/TapjoyResources.bundle", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPAdBrowserController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCountdownTimer.html", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MRAID.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TapjoyResources.bundle", + "$(DERIVED_FILE_DIR)/Pods-MoPubSwiftSampleApp+CustomEvents-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MoPubSwiftSampleApp+CustomEvents/Pods-MoPubSwiftSampleApp+CustomEvents-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -734,7 +711,7 @@ }; 57A22BC21AD317000064A85B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C8366036FDB115486D7483A3 /* Pods-MoPubSwiftSampleApp.debug.xcconfig */; + baseConfigurationReference = 6521AD46F910E5BED95B0D1A /* Pods-MoPubSwiftSampleApp.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -755,7 +732,7 @@ }; 57A22BC31AD317000064A85B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3EA4814667D7277BA008986B /* Pods-MoPubSwiftSampleApp.release.xcconfig */; + baseConfigurationReference = EC52642BCCA6A12FD4DF8435 /* Pods-MoPubSwiftSampleApp.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -775,7 +752,7 @@ }; 57CE74C21AD6F86D0003830D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 258A944FAD6DAA2BB9162F4B /* Pods-MoPubSwiftSampleApp+CustomEvents.debug.xcconfig */; + baseConfigurationReference = 7EF7CFE4A1D05C8D64203581 /* Pods-MoPubSwiftSampleApp+CustomEvents.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -807,7 +784,7 @@ }; 57CE74C31AD6F86D0003830D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AD7BF4DB662C55C7B4581A36 /* Pods-MoPubSwiftSampleApp+CustomEvents.release.xcconfig */; + baseConfigurationReference = 9AD95AA13128A9EFB90D0055 /* Pods-MoPubSwiftSampleApp+CustomEvents.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; diff --git a/SampleApps/SwiftSampleApp/Podfile b/SampleApps/SwiftSampleApp/Podfile index 69ed6c523..da16b8027 100644 --- a/SampleApps/SwiftSampleApp/Podfile +++ b/SampleApps/SwiftSampleApp/Podfile @@ -11,12 +11,12 @@ end target 'MoPubSwiftSampleApp+CustomEvents' do pod 'MoPub-AdColony-Adapters' - pod 'MoPub-Google-Adapters' + pod 'MoPub-AdMob-Adapters' pod 'MoPub-Chartboost-Adapters' - pod 'MoPub-Facebook-Adapters' + pod 'MoPub-FacebookAudienceNetwork-Adapters' pod 'MoPub-Flurry-Adapters' - pod 'MoPub-Aol-Adapters' + pod 'MoPub-OnebyAOL-Adapters' pod 'MoPub-TapJoy-Adapters' - pod 'MoPub-Unity-Adapters' + pod 'MoPub-UnityAds-Adapters' pod 'MoPub-Vungle-Adapters' end diff --git a/SampleApps/SwiftSampleApp/Podfile.lock b/SampleApps/SwiftSampleApp/Podfile.lock index c312b9a5c..ca0fd76c0 100644 --- a/SampleApps/SwiftSampleApp/Podfile.lock +++ b/SampleApps/SwiftSampleApp/Podfile.lock @@ -1,31 +1,28 @@ PODS: - AdColony (3.3.0) - - ChartboostSDK (7.0.4) - - FBAudienceNetwork (4.27.2) - - Flurry-iOS-SDK/FlurryAds (8.3.4): + - ChartboostSDK (7.1.2) + - FBAudienceNetwork (4.28.0) + - Flurry-iOS-SDK/FlurryAds (8.4.0): - Flurry-iOS-SDK/FlurrySDK - - Flurry-iOS-SDK/FlurrySDK (8.3.4) - - Google-Mobile-Ads-SDK (7.28.0) + - Flurry-iOS-SDK/FlurrySDK (8.4.0) + - Google-Mobile-Ads-SDK (7.29.0) - MMAdSDK (6.6.0) - - MoPub-AdColony-Adapters (3.2.1.0): + - MoPub-AdColony-Adapters (3.3.0.0): - AdColony (~> 3.0) - - mopub-ios-sdk (~> 4.19.0) - - MoPub-Aol-Adapters (6.6.0.0): - - MMAdSDK (~> 6.0) - - mopub-ios-sdk (~> 4.19.0) - - MoPub-Chartboost-Adapters (7.0.4.0): + - mopub-ios-sdk (~> 4.0) + - MoPub-AdMob-Adapters (7.27.0.1): + - Google-Mobile-Ads-SDK (~> 7.0) + - mopub-ios-sdk (~> 4.0) + - MoPub-Chartboost-Adapters (7.0.4.1): - ChartboostSDK (~> 7.0) - - mopub-ios-sdk (~> 4.19.0) - - MoPub-Facebook-Adapters (4.27.0.1): + - mopub-ios-sdk (~> 4.0) + - MoPub-FacebookAudienceNetwork-Adapters (4.27.0.1): - FBAudienceNetwork (~> 4.0) - - mopub-ios-sdk (~> 4.19.0) - - MoPub-Flurry-Adapters (8.3.4.0): + - mopub-ios-sdk (~> 4.0) + - MoPub-Flurry-Adapters (8.3.4.1): - Flurry-iOS-SDK/FlurryAds (~> 8.0) - Flurry-iOS-SDK/FlurrySDK (~> 8.0) - - mopub-ios-sdk (~> 4.19.0) - - MoPub-Google-Adapters (7.27.0.0): - - Google-Mobile-Ads-SDK (~> 7.0) - - mopub-ios-sdk (~> 4.19.0) + - mopub-ios-sdk (~> 4.0) - mopub-ios-sdk (4.19.0): - mopub-ios-sdk/MoPubSDK (= 4.19.0) - mopub-ios-sdk/Avid (4.19.0): @@ -37,29 +34,32 @@ PODS: - mopub-ios-sdk/Avid - mopub-ios-sdk/Core - mopub-ios-sdk/Moat - - MoPub-TapJoy-Adapters (11.11.1.0): - - mopub-ios-sdk (~> 4.19.0) + - MoPub-OnebyAOL-Adapters (6.6.0.1): + - MMAdSDK (~> 6.0) + - mopub-ios-sdk (~> 4.0) + - MoPub-TapJoy-Adapters (11.11.1.2): + - mopub-ios-sdk (~> 4.0) - TapjoySDK (~> 11.0) - - MoPub-Unity-Adapters (2.1.2.0): + - MoPub-UnityAds-Adapters (2.1.2.0): - mopub-ios-sdk (~> 4.19.0) - UnityAds (~> 2.0) - - MoPub-Vungle-Adapters (5.3.2.0): - - mopub-ios-sdk (~> 4.19.0) + - MoPub-Vungle-Adapters (5.3.2.1): + - mopub-ios-sdk (~> 4.0) - VungleSDK-iOS (~> 5.0) - TapjoySDK (11.11.1) - - UnityAds (2.1.2) + - UnityAds (2.2.0) - VungleSDK-iOS (5.3.2) DEPENDENCIES: - MoPub-AdColony-Adapters - - MoPub-Aol-Adapters + - MoPub-AdMob-Adapters - MoPub-Chartboost-Adapters - - MoPub-Facebook-Adapters + - MoPub-FacebookAudienceNetwork-Adapters - MoPub-Flurry-Adapters - - MoPub-Google-Adapters - mopub-ios-sdk (from `../../`) + - MoPub-OnebyAOL-Adapters - MoPub-TapJoy-Adapters - - MoPub-Unity-Adapters + - MoPub-UnityAds-Adapters - MoPub-Vungle-Adapters EXTERNAL SOURCES: @@ -68,25 +68,25 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: AdColony: c738aa4305856bf324cc48339ea319f3afdb913c - ChartboostSDK: 670508edc3c472a6a8001c12aab8552b6a7952a9 - FBAudienceNetwork: 84fc420e262ae16b30586861fa11dd9c779336a8 - Flurry-iOS-SDK: eed8399800cf16fe7e0121831150a7957297df99 - Google-Mobile-Ads-SDK: 7f9bc0011df363ae5616449de3682a14c4701612 + ChartboostSDK: d80d64d322d397a1953a495849b8778ab9d63ff8 + FBAudienceNetwork: 25decde0ee5bfee9573d1d729ace66a66827de41 + Flurry-iOS-SDK: 0c4488af4e4289e2678f81755d3e9c204c0e8bba + Google-Mobile-Ads-SDK: 375bbb821b3df2106c37b74f6b0a97576ddc5f6b MMAdSDK: 0e6bf6f3483d29b8a107ed14f84a3ca741c66682 - MoPub-AdColony-Adapters: 13f4d98908cccd6cf730c85fff6ef3c984612d7b - MoPub-Aol-Adapters: a41e023a26d427908c48cd1bd9121ce5b916b8bd - MoPub-Chartboost-Adapters: ab13c698479c8b65b150ef640c19b9f8f4adf6e6 - MoPub-Facebook-Adapters: 04f114b19f93fa399f30ac96f17e09084bcd08b5 - MoPub-Flurry-Adapters: efd45f36740ef2ae4f998ad6ebf6b58b878799eb - MoPub-Google-Adapters: b1e8590d8c39e4576d7f79772e94a86aae62a5e0 + MoPub-AdColony-Adapters: b24cb15d9d25bb4dae87646c2414a7e10605a5fa + MoPub-AdMob-Adapters: 296302faa58f2d76758b7cafd1c9cdce9831d192 + MoPub-Chartboost-Adapters: b9c41b0f4d857da4e5618d88c1428f077933b865 + MoPub-FacebookAudienceNetwork-Adapters: 9217becdf2df48a7b0dcfceefe4eae3dd27a2dda + MoPub-Flurry-Adapters: 5c2135b6a66b6f2734731ccd9667daece274ad13 mopub-ios-sdk: 10c6aba4fd0df9c3156e7a29b9a4187d40000400 - MoPub-TapJoy-Adapters: 717b6b08b3cdc0e96776e7572370dd2df2c72d92 - MoPub-Unity-Adapters: e6bbe4ae61c800049a19bcff7eb4d2bae58b082a - MoPub-Vungle-Adapters: 53e73497f5a1bf18ab41aa8f67de88e06367fd0d + MoPub-OnebyAOL-Adapters: 935f7d61be68c515944921d42aeb9a8ce4fcbaea + MoPub-TapJoy-Adapters: aac53bb8a48273e81bed475cc9ee77f654a47ffd + MoPub-UnityAds-Adapters: ef387a1c7089c205fcb0de37a638f97092ad2a1d + MoPub-Vungle-Adapters: bc9923da74aee5e96eb734518fe250cd695654cb TapjoySDK: 55b624c62f4494c6c38cb4ee92bacfd3bb5bdd6c - UnityAds: 7ff4f1f17ab02b50f92646a353db25d23a4694af + UnityAds: 60dc4d370fcafbb31314f83c890c406821dc3dd6 VungleSDK-iOS: ff52030d594fc7f9bdcf3d1a03b308cec7796dd9 -PODFILE CHECKSUM: a20e85d3cc6b292dfce50a8d0c253ba20b036dad +PODFILE CHECKSUM: 48dcfb441619934f4c9f1006bdc15dc3a6adcd49 COCOAPODS: 1.4.0