Skip to content

Commit

Permalink
Updates Android samples to use GMA SDK v22.5.0
Browse files Browse the repository at this point in the history
Enabling Multidex for Java examples.

PiperOrigin-RevId: 577881015
  • Loading branch information
JillSong authored and ericleich committed Oct 30, 2023
1 parent 00c0033 commit 58232ce
Show file tree
Hide file tree
Showing 93 changed files with 94 additions and 94 deletions.
2 changes: 1 addition & 1 deletion java/admanager/AdaptiveBannerExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ repositories {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admanager/AdaptiveBannerExample/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:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.2'
}
}

Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
2 changes: 1 addition & 1 deletion java/admanager/AppOpenExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'

def lifecycle_version = '2.6.2'
Expand Down
2 changes: 1 addition & 1 deletion java/admanager/AppOpenExample/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:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.2'
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion java/admanager/BannerExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admanager/BannerExample/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:8.1.0'
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
Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
2 changes: 1 addition & 1 deletion java/admanager/InterstitialExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admanager/InterstitialExample/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:8.1.0'
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
Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
2 changes: 1 addition & 1 deletion java/admanager/NativeAdsExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admanager/NativeAdsExample/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:8.1.0'
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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ android {
dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admanager/RewardedInterstitialExample/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:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.2'
}
}

Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
2 changes: 1 addition & 1 deletion java/admanager/RewardedVideoExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ android {
dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admanager/RewardedVideoExample/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:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.2'
}
}

Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
2 changes: 1 addition & 1 deletion java/admob/AppOpenExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'

implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
Expand Down
2 changes: 1 addition & 1 deletion java/admob/AppOpenExample/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:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.2'
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion java/admob/BannerExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admob/BannerExample/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:8.1.1'
classpath 'com.android.tools.build:gradle:8.1.2'
}
}

Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
4 changes: 2 additions & 2 deletions java/admob/FullScreenNativeExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
applicationId "com.google.android.gms.example.fullscreennativeexample"
minSdkVersion 19
multiDexEnabled = true
targetSdkVersion 32
targetSdkVersion 33
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -25,5 +25,5 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.recyclerview:recyclerview:1.3.0'
implementation 'com.google.android.exoplayer:exoplayer:2.18.6'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
}
2 changes: 1 addition & 1 deletion java/admob/FullScreenNativeExample/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:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.2'
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion java/admob/InterstitialExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admob/InterstitialExample/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:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.2'
}
}

Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
2 changes: 1 addition & 1 deletion java/admob/NativeAdvancedExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admob/NativeAdvancedExample/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:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.2'
}
}

Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
2 changes: 1 addition & 1 deletion java/admob/RewardedInterstitialExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ android {
dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admob/RewardedInterstitialExample/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:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.2'
}
}

Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
2 changes: 1 addition & 1 deletion java/admob/RewardedVideoExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ android {
dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admob/RewardedVideoExample/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:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.2'
}
}

Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
2 changes: 1 addition & 1 deletion java/advanced/APIDemo/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
}
2 changes: 1 addition & 1 deletion java/advanced/APIDemo/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:8.1.0'
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
Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
2 changes: 1 addition & 1 deletion java/advanced/BannerRecyclerViewExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
}
2 changes: 1 addition & 1 deletion java/advanced/BannerRecyclerViewExample/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:8.1.0'
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
Expand Down
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-8.2-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.4-all.zip
2 changes: 1 addition & 1 deletion kotlin/admanager/AdaptiveBannerExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ repositories {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.4.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
2 changes: 1 addition & 1 deletion kotlin/admanager/AdaptiveBannerExample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
Loading

0 comments on commit 58232ce

Please sign in to comment.