From ac2e59159ba304cc84aa54ce6a33109980818a7a Mon Sep 17 00:00:00 2001 From: Jackson Sui Date: Fri, 3 Nov 2023 09:59:02 -0700 Subject: [PATCH] Updates sample apps to IMA v3.31.0 PiperOrigin-RevId: 579215750 --- AdvancedExample/app/build.gradle | 10 +++++----- AdvancedExample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ExoPlayerExample/app/build.gradle | 6 +++--- ExoPlayerExample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- audioplayerexample/app/build.gradle | 8 ++++---- audioplayerexample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- basicexample/app/build.gradle | 8 ++++---- basicexample/app/src/main/AndroidManifest.xml | 1 + basicexample/build.gradle | 2 +- basicexample/gradle/wrapper/gradle-wrapper.properties | 2 +- umpexample/app/build.gradle | 8 ++++---- umpexample/app/src/main/AndroidManifest.xml | 1 + umpexample/build.gradle | 2 +- umpexample/gradle/wrapper/gradle-wrapper.properties | 2 +- 17 files changed, 32 insertions(+), 30 deletions(-) diff --git a/AdvancedExample/app/build.gradle b/AdvancedExample/app/build.gradle index c08f47f0..e0dcc70f 100644 --- a/AdvancedExample/app/build.gradle +++ b/AdvancedExample/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { namespace 'com.google.ads.interactivemedia.v3.samples.videoplayerapp' - compileSdk 33 + compileSdk 34 // Java 17 required by Gradle 8+ compileOptions { @@ -13,7 +13,7 @@ android { defaultConfig { applicationId "com.google.ads.interactivemedia.v3.samples.videoplayerapp" minSdkVersion 19 - targetSdkVersion 33 + targetSdkVersion 34 multiDexEnabled true versionCode 1 versionName "1.0" @@ -36,9 +36,9 @@ dependencies { implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.recyclerview:recyclerview:1.3.1' + implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.mediarouter:mediarouter:1.4.0' + implementation 'androidx.mediarouter:mediarouter:1.6.0' implementation 'com.android.support.constraint:constraint-layout:2.0.4' - implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.30.3' + implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.31.0' } diff --git a/AdvancedExample/build.gradle b/AdvancedExample/build.gradle index 3b25caf3..f0e99bbd 100644 --- a/AdvancedExample/build.gradle +++ b/AdvancedExample/build.gradle @@ -6,6 +6,6 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.2' + classpath 'com.android.tools.build:gradle:8.1.2' } } diff --git a/AdvancedExample/gradle/wrapper/gradle-wrapper.properties b/AdvancedExample/gradle/wrapper/gradle-wrapper.properties index 6ca43fe2..e6e6b174 100644 --- a/AdvancedExample/gradle/wrapper/gradle-wrapper.properties +++ b/AdvancedExample/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip diff --git a/ExoPlayerExample/app/build.gradle b/ExoPlayerExample/app/build.gradle index 98479f42..a02eb358 100644 --- a/ExoPlayerExample/app/build.gradle +++ b/ExoPlayerExample/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { namespace 'com.google.ads.interactivemedia.v3.samples.exoplayerexample' - compileSdk 33 + compileSdk 34 // Java 17 required by Gradle 8+ compileOptions { @@ -13,7 +13,7 @@ android { defaultConfig { applicationId "com.google.ads.interactivemedia.v3.samples.exoplayerexample" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 multiDexEnabled true versionCode 1 versionName "1.0" @@ -32,7 +32,7 @@ repositories { } dependencies { - def media3_version = "1.1.0" + def media3_version = "1.1.1" implementation "androidx.media3:media3-ui:$media3_version" implementation "androidx.media3:media3-exoplayer:$media3_version" diff --git a/ExoPlayerExample/build.gradle b/ExoPlayerExample/build.gradle index 7ba1ed1d..e41eeaf4 100644 --- a/ExoPlayerExample/build.gradle +++ b/ExoPlayerExample/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/ExoPlayerExample/gradle/wrapper/gradle-wrapper.properties b/ExoPlayerExample/gradle/wrapper/gradle-wrapper.properties index d2e02762..3fd4644d 100644 --- a/ExoPlayerExample/gradle/wrapper/gradle-wrapper.properties +++ b/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.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip diff --git a/audioplayerexample/app/build.gradle b/audioplayerexample/app/build.gradle index d39e45a7..fbc176db 100644 --- a/audioplayerexample/app/build.gradle +++ b/audioplayerexample/app/build.gradle @@ -16,14 +16,14 @@ apply plugin: 'com.android.application' android { namespace 'com.google.ads.interactivemedia.v3.samples.audioplayerexample' - compileSdk 33 + compileSdk 34 compileOptions { targetCompatibility JavaVersion.VERSION_17 } defaultConfig { applicationId "com.google.ads.interactivemedia.v3.samples.audioplayerexample" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" } @@ -44,11 +44,11 @@ dependencies { implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.media:media:1.6.0' - def media3_version = "1.1.0" + def media3_version = "1.1.1" implementation "androidx.media3:media3-ui:$media3_version" implementation "androidx.media3:media3-exoplayer:$media3_version" implementation "androidx.media3:media3-session:$media3_version" implementation 'com.google.guava:guava:28.1-android' - implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.30.3' + implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.31.0' } diff --git a/audioplayerexample/build.gradle b/audioplayerexample/build.gradle index 3b25caf3..f0e99bbd 100644 --- a/audioplayerexample/build.gradle +++ b/audioplayerexample/build.gradle @@ -6,6 +6,6 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.2' + classpath 'com.android.tools.build:gradle:8.1.2' } } diff --git a/audioplayerexample/gradle/wrapper/gradle-wrapper.properties b/audioplayerexample/gradle/wrapper/gradle-wrapper.properties index 018db041..33c7a396 100644 --- a/audioplayerexample/gradle/wrapper/gradle-wrapper.properties +++ b/audioplayerexample/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.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip diff --git a/basicexample/app/build.gradle b/basicexample/app/build.gradle index 55b9014e..01976283 100644 --- a/basicexample/app/build.gradle +++ b/basicexample/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { namespace 'com.google.ads.interactivemedia.v3.samples.videoplayerapp' - compileSdk 33 + compileSdk 34 // Java 17 required by Gradle 8+ compileOptions { @@ -13,7 +13,7 @@ android { defaultConfig { applicationId "com.google.ads.interactivemedia.v3.samples.videoplayerapp" minSdkVersion 21 - targetSdkVersion 32 + targetSdkVersion 34 multiDexEnabled true versionCode 1 versionName "1.0" @@ -34,7 +34,7 @@ repositories { dependencies { implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.browser:browser:1.5.0' + implementation 'androidx.browser:browser:1.6.0' implementation 'androidx.media:media:1.6.0' - implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.30.3' + implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.31.0' } diff --git a/basicexample/app/src/main/AndroidManifest.xml b/basicexample/app/src/main/AndroidManifest.xml index 50e93711..b57f7d4a 100644 --- a/basicexample/app/src/main/AndroidManifest.xml +++ b/basicexample/app/src/main/AndroidManifest.xml @@ -4,6 +4,7 @@ + +