New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flurry 8.1 and Facebook 4.26.0 adapter updates #269

Merged

bichenwang merged 1 commit into master from 4.19.0-facebook-flurry-updates

Dec 14, 2017

Contributor

bichenwang commented Dec 13, 2017

No description provided.


      Flurry 8.1 and Facebook 4.26.0 adapter updates

c91b60b

bichenwang requested a review from nathanshayefar Dec 13, 2017

Contributor

nathanshayefar commented Dec 14, 2017

lgtm

bichenwang merged commit `39cd438` into master Dec 14, 2017

bichenwang deleted the 4.19.0-facebook-flurry-updates branch Dec 14, 2017

GiliSrc added a commit to SupersonicAds/mopub-android-sdk that referenced this pull request Jan 17, 2018


      Merge branch 'master' of https://github.com/mopub/mopub-android-sdk

* 'master' of https://github.com/mopub/mopub-android-sdk:
  Flurry 8.1 and Facebook 4.26.0 adapter updates (mopub#269)
  Release: version 4.19.0
  Update MillennialNative to MM SDK 6.6
  Release: version 4.18.0
  Updating AdColony Adapters (mopub#261) Please reference the Supported Mediation Partner page at http://bit.ly/2mqsuFH for the latest version and ad format certifications.
  Update README disclosure for clarity
  Release: version 4.17.0
  Release: version 4.16.1
  Update LICENSE
  Update CHANGELOG.md
  Update README.md
  Update README.md
  Release: version 4.16.0

49ff34e

smartvdd pushed a commit to ifunny/mopub-android-sdk that referenced this pull request Mar 14, 2018


      Merge branch 'master' of github.com:mopub/mopub-android-sdk into issu…

…e/IA-4964_mopub_4.20.0_update

* 'master' of github.com:mopub/mopub-android-sdk:
  Release: version 4.20.0
  Flurry 8.1 and Facebook 4.26.0 adapter updates (mopub#269)
  Release: version 4.19.0
  Update MillennialNative to MM SDK 6.6
  Release: version 4.18.0
  Updating AdColony Adapters (mopub#261) Please reference the Supported Mediation Partner page at http://bit.ly/2mqsuFH for the latest version and ad format certifications.
  Update README disclosure for clarity
  Release: version 4.17.0
  Release: version 4.16.1
  Update LICENSE
  Update CHANGELOG.md
  Update README.md
  Update README.md
  Release: version 4.16.0
  Updating mediation adapters (mopub#255)

# Conflicts:
#	CHANGELOG.md
#	README.md
#	build.gradle
#	extras/src/com/mopub/mobileads/AdColonyInterstitial.java
#	extras/src/com/mopub/mobileads/AdColonyRewardedVideo.java
#	extras/src/com/mopub/mobileads/ChartboostInterstitial.java
#	extras/src/com/mopub/mobileads/ChartboostRewardedVideo.java
#	extras/src/com/mopub/mobileads/ChartboostShared.java
#	extras/src/com/mopub/mobileads/FacebookBanner.java
#	extras/src/com/mopub/mobileads/FacebookInterstitial.java
#	extras/src/com/mopub/mobileads/GooglePlayServicesBanner.java
#	extras/src/com/mopub/mobileads/GooglePlayServicesInterstitial.java
#	extras/src/com/mopub/mobileads/GooglePlayServicesRewardedVideo.java
#	extras/src/com/mopub/mobileads/MillennialBanner.java
#	extras/src/com/mopub/mobileads/MillennialInterstitial.java
#	extras/src/com/mopub/mobileads/TapjoyInterstitial.java
#	extras/src/com/mopub/mobileads/TapjoyRewardedVideo.java
#	extras/src/com/mopub/mobileads/UnityInterstitial.java
#	extras/src/com/mopub/mobileads/UnityRewardedVideo.java
#	extras/src/com/mopub/mobileads/UnityRouter.java
#	extras/src/com/mopub/mobileads/VungleInterstitial.java
#	extras/src/com/mopub/mobileads/VungleRewardedVideo.java
#	extras/src/com/mopub/nativeads/FacebookAdRenderer.java
#	extras/src/com/mopub/nativeads/FacebookNative.java
#	extras/src/com/mopub/nativeads/GooglePlayServicesAdRenderer.java
#	extras/src/com/mopub/nativeads/GooglePlayServicesNative.java
#	extras/src/com/mopub/nativeads/MillennialNative.java
#	gradle/wrapper/gradle-wrapper.properties
#	mopub-sample/AndroidManifest.xml
#	mopub-sample/build.gradle
#	mopub-sdk/build.gradle
#	mopub-sdk/mopub-sdk-banner/build.gradle
#	mopub-sdk/mopub-sdk-banner/src/main/java/com/mopub/mobileads/CustomEventBanner.java
#	mopub-sdk/mopub-sdk-banner/src/main/java/com/mopub/mobileads/CustomEventBannerAdapter.java
#	mopub-sdk/mopub-sdk-banner/src/main/java/com/mopub/mobileads/HtmlBanner.java
#	mopub-sdk/mopub-sdk-banner/src/main/java/com/mopub/mraid/MraidBanner.java
#	mopub-sdk/mopub-sdk-base/build.gradle
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/common/AvidViewabilitySession.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/common/DataKeys.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/common/ExternalViewabilitySession.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/common/ExternalViewabilitySessionManager.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/common/MoPub.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/common/MoPubBrowser.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/common/MoatViewabilitySession.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/common/UrlResolutionTask.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/common/util/ResponseHeader.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/mobileads/AdViewController.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/mobileads/HtmlWebViewClient.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/mobileads/MoatBuyerTagXmlManager.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/mobileads/VastVideoViewController.java
#	mopub-sdk/mopub-sdk-base/src/main/java/com/mopub/network/AdRequest.java
#	mopub-sdk/mopub-sdk-interstitial/build.gradle
#	mopub-sdk/mopub-sdk-interstitial/src/main/java/com/mopub/mobileads/MoPubActivity.java
#	mopub-sdk/mopub-sdk-native-static/build.gradle
#	mopub-sdk/mopub-sdk-native-static/src/main/java/com/mopub/nativeads/StaticNativeAd.java
#	mopub-sdk/mopub-sdk-native-video/build.gradle
#	mopub-sdk/mopub-sdk-rewardedvideo/build.gradle
#	mopub-sdk/mopub-sdk-rewardedvideo/src/main/java/com/mopub/mobileads/MoPubRewardedPlayable.java
#	mopub-sdk/mopub-sdk-rewardedvideo/src/main/java/com/mopub/mobileads/MoPubRewardedVideo.java
#	mopub-sdk/mopub-sdk-rewardedvideo/src/main/java/com/mopub/mobileads/MoPubRewardedVideoManager.java
#	mopub-sdk/shared-build.gradle
#	mopub-sdk/src/main/resources/fabric/com.mopub.sdk.android.mopub.properties
#	mopub-sdk/src/test/java/com/mopub/common/BrowserWebViewClientTest.java
#	mopub-sdk/src/test/java/com/mopub/common/UrlHandlerTest.java
#	mopub-sdk/src/test/java/com/mopub/common/UrlResolutionTaskTest.java
#	mopub-sdk/src/test/java/com/mopub/common/test/support/SdkTestRunner.java
#	mopub-sdk/src/test/java/com/mopub/common/util/DrawablesTest.java
#	mopub-sdk/src/test/java/com/mopub/common/util/ManifestUtilsTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/BaseInterstitialActivityTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/CustomEventBannerAdapterTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/HtmlBannerTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/HtmlWebViewClientTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/MoPubConversionTrackerTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/MoPubRewardedPlayableTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/MoPubRewardedVideoTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/MoPubViewTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/MraidActivityTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/MraidVideoPlayerActivityTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/RewardedAdDataTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/RewardedMraidActivityTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/RewardedVideoCompletionRequestHandlerTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/VastCompanionAdConfigTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/VastExtensionXmlManagerTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/VastIconConfigTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/VastLinearXmlManagerTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/VastVideoBlurLastVideoFrameTaskTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/VastVideoConfigTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/VastVideoViewControllerTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/VastVideoViewTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/VastXmlManagerAggregatorTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/ViewGestureDetectorTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/WebViewAdUrlGeneratorTest.java
#	mopub-sdk/src/test/java/com/mopub/mobileads/WebViewCacheServiceTest.java
#	mopub-sdk/src/test/java/com/mopub/mraid/MraidBannerTest.java
#	mopub-sdk/src/test/java/com/mopub/mraid/MraidControllerTest.java
#	mopub-sdk/src/test/java/com/mopub/mraid/MraidVideoViewControllerTest.java
#	mopub-sdk/src/test/java/com/mopub/nativeads/HttpDiskCompositeDataSourceTest.java
#	mopub-sdk/src/test/java/com/mopub/nativeads/ImpressionTrackerTest.java
#	mopub-sdk/src/test/java/com/mopub/nativeads/MoPubAdAdapterTest.java
#	mopub-sdk/src/test/java/com/mopub/nativeads/MoPubStaticNativeAdTest.java
#	mopub-sdk/src/test/java/com/mopub/nativeads/NativeFullScreenVideoViewTest.java
#	mopub-sdk/src/test/java/com/mopub/nativeads/NativeUrlGeneratorTest.java
#	mopub-sdk/src/test/java/com/mopub/nativeads/NativeVideoControllerTest.java
#	mopub-sdk/src/test/java/com/mopub/nativeads/NativeVideoViewControllerTest.java
#	mopub-sdk/src/test/java/com/mopub/nativeads/StaticNativeAdTest.java
#	mopub-sdk/src/test/java/com/mopub/nativeads/factories/CustomEventNativeFactoryTest.java
#	mopub-sdk/src/test/java/com/mopub/network/AdRequestTest.java
#	mopub-sdk/src/test/java/com/mopub/network/MoPubRequestQueueTest.java
#	mopub-sdk/src/test/resources/com/mopub/robolectric.properties

55901af

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

You can’t perform that action at this time.