diff --git a/Example/PrebidDemoJava/build.gradle b/Example/PrebidDemoJava/build.gradle index 769c04819..a7cf5dc75 100644 --- a/Example/PrebidDemoJava/build.gradle +++ b/Example/PrebidDemoJava/build.gradle @@ -50,7 +50,7 @@ dependencies { implementation project(':PrebidMobile') // For testing staging releases -// implementation 'org.prebid:prebid-mobile-sdk:1.13.0-beta2' +// implementation 'org.prebid:prebid-mobile-sdk:2.0.0-beta1' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.gms:play-services-ads:20.4.0' diff --git a/Example/PrebidDemoKotlin/build.gradle b/Example/PrebidDemoKotlin/build.gradle index ba3d82642..001d023aa 100644 --- a/Example/PrebidDemoKotlin/build.gradle +++ b/Example/PrebidDemoKotlin/build.gradle @@ -36,10 +36,10 @@ dependencies { implementation project(':PrebidMobile-maxAdapters') // For testing staging releases -// implementation 'org.prebid:prebid-mobile-sdk:1.13.0-beta2' -// implementation 'org.prebid:prebid-mobile-sdk-gam-event-handlers:1.13.0-beta2' -// implementation 'org.prebid:prebid-mobile-sdk-admob-adapters:1.13.0-beta2' -// implementation 'org.prebid:prebid-mobile-sdk-max-adapters:1.13.0-beta2' +// implementation 'org.prebid:prebid-mobile-sdk:2.0.0-beta1' +// implementation 'org.prebid:prebid-mobile-sdk-gam-event-handlers:2.0.0-beta1' +// implementation 'org.prebid:prebid-mobile-sdk-admob-adapters:2.0.0-beta1' +// implementation 'org.prebid:prebid-mobile-sdk-max-adapters:2.0.0-beta1' // Standard libraries implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobBanner.kt b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobBanner.kt index 62db31de0..2315681d3 100644 --- a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobBanner.kt +++ b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobBanner.kt @@ -7,7 +7,7 @@ import android.view.ViewGroup import com.google.android.gms.ads.* import com.google.android.gms.ads.initialization.InitializationStatus import org.prebid.mobile.PrebidMobile -import org.prebid.mobile.admob.AdMobBannerMediationUtils +import org.prebid.mobile.admob.AdMobMediationBannerUtils import org.prebid.mobile.admob.PrebidBannerAdapter import org.prebid.mobile.rendering.bidding.display.MediationBannerAdUnit @@ -56,7 +56,7 @@ object InAppAdMobBanner { .Builder() .addCustomEventExtrasBundle(PrebidBannerAdapter::class.java, extras) .build() - val mediationUtils = AdMobBannerMediationUtils(extras, bannerView) + val mediationUtils = AdMobMediationBannerUtils(extras, bannerView) adUnit = MediationBannerAdUnit( wrapper.context, diff --git a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobInterstitial.kt b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobInterstitial.kt index 964a39d10..656c1b85e 100644 --- a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobInterstitial.kt +++ b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobInterstitial.kt @@ -8,7 +8,7 @@ import com.google.android.gms.ads.LoadAdError import com.google.android.gms.ads.interstitial.InterstitialAd import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback import org.prebid.mobile.PrebidMobile -import org.prebid.mobile.admob.AdMobInterstitialMediationUtils +import org.prebid.mobile.admob.AdMobMediationInterstitialUtils import org.prebid.mobile.admob.PrebidInterstitialAdapter import org.prebid.mobile.rendering.bidding.display.MediationInterstitialAdUnit import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat @@ -31,7 +31,7 @@ object InAppAdMobInterstitial { .Builder() .addCustomEventExtrasBundle(PrebidInterstitialAdapter::class.java, extras) .build() - val mediationUtils = AdMobInterstitialMediationUtils(extras) + val mediationUtils = AdMobMediationInterstitialUtils(extras) PrebidMobile.setStoredAuctionResponse(storedAuctionResponse) adUnit = MediationInterstitialAdUnit( activity, diff --git a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobRewarded.kt b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobRewarded.kt index c9077a830..208570623 100644 --- a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobRewarded.kt +++ b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobRewarded.kt @@ -8,7 +8,7 @@ import com.google.android.gms.ads.LoadAdError import com.google.android.gms.ads.rewarded.RewardedAd import com.google.android.gms.ads.rewarded.RewardedAdLoadCallback import org.prebid.mobile.PrebidMobile -import org.prebid.mobile.admob.AdMobRewardedMediationUtils +import org.prebid.mobile.admob.AdMobMediationRewardedUtils import org.prebid.mobile.admob.PrebidRewardedAdapter import org.prebid.mobile.rendering.bidding.display.MediationRewardedVideoAdUnit @@ -29,7 +29,7 @@ object InAppAdMobRewarded { .Builder() .addNetworkExtrasBundle(PrebidRewardedAdapter::class.java, extras) .build() - val mediationUtils = AdMobRewardedMediationUtils(extras) + val mediationUtils = AdMobMediationRewardedUtils(extras) PrebidMobile.setStoredAuctionResponse(storedAuctionResponse) adUnit = MediationRewardedVideoAdUnit(activity, configId, mediationUtils) adUnit?.fetchDemand { result -> diff --git a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxBanner.kt b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxBanner.kt index 6e3700902..4a90d53bf 100644 --- a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxBanner.kt +++ b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxBanner.kt @@ -6,7 +6,7 @@ import android.widget.FrameLayout import com.applovin.mediation.MaxAd import com.applovin.mediation.MaxAdViewAdListener import com.applovin.mediation.MaxError -import com.applovin.mediation.adapters.prebid.utils.MaxBannerMediationUtils +import com.applovin.mediation.adapters.prebid.utils.MaxMediationBannerUtils import com.applovin.mediation.ads.MaxAdView import org.prebid.mobile.AdSize import org.prebid.mobile.prebidkotlindemo.R @@ -33,7 +33,8 @@ object InAppMaxBanner { ) wrapper.addView(adView) - val mediationUtils = MaxBannerMediationUtils(adView) + val mediationUtils = + MaxMediationBannerUtils(adView) adUnit = MediationBannerAdUnit( wrapper.context, configId, diff --git a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxInterstitial.kt b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxInterstitial.kt index f2a082f99..21068e19d 100644 --- a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxInterstitial.kt +++ b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxInterstitial.kt @@ -4,7 +4,7 @@ import android.app.Activity import com.applovin.mediation.MaxAd import com.applovin.mediation.MaxAdListener import com.applovin.mediation.MaxError -import com.applovin.mediation.adapters.prebid.utils.MaxInterstitialMediationUtils +import com.applovin.mediation.adapters.prebid.utils.MaxMediationInterstitialUtils import com.applovin.mediation.ads.MaxInterstitialAd import org.prebid.mobile.rendering.bidding.display.MediationInterstitialAdUnit import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat @@ -24,7 +24,7 @@ object InAppMaxInterstitial { maxInterstitialAd?.setListener(createListener()) val mediationUtils = - MaxInterstitialMediationUtils( + MaxMediationInterstitialUtils( maxInterstitialAd ) adUnit = MediationInterstitialAdUnit( diff --git a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxMrec.kt b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxMrec.kt index 7dfc39086..cd9fc6853 100644 --- a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxMrec.kt +++ b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxMrec.kt @@ -8,7 +8,7 @@ import com.applovin.mediation.MaxAd import com.applovin.mediation.MaxAdFormat import com.applovin.mediation.MaxAdViewAdListener import com.applovin.mediation.MaxError -import com.applovin.mediation.adapters.prebid.utils.MaxBannerMediationUtils +import com.applovin.mediation.adapters.prebid.utils.MaxMediationBannerUtils import com.applovin.mediation.ads.MaxAdView import com.applovin.sdk.AppLovinSdkUtils import org.prebid.mobile.AdSize @@ -37,7 +37,8 @@ object InAppMaxMrec { ) wrapper.addView(adView) - val mediationUtils = MaxBannerMediationUtils(adView) + val mediationUtils = + MaxMediationBannerUtils(adView) adUnit = MediationBannerAdUnit( wrapper.context, configId, diff --git a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxRewarded.kt b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxRewarded.kt index eeb75650e..960fa585c 100644 --- a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxRewarded.kt +++ b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappmax/InAppMaxRewarded.kt @@ -5,7 +5,7 @@ import com.applovin.mediation.MaxAd import com.applovin.mediation.MaxError import com.applovin.mediation.MaxReward import com.applovin.mediation.MaxRewardedAdListener -import com.applovin.mediation.adapters.prebid.utils.MaxRewardedMediationUtils +import com.applovin.mediation.adapters.prebid.utils.MaxMediationRewardedUtils import com.applovin.mediation.ads.MaxRewardedAd import org.prebid.mobile.rendering.bidding.display.MediationRewardedVideoAdUnit @@ -23,7 +23,7 @@ object InAppMaxRewarded { maxRewardedAd?.setListener(createListener()) val mediationUtils = - MaxRewardedMediationUtils(maxRewardedAd) + MaxMediationRewardedUtils(maxRewardedAd) adUnit = MediationRewardedVideoAdUnit( activity, configId, diff --git a/Example/PrebidInternalTestApp/build.gradle b/Example/PrebidInternalTestApp/build.gradle index 6e3ae4bda..09c2f4f30 100644 --- a/Example/PrebidInternalTestApp/build.gradle +++ b/Example/PrebidInternalTestApp/build.gradle @@ -90,10 +90,10 @@ dependencies { implementation project(':PrebidMobile-maxAdapters') // For testing staging releases -// implementation 'org.prebid:prebid-mobile-sdk:1.13.0-beta2' -// implementation 'org.prebid:prebid-mobile-sdk-gam-event-handlers:1.13.0-beta2' -// implementation 'org.prebid:prebid-mobile-sdk-admob-adapters:1.13.0-beta2' -// implementation 'org.prebid:prebid-mobile-sdk-max-adapters:1.13.0-beta2' +// implementation 'org.prebid:prebid-mobile-sdk:2.0.0-beta1' +// implementation 'org.prebid:prebid-mobile-sdk-gam-event-handlers:2.0.0-beta1' +// implementation 'org.prebid:prebid-mobile-sdk-admob-adapters:2.0.0-beta1' +// implementation 'org.prebid:prebid-mobile-sdk-max-adapters:2.0.0-beta1' // Base dependencies implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobBannerFlexibleFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobBannerFlexibleFragment.kt index bb4e47bda..fcdb49744 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobBannerFlexibleFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobBannerFlexibleFragment.kt @@ -7,7 +7,7 @@ import com.google.android.gms.ads.AdView import com.google.android.gms.ads.MobileAds import kotlinx.android.synthetic.main.fragment_bidding_banner.* import org.prebid.mobile.AdSize -import org.prebid.mobile.admob.AdMobBannerMediationUtils +import org.prebid.mobile.admob.AdMobMediationBannerUtils import org.prebid.mobile.admob.PrebidBannerAdapter import org.prebid.mobile.rendering.bidding.display.MediationBannerAdUnit import com.google.android.gms.ads.AdSize as GamAdSize @@ -35,7 +35,8 @@ class AdMobBannerFlexibleFragment : AdMobBannerFragment() { .Builder() .addCustomEventExtrasBundle(PrebidBannerAdapter::class.java, adRequestExtras!!) .build() - val mediationUtils = AdMobBannerMediationUtils(adRequestExtras, bannerView) + val mediationUtils = + AdMobMediationBannerUtils(adRequestExtras, bannerView) adUnit = MediationBannerAdUnit( diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobBannerFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobBannerFragment.kt index 99b82f9f1..7e8f1285f 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobBannerFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobBannerFragment.kt @@ -11,7 +11,7 @@ import kotlinx.android.synthetic.main.events_admob.* import kotlinx.android.synthetic.main.fragment_bidding_banner.* import org.prebid.mobile.AdSize -import org.prebid.mobile.admob.AdMobBannerMediationUtils +import org.prebid.mobile.admob.AdMobMediationBannerUtils import org.prebid.mobile.admob.PrebidBannerAdapter import org.prebid.mobile.rendering.bidding.display.MediationBannerAdUnit import org.prebid.mobile.renderingtestapp.AdFragment @@ -58,7 +58,8 @@ open class AdMobBannerFragment : AdFragment() { .Builder() .addCustomEventExtrasBundle(PrebidBannerAdapter::class.java, adRequestExtras!!) .build() - val mediationUtils = AdMobBannerMediationUtils(adRequestExtras, bannerView) + val mediationUtils = + AdMobMediationBannerUtils(adRequestExtras, bannerView) adUnit = MediationBannerAdUnit( diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobInterstitialFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobInterstitialFragment.kt index 3ff7bf67e..9adc30577 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobInterstitialFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobInterstitialFragment.kt @@ -11,7 +11,7 @@ import com.google.android.gms.ads.interstitial.InterstitialAd import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback import kotlinx.android.synthetic.main.events_admob_rewarded.* import kotlinx.android.synthetic.main.fragment_bidding_banner.* -import org.prebid.mobile.admob.AdMobInterstitialMediationUtils +import org.prebid.mobile.admob.AdMobMediationInterstitialUtils import org.prebid.mobile.admob.PrebidInterstitialAdapter import org.prebid.mobile.rendering.bidding.display.MediationInterstitialAdUnit import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat @@ -45,7 +45,7 @@ open class AdMobInterstitialFragment : AdFragment() { override fun initAd(): Any? { extras = Bundle() - val mediationUtils = AdMobInterstitialMediationUtils(extras) + val mediationUtils = AdMobMediationInterstitialUtils(extras) isVideo = arguments?.getBoolean(ARG_IS_VIDEO) ?: false var adUnitFormat = EnumSet.of(AdUnitFormat.DISPLAY) diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobRewardedFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobRewardedFragment.kt index 1dd333032..dcb7355b9 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobRewardedFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobRewardedFragment.kt @@ -11,7 +11,7 @@ import com.google.android.gms.ads.rewarded.RewardedAd import com.google.android.gms.ads.rewarded.RewardedAdLoadCallback import kotlinx.android.synthetic.main.events_admob_rewarded.* import kotlinx.android.synthetic.main.fragment_bidding_banner.* -import org.prebid.mobile.admob.AdMobRewardedMediationUtils +import org.prebid.mobile.admob.AdMobMediationRewardedUtils import org.prebid.mobile.admob.PrebidRewardedAdapter import org.prebid.mobile.rendering.bidding.display.MediationRewardedVideoAdUnit import org.prebid.mobile.renderingtestapp.AdFragment @@ -41,7 +41,7 @@ open class AdMobRewardedFragment : AdFragment() { override fun initAd(): Any? { extras = Bundle() - val mediationUtils = AdMobRewardedMediationUtils(extras) + val mediationUtils = AdMobMediationRewardedUtils(extras) adUnit = MediationRewardedVideoAdUnit(activity, configId, mediationUtils) return adUnit } diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxBannerFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxBannerFragment.kt index ed21bcef0..2e7dd7d62 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxBannerFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxBannerFragment.kt @@ -8,7 +8,7 @@ import com.applovin.mediation.MaxAd import com.applovin.mediation.MaxAdFormat import com.applovin.mediation.MaxAdViewAdListener import com.applovin.mediation.MaxError -import com.applovin.mediation.adapters.prebid.utils.MaxBannerMediationUtils +import com.applovin.mediation.adapters.prebid.utils.MaxMediationBannerUtils import com.applovin.mediation.ads.MaxAdView import com.applovin.sdk.AppLovinSdkUtils import kotlinx.android.synthetic.main.events_max_banner.* @@ -62,7 +62,8 @@ open class MaxBannerFragment : AdFragment() { ) viewContainer.addView(adView) - val mediationUtils = MaxBannerMediationUtils(adView) + val mediationUtils = + MaxMediationBannerUtils(adView) adUnit = MediationBannerAdUnit( requireContext(), configId, diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxBannerFragmentAdaptive.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxBannerFragmentAdaptive.kt index 84494ea6b..ff6a413c3 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxBannerFragmentAdaptive.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxBannerFragmentAdaptive.kt @@ -3,7 +3,7 @@ package org.prebid.mobile.renderingtestapp.plugplay.bidding.max import android.view.ViewGroup import android.widget.FrameLayout import com.applovin.mediation.MaxAdFormat -import com.applovin.mediation.adapters.prebid.utils.MaxBannerMediationUtils +import com.applovin.mediation.adapters.prebid.utils.MaxMediationBannerUtils import com.applovin.mediation.ads.MaxAdView import com.applovin.sdk.AppLovinSdkUtils import kotlinx.android.synthetic.main.fragment_bidding_banner_applovin_max.* @@ -23,7 +23,8 @@ class MaxBannerFragmentAdaptive : MaxBannerFragment() { adView?.setExtraParameter("adaptive_banner", "true") viewContainer.addView(adView) - val mediationUtils = MaxBannerMediationUtils(adView) + val mediationUtils = + MaxMediationBannerUtils(adView) adUnit = MediationBannerAdUnit( requireContext(), configId, diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxInterstitialFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxInterstitialFragment.kt index 0f2c6c7b0..56908785b 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxInterstitialFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxInterstitialFragment.kt @@ -6,7 +6,7 @@ import android.view.View import com.applovin.mediation.MaxAd import com.applovin.mediation.MaxAdListener import com.applovin.mediation.MaxError -import com.applovin.mediation.adapters.prebid.utils.MaxInterstitialMediationUtils +import com.applovin.mediation.adapters.prebid.utils.MaxMediationInterstitialUtils import com.applovin.mediation.ads.MaxInterstitialAd import kotlinx.android.synthetic.main.events_max_interstitial.* import kotlinx.android.synthetic.main.fragment_bidding_interstitial_applovin_max.* @@ -44,7 +44,7 @@ open class MaxInterstitialFragment : AdFragment() { maxInterstitialAd?.setListener(createListener()) val mediationUtils = - MaxInterstitialMediationUtils( + MaxMediationInterstitialUtils( maxInterstitialAd ) adUnit = MediationInterstitialAdUnit( diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxInterstitialFragmentMultiformat.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxInterstitialFragmentMultiformat.kt index ede8d1caa..3b5f6f446 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxInterstitialFragmentMultiformat.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxInterstitialFragmentMultiformat.kt @@ -1,6 +1,6 @@ package org.prebid.mobile.renderingtestapp.plugplay.bidding.max -import com.applovin.mediation.adapters.prebid.utils.MaxInterstitialMediationUtils +import com.applovin.mediation.adapters.prebid.utils.MaxMediationInterstitialUtils import com.applovin.mediation.ads.MaxInterstitialAd import org.prebid.mobile.rendering.bidding.display.MediationInterstitialAdUnit import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat @@ -12,9 +12,10 @@ class MaxInterstitialFragmentMultiformat : MaxInterstitialFragment() { maxInterstitialAd = MaxInterstitialAd(adUnitId, activity) maxInterstitialAd?.setListener(createListener()) - val mediationUtils = MaxInterstitialMediationUtils( - maxInterstitialAd - ) + val mediationUtils = + MaxMediationInterstitialUtils( + maxInterstitialAd + ) adUnit = MediationInterstitialAdUnit( activity, configId, diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxRewardedFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxRewardedFragment.kt index 53b73380d..39671af9b 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxRewardedFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/max/MaxRewardedFragment.kt @@ -7,7 +7,7 @@ import com.applovin.mediation.MaxAd import com.applovin.mediation.MaxError import com.applovin.mediation.MaxReward import com.applovin.mediation.MaxRewardedAdListener -import com.applovin.mediation.adapters.prebid.utils.MaxRewardedMediationUtils +import com.applovin.mediation.adapters.prebid.utils.MaxMediationRewardedUtils import com.applovin.mediation.ads.MaxRewardedAd import kotlinx.android.synthetic.main.events_max_rewarded.* import kotlinx.android.synthetic.main.fragment_bidding_rewarded_applovin_max.* @@ -42,7 +42,7 @@ class MaxRewardedFragment : AdFragment() { maxRewardedAd = MaxRewardedAd.getInstance(adUnitId, activity) maxRewardedAd?.setListener(createListener()) - val mediationUtils = MaxRewardedMediationUtils( + val mediationUtils = MaxMediationRewardedUtils( maxRewardedAd ) adUnit = MediationRewardedVideoAdUnit( diff --git a/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobBannerMediationUtils.java b/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobMediationBannerUtils.java similarity index 92% rename from PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobBannerMediationUtils.java rename to PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobMediationBannerUtils.java index 99b408107..dd51ef53e 100644 --- a/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobBannerMediationUtils.java +++ b/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobMediationBannerUtils.java @@ -14,14 +14,17 @@ import java.lang.ref.WeakReference; import java.util.HashMap; -public class AdMobBannerMediationUtils implements PrebidMediationDelegate { +public class AdMobMediationBannerUtils implements PrebidMediationDelegate { private static final String TAG = "BannerMediationUtils"; private final Bundle extras; private final WeakReference adView; - public AdMobBannerMediationUtils(Bundle adMobExtrasBundle, AdView adView) { + public AdMobMediationBannerUtils( + Bundle adMobExtrasBundle, + AdView adView + ) { this.extras = adMobExtrasBundle; this.adView = new WeakReference<>(adView); } diff --git a/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobInterstitialMediationUtils.java b/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobMediationInterstitialUtils.java similarity index 86% rename from PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobInterstitialMediationUtils.java rename to PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobMediationInterstitialUtils.java index 1b5b4856e..a1e5bb30c 100644 --- a/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobInterstitialMediationUtils.java +++ b/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobMediationInterstitialUtils.java @@ -7,11 +7,11 @@ import java.util.HashMap; -public class AdMobInterstitialMediationUtils implements PrebidMediationDelegate { +public class AdMobMediationInterstitialUtils implements PrebidMediationDelegate { private final Bundle extras; - public AdMobInterstitialMediationUtils(Bundle adMobExtrasBundle) { + public AdMobMediationInterstitialUtils(Bundle adMobExtrasBundle) { this.extras = adMobExtrasBundle; } diff --git a/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobRewardedMediationUtils.java b/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobMediationRewardedUtils.java similarity index 85% rename from PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobRewardedMediationUtils.java rename to PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobMediationRewardedUtils.java index 187479a27..94f980c39 100644 --- a/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobRewardedMediationUtils.java +++ b/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/AdMobMediationRewardedUtils.java @@ -7,11 +7,11 @@ import java.util.HashMap; -public class AdMobRewardedMediationUtils implements PrebidMediationDelegate { +public class AdMobMediationRewardedUtils implements PrebidMediationDelegate { private final Bundle extras; - public AdMobRewardedMediationUtils(Bundle adMobExtrasBundle) { + public AdMobMediationRewardedUtils(Bundle adMobExtrasBundle) { this.extras = adMobExtrasBundle; } diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java index 1ef04acf6..52f305bfd 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java @@ -21,7 +21,7 @@ public class AdUnitConfiguration { private boolean isRewarded; private boolean isBuiltInVideo = false; - private boolean isMuted = true; + private boolean isMuted = false; private boolean isSoundButtonVisible = false; private boolean isOriginalAdUnit = false; diff --git a/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxBannerMediationUtils.java b/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxMediationBannerUtils.java similarity index 92% rename from PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxBannerMediationUtils.java rename to PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxMediationBannerUtils.java index 59c2ea952..5f213b201 100644 --- a/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxBannerMediationUtils.java +++ b/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxMediationBannerUtils.java @@ -14,13 +14,13 @@ import java.lang.ref.WeakReference; import java.util.HashMap; -public class MaxBannerMediationUtils implements PrebidMediationDelegate { +public class MaxMediationBannerUtils implements PrebidMediationDelegate { - private static final String TAG = MaxBannerMediationUtils.class.getSimpleName(); + private static final String TAG = MaxMediationBannerUtils.class.getSimpleName(); private final WeakReference adViewReference; - public MaxBannerMediationUtils(MaxAdView adView) { + public MaxMediationBannerUtils(MaxAdView adView) { adViewReference = new WeakReference<>(adView); } diff --git a/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxInterstitialMediationUtils.java b/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxMediationInterstitialUtils.java similarity index 89% rename from PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxInterstitialMediationUtils.java rename to PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxMediationInterstitialUtils.java index 7eafe948d..4f162bda9 100644 --- a/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxInterstitialMediationUtils.java +++ b/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxMediationInterstitialUtils.java @@ -8,11 +8,11 @@ import java.util.HashMap; -public class MaxInterstitialMediationUtils implements PrebidMediationDelegate { +public class MaxMediationInterstitialUtils implements PrebidMediationDelegate { private final MaxInterstitialAd interstitialAd; - public MaxInterstitialMediationUtils(MaxInterstitialAd interstitialAd) { + public MaxMediationInterstitialUtils(MaxInterstitialAd interstitialAd) { this.interstitialAd = interstitialAd; } diff --git a/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxRewardedMediationUtils.java b/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxMediationRewardedUtils.java similarity index 89% rename from PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxRewardedMediationUtils.java rename to PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxMediationRewardedUtils.java index b6c58cdec..0029f3edf 100644 --- a/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxRewardedMediationUtils.java +++ b/PrebidMobile/PrebidMobile-maxAdapters/src/main/java/com/applovin/mediation/adapters/prebid/utils/MaxMediationRewardedUtils.java @@ -8,11 +8,11 @@ import java.util.HashMap; -public class MaxRewardedMediationUtils implements PrebidMediationDelegate { +public class MaxMediationRewardedUtils implements PrebidMediationDelegate { private final MaxRewardedAd rewardedAd; - public MaxRewardedMediationUtils(MaxRewardedAd rewardedAd) { + public MaxMediationRewardedUtils(MaxRewardedAd rewardedAd) { this.rewardedAd = rewardedAd; } diff --git a/build.gradle b/build.gradle index f82b0f574..cb8354ee6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ ext { - prebidVersionName = "1.13.0-beta2" + prebidVersionName = "2.0.0-beta1" prebidVersionCode = 1 minSDKVersion = 16 targetSDKVersion = 28 diff --git a/scripts/Maven/PrebidMobile-admobAdapters-pom.xml b/scripts/Maven/PrebidMobile-admobAdapters-pom.xml index 9daecd34e..0bacc3187 100644 --- a/scripts/Maven/PrebidMobile-admobAdapters-pom.xml +++ b/scripts/Maven/PrebidMobile-admobAdapters-pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.prebid prebid-mobile-sdk-admob-adapters - 1.13.0-beta2 + 2.0.0-beta1 jar Prebid Mobile Android SDK @@ -52,7 +52,7 @@ org.prebid prebid-mobile-sdk - 1.13.0-beta2 + 2.0.0-beta1 compile diff --git a/scripts/Maven/PrebidMobile-core-pom.xml b/scripts/Maven/PrebidMobile-core-pom.xml index 4b5ae697b..919c81bff 100644 --- a/scripts/Maven/PrebidMobile-core-pom.xml +++ b/scripts/Maven/PrebidMobile-core-pom.xml @@ -6,7 +6,7 @@ org.prebid prebid-mobile-sdk-core - 1.13.0-beta2 + 2.0.0-beta1 aar Prebid Mobile Android SDK Prebid Mobile diff --git a/scripts/Maven/PrebidMobile-gamEventHandlers-pom.xml b/scripts/Maven/PrebidMobile-gamEventHandlers-pom.xml index d63673cd2..1ae4a0db2 100644 --- a/scripts/Maven/PrebidMobile-gamEventHandlers-pom.xml +++ b/scripts/Maven/PrebidMobile-gamEventHandlers-pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.prebid prebid-mobile-sdk-gam-event-handlers - 1.13.0-beta2 + 2.0.0-beta1 jar Prebid Mobile Android SDK @@ -52,7 +52,7 @@ org.prebid prebid-mobile-sdk - 1.13.0-beta2 + 2.0.0-beta1 compile diff --git a/scripts/Maven/PrebidMobile-maxAdapters-pom.xml b/scripts/Maven/PrebidMobile-maxAdapters-pom.xml index 52281502c..953646018 100644 --- a/scripts/Maven/PrebidMobile-maxAdapters-pom.xml +++ b/scripts/Maven/PrebidMobile-maxAdapters-pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.prebid prebid-mobile-sdk-max-adapters - 1.13.0-beta2 + 2.0.0-beta1 jar Prebid Mobile Android SDK @@ -52,7 +52,7 @@ org.prebid prebid-mobile-sdk - 1.13.0-beta2 + 2.0.0-beta1 compile diff --git a/scripts/Maven/PrebidMobile-pom.xml b/scripts/Maven/PrebidMobile-pom.xml index 12732e1b0..5abebac98 100644 --- a/scripts/Maven/PrebidMobile-pom.xml +++ b/scripts/Maven/PrebidMobile-pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.prebid prebid-mobile-sdk - 1.13.0-beta2 + 2.0.0-beta1 jar Prebid Mobile Android SDK @@ -52,7 +52,7 @@ org.prebid prebid-mobile-sdk-core - 1.13.0-beta2 + 2.0.0-beta1 compile