From 3cc59ea56a40570b2303015e60c661be1c6221b7 Mon Sep 17 00:00:00 2001 From: Jackson Sui Date: Wed, 10 Nov 2021 08:24:13 -0800 Subject: [PATCH] Updates samples for IMA v3.25.1 PiperOrigin-RevId: 408885145 --- .github/workflows/build.yaml | 4 ++-- AdvancedExample/app/build.gradle | 17 ++++++++--------- AdvancedExample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- BasicExample/app/build.gradle | 13 ++++++------- BasicExample/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- SampleVideoPlayer/app/build.gradle | 10 +++++----- SampleVideoPlayer/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 27 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 045b701..66d4a7d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,10 +22,10 @@ jobs: - "BasicExample" - "SampleVideoPlayer" steps: - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Clone Repo uses: actions/checkout@v1 diff --git a/AdvancedExample/app/build.gradle b/AdvancedExample/app/build.gradle index 1400ba8..582ad7f 100644 --- a/AdvancedExample/app/build.gradle +++ b/AdvancedExample/app/build.gradle @@ -3,10 +3,10 @@ apply plugin: 'com.android.application' android { compileSdkVersion 30 - // Java 1.8 required by androidx.browser:browser:1.2.0 + // Java 11 required by Gradle 7.0.2 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } defaultConfig { @@ -31,12 +31,11 @@ repositories { } dependencies { - implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.24.0' - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.browser:browser:1.3.0' - implementation 'androidx.mediarouter:mediarouter:1.2.3' + implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.25.1' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.1' + implementation 'androidx.mediarouter:mediarouter:1.2.5' implementation 'androidx.recyclerview:recyclerview:1.2.1' - implementation 'com.google.android.exoplayer:exoplayer:2.15.0' + implementation 'com.google.android.exoplayer:exoplayer:2.15.1' implementation 'com.google.android.gms:play-services-cast-framework:20.0.0' } diff --git a/AdvancedExample/build.gradle b/AdvancedExample/build.gradle index 40b4680..78b084a 100644 --- a/AdvancedExample/build.gradle +++ b/AdvancedExample/build.gradle @@ -6,6 +6,6 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.0.3' } } diff --git a/AdvancedExample/gradle/wrapper/gradle-wrapper.properties b/AdvancedExample/gradle/wrapper/gradle-wrapper.properties index 1a8468e..fe95018 100644 --- a/AdvancedExample/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/BasicExample/app/build.gradle b/BasicExample/app/build.gradle index 72b3690..d09d7da 100644 --- a/BasicExample/app/build.gradle +++ b/BasicExample/app/build.gradle @@ -3,10 +3,10 @@ apply plugin: 'com.android.application' android { compileSdkVersion 30 - // Java 1.8 required by androidx.browser:browser:1.2.0 + // Java 11 required by Gradle 7.0.2 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } defaultConfig { @@ -30,8 +30,7 @@ repositories { } dependencies { - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'androidx.browser:browser:1.3.0' - implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.24.0' - implementation 'com.google.android.exoplayer:exoplayer:2.15.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.25.1' + implementation 'com.google.android.exoplayer:exoplayer:2.15.1' } diff --git a/BasicExample/build.gradle b/BasicExample/build.gradle index 9af6b38..1457c77 100644 --- a/BasicExample/build.gradle +++ b/BasicExample/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.0.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/BasicExample/gradle/wrapper/gradle-wrapper.properties b/BasicExample/gradle/wrapper/gradle-wrapper.properties index 56ea85b..6ae3d6e 100644 --- a/BasicExample/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/SampleVideoPlayer/app/build.gradle b/SampleVideoPlayer/app/build.gradle index f7acbb3..45b40eb 100644 --- a/SampleVideoPlayer/app/build.gradle +++ b/SampleVideoPlayer/app/build.gradle @@ -3,10 +3,10 @@ apply plugin: 'com.android.application' android { compileSdkVersion 30 - // Java 1.8 required by androidx.browser:browser:1.2.0 + // Java 11 required by Gradle 7.0.2 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } defaultConfig { @@ -30,6 +30,6 @@ repositories { } dependencies { - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'com.google.android.exoplayer:exoplayer:2.15.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'com.google.android.exoplayer:exoplayer:2.15.1' } diff --git a/SampleVideoPlayer/build.gradle b/SampleVideoPlayer/build.gradle index 9af6b38..1457c77 100644 --- a/SampleVideoPlayer/build.gradle +++ b/SampleVideoPlayer/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.0.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/SampleVideoPlayer/gradle/wrapper/gradle-wrapper.properties b/SampleVideoPlayer/gradle/wrapper/gradle-wrapper.properties index 053beff..57181e8 100644 --- a/SampleVideoPlayer/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.7.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip \ No newline at end of file