Updates the samples for IMA v3.33.0.

PiperOrigin-RevId: 624241435

AdvancedExample/app/build.gradle

@@ -32,15 +32,15 @@ repositories {
 }
 
 dependencies {
-    def media3_version = "1.1.1"
+    def media3_version = "1.3.1"
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "androidx.media3:media3-ui:$media3_version"
     implementation "androidx.media3:media3-exoplayer:$media3_version"
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
     implementation "androidx.media3:media3-exoplayer-dash:$media3_version"
-    implementation 'androidx.mediarouter:mediarouter:1.6.0'
+    implementation 'androidx.mediarouter:mediarouter:1.7.0'
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
-    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.31.0'
+    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.33.0'
 }

AdvancedExample/app/src/main/java/com/google/ads/interactivemedia/v3/samples/samplevideoplayer/SampleVideoPlayer.java

@@ -16,17 +16,16 @@
 
 package com.google.ads.interactivemedia.v3.samples.samplevideoplayer;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
-import androidx.annotation.OptIn;
 import androidx.media3.common.C;
 import androidx.media3.common.ForwardingPlayer;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.Metadata;
 import androidx.media3.common.Player;
 import androidx.media3.common.Timeline;
-import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
 import androidx.media3.datasource.DataSource;
 import androidx.media3.datasource.DefaultDataSource;
@@ -41,7 +40,8 @@
 import com.google.ads.interactivemedia.v3.api.player.VideoStreamPlayer;
 
 /** A video player that plays HLS or DASH streams using ExoPlayer. */
-@OptIn(markerClass = UnstableApi.class)
+@SuppressLint("UnsafeOptInUsageError")
+/* @SuppressLint is needed for new media3 APIs. */
 public class SampleVideoPlayer {
 
   private static final String LOG_TAG = "SampleVideoPlayer";

AdvancedExample/build.gradle

@@ -6,6 +6,6 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.3.2'
     }
 }

AdvancedExample/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip

BasicExample/app/build.gradle

@@ -32,13 +32,13 @@ repositories {
 }
 
 dependencies {
-    def media3_version = "1.1.1"
+    def media3_version = "1.3.1"
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation "androidx.media3:media3-ui:$media3_version"
     implementation "androidx.media3:media3-exoplayer:$media3_version"
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
     implementation "androidx.media3:media3-exoplayer-dash:$media3_version"
-    implementation 'androidx.mediarouter:mediarouter:1.6.0'
-    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.31.0'
+    implementation 'androidx.mediarouter:mediarouter:1.7.0'
+    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.33.0'
 }

BasicExample/app/src/main/java/com/google/ads/interactivemedia/v3/samples/samplevideoplayer/SampleVideoPlayer.java

@@ -21,17 +21,16 @@
 import static androidx.media3.common.C.CONTENT_TYPE_OTHER;
 import static androidx.media3.common.C.TIME_UNSET;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
-import androidx.annotation.OptIn;
 import androidx.media3.common.C.ContentType;
 import androidx.media3.common.ForwardingPlayer;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.Metadata;
 import androidx.media3.common.Player;
 import androidx.media3.common.Timeline;
-import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
 import androidx.media3.datasource.DataSource;
 import androidx.media3.datasource.DefaultDataSource;
@@ -46,7 +45,8 @@
 import com.google.ads.interactivemedia.v3.api.player.VideoStreamPlayer;
 
 /** A video player that plays HLS or DASH streams using ExoPlayer. */
