Skip to content
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

Actualize build and test scripts #301

Merged
merged 1 commit into from
Nov 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object InAppBanner {
}

fun destroy() {
adView?.stopRefresh()
adView?.destroy()
adView = null
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ object InAppVideoBanner {
}

fun destroy() {
bannerView?.stopRefresh()
bannerView?.destroy()
bannerView = null
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import org.prebid.mobile.rendering.bidding.parallel.BannerView
object InAppGamBanner {

private var adView: BannerView? = null
private var eventHandler: GamBannerEventHandler? = null

fun create(wrapper: ViewGroup, autoRefreshTime: Int, width: Int, height: Int, adUnitId: String, configId: String) {
val eventHandler = GamBannerEventHandler(wrapper.context, adUnitId, AdSize(width, height))
Expand All @@ -20,11 +19,8 @@ object InAppGamBanner {
}

fun destroy() {
adView?.stopRefresh()
adView?.destroy()
adView = null

eventHandler?.destroy()
eventHandler = null
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import org.prebid.mobile.rendering.errors.AdException
object InAppGamInterstitial {

private var adUnit: InterstitialAdUnit? = null
private var eventHandler: GamInterstitialEventHandler? = null

fun create(
activity: Activity,
Expand All @@ -19,7 +18,7 @@ object InAppGamInterstitial {
adUnitId: String,
configId: String
) {
eventHandler = GamInterstitialEventHandler(activity, adUnitId)
val eventHandler = GamInterstitialEventHandler(activity, adUnitId)
adUnit = InterstitialAdUnit(activity, configId, AdSize(minPercentageWidth, minPercentageHeight), eventHandler)
adUnit?.setInterstitialAdUnitListener(object : InterstitialAdUnitListener {
override fun onAdLoaded(interstitialAdUnit: InterstitialAdUnit?) {
Expand All @@ -37,9 +36,6 @@ object InAppGamInterstitial {
fun destroy() {
adUnit?.destroy()
adUnit = null

eventHandler?.destroy()
eventHandler = null
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import org.prebid.mobile.rendering.errors.AdException

object InAppGamRewardedInterstitial {

private var eventHandler: GamRewardedEventHandler? = null
private var adUnit: RewardedAdUnit? = null

fun create(activity: Activity, adUnitId: String, configId: String) {
eventHandler = GamRewardedEventHandler(activity, adUnitId)
val eventHandler = GamRewardedEventHandler(activity, adUnitId)
adUnit = RewardedAdUnit(activity, configId, eventHandler)
adUnit?.setRewardedAdUnitListener(object : RewardedAdUnitListener {
override fun onAdLoaded(rewardedAdUnit: RewardedAdUnit?) {
Expand All @@ -29,9 +28,6 @@ object InAppGamRewardedInterstitial {
}

fun destroy() {
eventHandler?.destroy()
eventHandler = null

adUnit?.destroy()
adUnit = null
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import org.prebid.mobile.rendering.bidding.parallel.BannerView

object InAppGamVideoBanner {

private var eventHandler: GamBannerEventHandler? = null
private var bannerView: BannerView? = null

fun create(
Expand All @@ -19,9 +18,9 @@ object InAppGamVideoBanner {
adUnitId: String,
configId: String
) {
eventHandler = GamBannerEventHandler(wrapper.context, adUnitId, AdSize(width, height))
val eventHandler = GamBannerEventHandler(wrapper.context, adUnitId, AdSize(width, height))

bannerView = BannerView(wrapper.context, configId, eventHandler!!)
bannerView = BannerView(wrapper.context, configId, eventHandler)
bannerView?.videoPlacementType = VideoPlacementType.IN_BANNER
bannerView?.setAutoRefreshDelay(autoRefreshTime)
wrapper.addView(bannerView)
Expand All @@ -30,10 +29,7 @@ object InAppGamVideoBanner {
}

fun destroy() {
eventHandler?.destroy()
eventHandler = null

bannerView?.stopRefresh()
bannerView?.destroy()
bannerView = null
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ import org.prebid.mobile.rendering.errors.AdException

object InAppGamVideoInterstitial {

private var eventHandler: GamInterstitialEventHandler? = null
private var adUnit: InterstitialAdUnit? = null

fun create(activity: Activity, adUnitId: String, configId: String) {
eventHandler = GamInterstitialEventHandler(activity, adUnitId)
val eventHandler = GamInterstitialEventHandler(activity, adUnitId)
adUnit = InterstitialAdUnit(activity, configId, AdUnitFormat.VIDEO, eventHandler)
adUnit?.setInterstitialAdUnitListener(object : InterstitialAdUnitListener {
override fun onAdLoaded(interstitialAdUnit: InterstitialAdUnit?) {
Expand All @@ -29,9 +28,6 @@ object InAppGamVideoInterstitial {
}

fun destroy() {
eventHandler?.destroy()
eventHandler = null

adUnit?.destroy()
adUnit = null
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ object InAppMoPubBanner {
bannerView?.destroy()
bannerView = null

adUnit?.stopRefresh()
adUnit?.destroy()
adUnit = null
}

Expand Down
1 change: 1 addition & 0 deletions PrebidMobile/omsdk-android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// In case of updating version don't forget to update buildPrebidMobile.sh script
configurations.maybeCreate("default")
artifacts.add("default", file("${omSdkModuleName}-${omSdkVersion}.aar"))

Expand Down
101 changes: 0 additions & 101 deletions scripts/buildPrebidMobileRendering.sh

This file was deleted.

Empty file added scripts/full_clean.sh
Empty file.
4 changes: 3 additions & 1 deletion scripts/testPrebidMobile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ echoX "clean previous build"

echoX "start unit tests"
./gradlew PrebidMobile:testDebugUnitTest
./gradlew PrebidMobile-rendering:testDebugUnitTest
./gradlew PrebidMobile-rendering:testDebugUnitTest
./gradlew PrebidMobile-gamEventHandlers:testDebugUnitTest
./gradlew PrebidMobile-mopubAdapters:testDebugUnitTest