Skip to content

Commit

Permalink
Updates samples for IMA v3.25.1
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 408885145
  • Loading branch information
google-ima-devrel-bot authored and IMA Developer Relations committed Nov 10, 2021
1 parent 2223b03 commit 3cc59ea
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 8 additions & 9 deletions AdvancedExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
}
2 changes: 1 addition & 1 deletion AdvancedExample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
2 changes: 1 addition & 1 deletion AdvancedExample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 6 additions & 7 deletions BasicExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
}
2 changes: 1 addition & 1 deletion BasicExample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion BasicExample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions SampleVideoPlayer/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
}
2 changes: 1 addition & 1 deletion SampleVideoPlayer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SampleVideoPlayer/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 3cc59ea

Please sign in to comment.