-@OptIn(markerClass = UnstableApi.class)
+@SuppressLint("UnsafeOptInUsageError")
+/* @SuppressLint is needed for new media3 APIs. */
 public class SampleVideoPlayer {
 
   private static final String LOG_TAG = "SampleVideoPlayer";

BasicExample/app/src/main/java/com/google/ads/interactivemedia/v3/samples/videoplayerapp/MyActivity.java

@@ -16,6 +16,7 @@
 
 package com.google.ads.interactivemedia.v3.samples.videoplayerapp;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -25,12 +26,12 @@
 import android.widget.ImageButton;
 import android.widget.ScrollView;
 import android.widget.TextView;
-import androidx.media3.common.util.UnstableApi;
 import androidx.media3.ui.PlayerView;
 import com.google.ads.interactivemedia.v3.samples.samplevideoplayer.SampleVideoPlayer;
 
 /** Main Activity that plays media using {@link SampleVideoPlayer}. */
-@UnstableApi
+@SuppressLint("UnsafeOptInUsageError")
+/* @SuppressLint is needed for new media3 APIs. */
 public class MyActivity extends Activity {
 
   private static final String DEFAULT_STREAM_URL =

BasicExample/app/src/main/java/com/google/ads/interactivemedia/v3/samples/videoplayerapp/SampleAdsWrapper.java

@@ -16,12 +16,12 @@
 
 package com.google.ads.interactivemedia.v3.samples.videoplayerapp;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
 import android.view.ViewGroup;
 import android.webkit.WebView;
 import androidx.annotation.Nullable;
-import androidx.media3.common.util.UnstableApi;
 import com.google.ads.interactivemedia.v3.api.AdErrorEvent;
 import com.google.ads.interactivemedia.v3.api.AdEvent;
 import com.google.ads.interactivemedia.v3.api.AdsLoader;
@@ -42,7 +42,8 @@
 import java.util.List;
 
 /** This class adds ad-serving support to Sample HlsVideoPlayer */
-@UnstableApi
+@SuppressLint("UnsafeOptInUsageError")
+/* @SuppressLint is needed for new media3 APIs. */
 public class SampleAdsWrapper
     implements AdEvent.AdEventListener, AdErrorEvent.AdErrorListener, AdsLoader.AdsLoadedListener {
 
@@ -53,7 +54,7 @@ public class SampleAdsWrapper
   private static final String TEST_DASH_ASSET_KEY = "PSzZMzAkSXCmlJOWDmRj8Q";
 
   // VOD HLS content source and video IDs.
-  private static final String TEST_HLS_CONTENT_SOURCE_ID = "2528370";
+  private static final String TEST_HLS_CONTENT_SOURCE_ID = "2548831";
   private static final String TEST_HLS_VIDEO_ID = "tears-of-steel";
 
   // VOD DASH content source and video IDs.

BasicExample/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

BasicExample/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip

ExoPlayerExample/app/build.gradle

@@ -32,7 +32,7 @@ repositories {
 }
 
 dependencies {
-    def media3_version = "1.1.1"
+    def media3_version = "1.3.1"
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'

ExoPlayerExample/app/src/main/java/com/google/ads/interactivemedia/v3/samples/videoplayerapp/MyActivity.java

@@ -2,16 +2,15 @@
 
 import static androidx.media3.common.C.CONTENT_TYPE_HLS;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.widget.TextView;
 import androidx.annotation.Nullable;
-import androidx.annotation.OptIn;
 import androidx.media3.common.MediaItem;
-import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
 import androidx.media3.datasource.DataSource;
 import androidx.media3.datasource.DefaultDataSource;
@@ -24,7 +23,8 @@
 import com.google.ads.interactivemedia.v3.api.AdEvent;
 
 /** Main Activity. */
-@OptIn(markerClass = UnstableApi.class)
+@SuppressLint("UnsafeOptInUsageError")
+/* @SuppressLint is needed for new media3 APIs. */
 public class MyActivity extends Activity {
 
   private static final String KEY_ADS_LOADER_STATE = "ads_loader_state";

ExoPlayerExample/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

ExoPlayerExample/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip

SampleVideoPlayer/app/build.gradle

@@ -32,7 +32,7 @@ repositories {
 }
 
 dependencies {
-    def media3_version = "1.1.1"
+    def media3_version = "1.3.1"
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation "androidx.media3:media3-ui:$media3_version"

SampleVideoPlayer/app/src/main/java/com/google/ads/interactivemedia/v3/samples/samplevideoplayer/SampleVideoPlayer.java

@@ -16,16 +16,15 @@
 
 package com.google.ads.interactivemedia.v3.samples.samplevideoplayer;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.util.Log;
-import androidx.annotation.OptIn;
 import androidx.media3.common.C;
 import androidx.media3.common.ForwardingPlayer;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.Metadata;
 import androidx.media3.common.Player;
 import androidx.media3.common.Timeline;
-import androidx.media3.common.util.UnstableApi;
 import androidx.media3.datasource.DataSource;
 import androidx.media3.datasource.DefaultDataSource;
 import androidx.media3.exoplayer.ExoPlayer;
@@ -35,7 +34,8 @@
 import androidx.media3.ui.PlayerView;
 
 /** A video player that plays HLS or DASH streams using ExoPlayer. */
-@OptIn(markerClass = UnstableApi.class)
+@SuppressLint("UnsafeOptInUsageError")
+/* @SuppressLint is needed for new media3 APIs. */
 public class SampleVideoPlayer {
 
   private static final String LOG_TAG = "SampleVideoPlayer";

SampleVideoPlayer/app/src/main/java/com/google/ads/interactivemedia/v3/samples/videoplayerapp/MyActivity.java

@@ -16,19 +16,19 @@
 
 package com.google.ads.interactivemedia.v3.samples.videoplayerapp;
 
+import android.annotation.SuppressLint;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageButton;
-import androidx.annotation.OptIn;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.media3.common.util.UnstableApi;
 import androidx.media3.ui.PlayerView;
 import androidx.multidex.MultiDex;
 import com.google.ads.interactivemedia.v3.samples.samplevideoplayer.SampleVideoPlayer;
 
 /** Main Activity that plays media using {@link SampleVideoPlayer}. */
-@OptIn(markerClass = UnstableApi.class)
+@SuppressLint("UnsafeOptInUsageError")
+/* @SuppressLint is needed for new media3 APIs. */
 public class MyActivity extends AppCompatActivity {
 
   private static final String DEFAULT_STREAM_URL =

SampleVideoPlayer/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

SampleVideoPlayer/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip