Skip to content

Commit

Permalink
Merging release 1.13.0 fixes (#325)
Browse files Browse the repository at this point in the history 
* Added ability to deploy handlers and adapters (#308)

* feat: add event handlers and adapters to deploy script, generate pom files

* feat: edit pom files

* Fix deploying of project with rendering (#310)

Deploy script publishes rendering module as aar. Build script generates and saves aar files too. Fix Sonatype exception about javadoc and sources in OpenMeasument SDK. Fix possible exception in DemandFetcher. Move staging url to global build.gradle.

* Fix stop method #268 (#311)

* Replaced jcenter dependencies (#313)

* fix(jcenter dependencies): replace jcenter dependencies #312

* fix(jcenter dependencies): updated dependencies in pom files #312

* feat: update version to beta2

* fix: manifest merge fix #316 (#317)

* Make separate script for deploying Open Measurement SDK #318 (#321)

* Fix instream examples due to the updated dependencies  (#315)

* fix(DemoJava): fix updated dependencies in PrebidDemoJava #312

* fix: update exoplayer API in DemoJava app #312
  • Loading branch information
@ValentinPostindustria
ValentinPostindustria authored Dec 15, 2021
1 parent fdb46bb commit 6e430da
Show file tree
Hide file tree
Showing 22 changed files with 360 additions and 208 deletions.
29 changes: 6 additions & 23 deletions Example/PrebidDemoJava/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,37 +53,20 @@ project.gradle.taskGraph.whenReady {
}
}

//repositories{
// maven {
// url 'https://oss.sonatype.org/content/repositories/orgprebid-1059'
// }
//}

dependencies {

// Source code
implementation project(':PrebidMobile')

// Maven
// implementation 'org.prebid:prebid-mobile-sdk:1.12.1'
// implementation 'org.prebid:prebid-mobile-sdk-core:1.12.1'

// LocalMaven .aar
// implementation 'org.prebid:prebid-mobile-sdk:+'
// implementation 'org.prebid:prebid-mobile-sdk-core:+'

// LocalJar .jar
// Fat library
// implementation files('libs/PrebidMobile.jar')
// implementation files('libs/PrebidMobile-core.jar')

// localJarImplementation fileTree(dir: 'libs', include: ['*.jar'])
// For testing staging releases
// implementation 'org.prebid:prebid-mobile-sdk:1.13.0-beta2'

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:20.0.0'
implementation 'com.google.android.exoplayer:exoplayer-core:2.11.1'
implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.1'
implementation 'com.google.android.exoplayer:extension-ima:2.11.1'
implementation 'com.google.android.exoplayer:exoplayer:2.13.3'
implementation 'com.google.android.exoplayer:exoplayer-core:2.13.3'
implementation 'com.google.android.exoplayer:exoplayer-ui:2.13.3'
implementation 'com.google.android.exoplayer:extension-ima:2.13.3'
implementation 'androidx.multidex:multidex:2.0.0'
implementation('com.mopub:mopub-sdk:5.8.0@aar') {
transitive = true
Expand Down
107 changes: 46 additions & 61 deletions ...ebidDemoJava/src/main/java/org/prebid/mobile/app/RubiconInstreamVideoIMADemoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,41 @@

import android.net.Uri;
import android.os.Bundle;

import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;

import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.ext.ima.ImaAdsLoader;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.ProgressiveMediaSource;
import com.google.android.exoplayer2.source.ads.AdsMediaSource;
import com.google.android.exoplayer2.ui.PlayerView;
import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;

import org.prebid.mobile.AdSize;
import org.prebid.mobile.AdUnit;
import org.prebid.mobile.Host;
import org.prebid.mobile.OnCompleteListener2;
import org.prebid.mobile.PrebidMobile;
import org.prebid.mobile.ResultCode;
import org.prebid.mobile.Signals;
import org.prebid.mobile.Util;
import org.prebid.mobile.VideoAdUnit;
import org.prebid.mobile.*;

import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;

public class RubiconInstreamVideoIMADemoActivity extends AppCompatActivity {
AdUnit adUnit;

VideoAdUnit adUnit;
private PlayerView playerView;
private SimpleExoPlayer player;
private ImaAdsLoader adsLoader;
private Uri adsUri;

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_instream_video);
playerView = findViewById(R.id.player_view);

initPrebid();
initVideoAdUnit();
}

@Override
protected void onDestroy() {
Expand All @@ -45,40 +48,30 @@ protected void onDestroy() {
adsLoader.release();
}

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_instream_video);
playerView = findViewById(R.id.player_view);

private void initPrebid() {
PrebidMobile.setPrebidServerHost(Host.RUBICON);
PrebidMobile.setPrebidServerAccountId(Constants.PBS_ACCOUNT_ID_RUBICON);
PrebidMobile.setStoredAuctionResponse(Constants.PBS_STORED_RESPONSE_VAST_RUBICON);
VideoAdUnit.Parameters parameters = new VideoAdUnit.Parameters();
parameters.setMimes(Arrays.asList("video/mp4"));

parameters.setProtocols(Arrays.asList(Signals.Protocols.VAST_2_0));
// parameters.setProtocols(Arrays.asList(new Signals.Protocols(2)));

parameters.setPlaybackMethod(Arrays.asList(Signals.PlaybackMethod.AutoPlaySoundOff));
// parameters.setPlaybackMethod(Arrays.asList(new Signals.PlaybackMethod(2)));
}

private void initVideoAdUnit() {
VideoAdUnit.Parameters parameters = new VideoAdUnit.Parameters();
parameters.setMimes(Collections.singletonList("video/mp4"));
parameters.setProtocols(Collections.singletonList(Signals.Protocols.VAST_2_0));
parameters.setPlaybackMethod(Collections.singletonList(Signals.PlaybackMethod.AutoPlaySoundOff));
parameters.setPlacement(Signals.Placement.InStream);
// parameters.setPlacement(new Signals.Placement(2));

VideoAdUnit adUnit = new VideoAdUnit("1001-1", 640, 480);
adUnit = new VideoAdUnit("1001-1", 640, 480);
adUnit.setParameters(parameters);
this.adUnit = adUnit;
// Create an AdsLoader with the ad tag url.
adUnit.fetchDemand(new OnCompleteListener2() {
@Override
public void onComplete(ResultCode resultCode, Map<String, String> unmodifiableMap) {
HashSet<AdSize> sizes = new HashSet<>();
sizes.add(new AdSize(640, 480));
String uri = Util.generateInstreamUriForGam(Constants.DFP_VAST_ADUNIT_ID_RUBICON, sizes, unmodifiableMap);
adsLoader = new ImaAdsLoader(RubiconInstreamVideoIMADemoActivity.this, Uri.parse(uri));
initializePlayer();
}
adUnit.fetchDemand((resultCode, keysMap) -> {
HashSet<AdSize> sizes = new HashSet<>();
sizes.add(new AdSize(640, 480));
adsUri = Uri.parse(Util.generateInstreamUriForGam(Constants.DFP_VAST_ADUNIT_ID_RUBICON, sizes, keysMap));

ImaAdsLoader.Builder imaBuilder = new ImaAdsLoader.Builder(RubiconInstreamVideoIMADemoActivity.this);
adsLoader = imaBuilder.build();

initializePlayer();
});
}

Expand All @@ -93,34 +86,26 @@ private void releasePlayer() {
player.release();
player = null;
}

}

private void initializePlayer() {
// Create a SimpleExoPlayer and set is as the player for content and ads.
player = new SimpleExoPlayer.Builder(this).build();
SimpleExoPlayer.Builder playerBuilder = new SimpleExoPlayer.Builder(this);
player = playerBuilder.build();
playerView.setPlayer(player);
adsLoader.setPlayer(player);

DataSource.Factory dataSourceFactory =
new DefaultDataSourceFactory(this, getString(R.string.app_name));

ProgressiveMediaSource.Factory mediaSourceFactory =
new ProgressiveMediaSource.Factory(dataSourceFactory);

// Create the MediaSource for the content you wish to play.
MediaSource mediaSource =
mediaSourceFactory.createMediaSource(Uri.parse(getString(R.string.content_url)));

// Create the AdsMediaSource using the AdsLoader and the MediaSource.
AdsMediaSource adsMediaSource =
new AdsMediaSource(mediaSource, dataSourceFactory, adsLoader, playerView);
Uri uri = Uri.parse(getString(R.string.content_url));
MediaItem mediaItem = MediaItem.fromUri(uri);
DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this, getString(R.string.app_name));
ProgressiveMediaSource.Factory mediaSourceFactory = new ProgressiveMediaSource.Factory(dataSourceFactory);
MediaSource mediaSource = mediaSourceFactory.createMediaSource(mediaItem);

// Prepare the content and ad to be played with the SimpleExoPlayer.
player.prepare(adsMediaSource);
DataSpec dataSpec = new DataSpec(adsUri);
AdsMediaSource adsMediaSource = new AdsMediaSource(mediaSource, dataSpec, "ad", mediaSourceFactory, adsLoader, playerView);

// Set PlayWhenReady. If true, content and ads autoplay.
player.setPlayWhenReady(false);
player.setMediaSource(adsMediaSource);
player.setPlayWhenReady(true);
player.prepare();
}

@Override
Expand Down
109 changes: 48 additions & 61 deletions ...ple/PrebidDemoJava/src/main/java/org/prebid/mobile/app/XandrInstreamVideoGamActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,42 @@

import android.net.Uri;
import android.os.Bundle;

import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;

import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.ext.ima.ImaAdsLoader;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.ProgressiveMediaSource;
import com.google.android.exoplayer2.source.ads.AdsMediaSource;
import com.google.android.exoplayer2.ui.PlayerView;
import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
import org.prebid.mobile.*;

import org.prebid.mobile.AdSize;
import org.prebid.mobile.AdUnit;
import org.prebid.mobile.Host;
import org.prebid.mobile.OnCompleteListener2;
import org.prebid.mobile.PrebidMobile;
import org.prebid.mobile.ResultCode;
import org.prebid.mobile.Signals;
import org.prebid.mobile.Util;
import org.prebid.mobile.VideoAdUnit;

import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;

import static org.prebid.mobile.Util.generateInstreamUriForGam;

public class XandrInstreamVideoGamActivity extends AppCompatActivity {
AdUnit adUnit;

VideoAdUnit adUnit;
private PlayerView playerView;
private SimpleExoPlayer player;
private ImaAdsLoader adsLoader;
private Uri adsUri;

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_instream_video);
playerView = findViewById(R.id.player_view);

initPrebid();
initVideoAdUnit();
}

@Override
protected void onDestroy() {
Expand All @@ -45,39 +49,29 @@ protected void onDestroy() {
adsLoader.release();
}

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_instream_video);
playerView = findViewById(R.id.player_view);

private void initPrebid() {
PrebidMobile.setPrebidServerHost(Host.APPNEXUS);
PrebidMobile.setPrebidServerAccountId("aecd6ef7-b992-4e99-9bb8-65e2d984e1dd");
VideoAdUnit.Parameters parameters = new VideoAdUnit.Parameters();
parameters.setMimes(Arrays.asList("video/mp4"));

parameters.setProtocols(Arrays.asList(Signals.Protocols.VAST_2_0));
// parameters.setProtocols(Arrays.asList(new Signals.Protocols(2)));

parameters.setPlaybackMethod(Arrays.asList(Signals.PlaybackMethod.AutoPlaySoundOff));
// parameters.setPlaybackMethod(Arrays.asList(new Signals.PlaybackMethod(2)));
}

private void initVideoAdUnit() {
VideoAdUnit.Parameters parameters = new VideoAdUnit.Parameters();
parameters.setMimes(Collections.singletonList("video/mp4"));
parameters.setProtocols(Collections.singletonList(Signals.Protocols.VAST_2_0));
parameters.setPlaybackMethod(Collections.singletonList(Signals.PlaybackMethod.AutoPlaySoundOff));
parameters.setPlacement(Signals.Placement.InStream);
// parameters.setPlacement(new Signals.Placement(2));

VideoAdUnit adUnit = new VideoAdUnit("2c0af852-a55d-49dc-a5ca-ef7e141f73cc", 300, 250);
adUnit = new VideoAdUnit("2c0af852-a55d-49dc-a5ca-ef7e141f73cc", 300, 250);
adUnit.setParameters(parameters);
this.adUnit = adUnit;
// Create an AdsLoader with the ad tag url.
adUnit.fetchDemand(new OnCompleteListener2() {
@Override
public void onComplete(ResultCode resultCode, Map<String, String> unmodifiableMap) {
HashSet<AdSize> sizes = new HashSet<>();
sizes.add(new AdSize(640, 480));
String uri = Util.generateInstreamUriForGam("/19968336/Punnaghai_Instream_Video1", sizes, unmodifiableMap);
adsLoader = new ImaAdsLoader(XandrInstreamVideoGamActivity.this, Uri.parse(uri));
initializePlayer();
}
adUnit.fetchDemand((resultCode, unmodifiableMap) -> {
HashSet<AdSize> sizes = new HashSet<>();
sizes.add(new AdSize(640, 480));
adsUri = Uri.parse(generateInstreamUriForGam("/19968336/Punnaghai_Instream_Video1", sizes, unmodifiableMap));

ImaAdsLoader.Builder imaBuilder = new ImaAdsLoader.Builder(XandrInstreamVideoGamActivity.this);
adsLoader = imaBuilder.build();

initializePlayer();
});
}

Expand All @@ -96,30 +90,23 @@ private void releasePlayer() {
}

private void initializePlayer() {
// Create a SimpleExoPlayer and set is as the player for content and ads.
player = new SimpleExoPlayer.Builder(this).build();
SimpleExoPlayer.Builder playerBuilder = new SimpleExoPlayer.Builder(this);
player = playerBuilder.build();
playerView.setPlayer(player);
adsLoader.setPlayer(player);

DataSource.Factory dataSourceFactory =
new DefaultDataSourceFactory(this, getString(R.string.app_name));

ProgressiveMediaSource.Factory mediaSourceFactory =
new ProgressiveMediaSource.Factory(dataSourceFactory);

// Create the MediaSource for the content you wish to play.
MediaSource mediaSource =
mediaSourceFactory.createMediaSource(Uri.parse(getString(R.string.content_url)));

// Create the AdsMediaSource using the AdsLoader and the MediaSource.
AdsMediaSource adsMediaSource =
new AdsMediaSource(mediaSource, dataSourceFactory, adsLoader, playerView);
Uri uri = Uri.parse(getString(R.string.content_url));
MediaItem mediaItem = MediaItem.fromUri(uri);
DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this, getString(R.string.app_name));
ProgressiveMediaSource.Factory mediaSourceFactory = new ProgressiveMediaSource.Factory(dataSourceFactory);
MediaSource mediaSource = mediaSourceFactory.createMediaSource(mediaItem);

// Prepare the content and ad to be played with the SimpleExoPlayer.
player.prepare(adsMediaSource);
DataSpec dataSpec = new DataSpec(adsUri);
AdsMediaSource adsMediaSource = new AdsMediaSource(mediaSource, dataSpec, "ad", mediaSourceFactory, adsLoader, playerView);

// Set PlayWhenReady. If true, content and ads autoplay.
player.setPlayWhenReady(false);
player.setMediaSource(adsMediaSource);
player.setPlayWhenReady(true);
player.prepare();
}

@Override
Expand Down
5 changes: 5 additions & 0 deletions Example/PrebidDemoKotlin/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ dependencies {
implementation project(':PrebidMobile-gamEventHandlers')
implementation project(':PrebidMobile-mopubAdapters')

// 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-mopub-adapters:1.13.0-beta2'

// Standard libraries
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.3.1'
Expand Down
5 changes: 5 additions & 0 deletions Example/PrebidInternalTestApp/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ dependencies {
implementation project(':PrebidMobile-gamEventHandlers')
implementation project(':PrebidMobile-mopubAdapters')

// 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-mopub-adapters:1.13.0-beta2'

// Base dependencies
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.annotation:annotation:1.1.0'
Expand Down
Loading

0 comments on commit 6e430da

Please sign in to comment.