Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates Android samples to use v22.6.0 #631

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Updates Android samples to use v22.6.0 #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions java/admanager/AppOpenExample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: "com.android.application"

android {
namespace 'com.google.android.gms.example.appopendemo'
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.android.gms.example.appopendemo"
minSdkVersion 19
multiDexEnabled true
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -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.5.0'
implementation 'com.google.android.gms:play-services-ads:22.6.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
View file
Open in desktop
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.2'
classpath 'com.android.tools.build:gradle:8.2.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion java/admanager/AppOpenExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions java/admanager/BannerExample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: 'com.android.application'

android {
namespace 'com.google.android.gms.example.bannerexample'
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.android.gms.example.bannerexample"
minSdkVersion 19
multiDexEnabled true
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
}
Expand All @@ -21,6 +21,6 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.gms:play-services-ads:22.6.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admanager/BannerExample/build.gradle
View file
Open in desktop
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.2'
classpath 'com.android.tools.build:gradle:8.2.0'

// 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 java/admanager/BannerExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.5-all.zip
6 changes: 3 additions & 3 deletions java/admanager/InterstitialExample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: 'com.android.application'

android {
namespace 'com.google.android.gms.example.interstitialexample'
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.android.gms.example.interstitialexample"
minSdkVersion 19
multiDexEnabled true
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
}
Expand All @@ -21,6 +21,6 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.gms:play-services-ads:22.6.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admanager/InterstitialExample/build.gradle
View file
Open in desktop
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.2'
classpath 'com.android.tools.build:gradle:8.2.0'

// 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 java/admanager/InterstitialExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.5-all.zip
6 changes: 3 additions & 3 deletions java/admanager/NativeAdsExample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: 'com.android.application'

android {
namespace 'com.google.example.gms.nativeadsexample'
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.example.gms.nativeadsexample"
minSdkVersion 19
multiDexEnabled true
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
}
Expand All @@ -21,6 +21,6 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.gms:play-services-ads:22.6.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admanager/NativeAdsExample/build.gradle
View file
Open in desktop
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.2'
classpath 'com.android.tools.build:gradle:8.2.0'

// 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 java/admanager/NativeAdsExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions java/admanager/RewardedInterstitialExample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: 'com.android.application'

android {
namespace 'com.google.ads.rewardedinterstitialexample'
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.ads.rewardedinterstitialexample"
minSdkVersion 19
multiDexEnabled true
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
}
Expand All @@ -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.5.0'
implementation 'com.google.android.gms:play-services-ads:22.6.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admanager/RewardedInterstitialExample/build.gradle
View file
Open in desktop
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.2'
classpath 'com.android.tools.build:gradle:8.2.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion java/admanager/RewardedInterstitialExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.5-all.zip
6 changes: 3 additions & 3 deletions java/admanager/RewardedVideoExample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: 'com.android.application'

android {
namespace 'com.google.ads.rewardedvideoexample'
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.ads.rewardedvideoexample"
minSdkVersion 19
multiDexEnabled true
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
}
Expand All @@ -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.5.0'
implementation 'com.google.android.gms:play-services-ads:22.6.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
}
2 changes: 1 addition & 1 deletion java/admanager/RewardedVideoExample/build.gradle
View file
Open in desktop
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.2'
classpath 'com.android.tools.build:gradle:8.2.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion java/admanager/RewardedVideoExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.5-all.zip
6 changes: 3 additions & 3 deletions java/admob/AppOpenExample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: "com.android.application"

android {
namespace 'com.google.android.gms.example.appopenexample'
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.android.gms.example.appopenexample"
minSdkVersion 19
multiDexEnabled true
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -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.5.0'
implementation 'com.google.android.gms:play-services-ads:22.6.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
View file
Open in desktop
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.2'
classpath 'com.android.tools.build:gradle:8.2.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion java/admob/AppOpenExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions java/admob/BannerExample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apply plugin: 'com.android.application'

android {
namespace 'com.google.android.gms.example.bannerexample'
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.android.gms.example.bannerexample"
minSdkVersion 19
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
multiDexEnabled true
Expand All @@ -21,6 +21,6 @@ android {

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

Expand Down
2 changes: 1 addition & 1 deletion java/admob/BannerExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.5-all.zip
6 changes: 3 additions & 3 deletions java/admob/FullScreenNativeExample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: "com.android.application"

android {
namespace "com.google.example.gms.fullscreennativeexample"
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.android.gms.example.fullscreennativeexample"
minSdkVersion 19
multiDexEnabled = true
targetSdkVersion 33
targetSdkVersion 34
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.5.0'
implementation 'com.google.android.gms:play-services-ads:22.6.0'
}
2 changes: 1 addition & 1 deletion java/admob/FullScreenNativeExample/build.gradle
View file
Open in desktop
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.2'
classpath 'com.android.tools.build:gradle:8.2.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion java/admob/FullScreenNativeExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions java/admob/InterstitialExample/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: 'com.android.application'

android {
namespace 'com.google.android.gms.example.interstitialexample'
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.android.gms.example.interstitialexample"
minSdkVersion 19
multiDexEnabled true
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
}
Expand All @@ -21,6 +21,6 @@ android {

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

Expand Down
2 changes: 1 addition & 1 deletion java/admob/InterstitialExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-8.5-all.zip
Loading