Updating for Play services 11.2.0

googlearchive · Aug 16, 2017 · d6ce7f6 · d6ce7f6
1 parent 731fd6e
commit d6ce7f6
Show file tree

Hide file tree

Showing 58 changed files with 107 additions and 115 deletions.
diff --git a/admob/BannerExample/app/build.gradle b/admob/BannerExample/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.google.android.gms.example.bannerexample"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -20,8 +20,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.google.firebase:firebase-ads:11.0.0'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.google.firebase:firebase-ads:11.2.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/admob/BannerExample/build.gradle b/admob/BannerExample/build.gradle
@@ -13,5 +13,8 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
diff --git a/admob/InterstitialExample/app/build.gradle b/admob/InterstitialExample/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.google.android.gms.example.interstitialexample"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -20,8 +20,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.google.firebase:firebase-ads:11.0.0'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.google.firebase:firebase-ads:11.2.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/admob/InterstitialExample/build.gradle b/admob/InterstitialExample/build.gradle
@@ -13,5 +13,8 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
diff --git a/admob/NativeAdvancedExample/app/build.gradle b/admob/NativeAdvancedExample/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.google.example.gms.nativeadvancedexample"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -20,8 +20,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.google.firebase:firebase-ads:11.0.0'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.google.firebase:firebase-ads:11.2.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/...dExample/app/src/main/java/com/google/example/gms/nativeadvancedexample/MainActivity.java b/...dExample/app/src/main/java/com/google/example/gms/nativeadvancedexample/MainActivity.java
@@ -127,6 +127,8 @@ public void onVideoEnd() {
         ((TextView) adView.getHeadlineView()).setText(nativeAppInstallAd.getHeadline());
         ((TextView) adView.getBodyView()).setText(nativeAppInstallAd.getBody());
         ((Button) adView.getCallToActionView()).setText(nativeAppInstallAd.getCallToAction());
+        ((ImageView) adView.getIconView()).setImageDrawable(
+                nativeAppInstallAd.getIcon().getDrawable());
 
         // Apps can check the VideoController's hasVideoContent property to determine if the
         // NativeAppInstallAd has a video asset.

diff --git a/admob/NativeAdvancedExample/build.gradle b/admob/NativeAdvancedExample/build.gradle
@@ -13,5 +13,8 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
diff --git a/admob/NativeExpressExample/app/build.gradle b/admob/NativeExpressExample/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.google.example.gms.ads.nativeexpressexample"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -20,8 +20,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.google.firebase:firebase-ads:11.0.0'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.google.firebase:firebase-ads:11.2.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/admob/NativeExpressExample/build.gradle b/admob/NativeExpressExample/build.gradle
@@ -18,6 +18,9 @@ allprojects {
     repositories {
         mavenLocal()
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 

diff --git a/admob/RewardedVideoExample/app/build.gradle b/admob/RewardedVideoExample/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.google.ads.rewardedvideoexample"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -20,8 +20,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.google.firebase:firebase-ads:11.0.0'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.google.firebase:firebase-ads:11.2.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/admob/RewardedVideoExample/build.gradle b/admob/RewardedVideoExample/build.gradle
@@ -13,5 +13,8 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
diff --git a/admob/RewardedVideoExample/gradle.properties b/admob/RewardedVideoExample/gradle.properties
@@ -15,4 +15,4 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
diff --git a/advanced/APIDemo/app/build.gradle b/advanced/APIDemo/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.google.android.gms.example.apidemo"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.google.android.gms:play-services-ads:11.0.0'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.android.support:support-v4:26.0.1'
+    compile 'com.google.android.gms:play-services-ads:11.2.0'
 }
diff --git a/advanced/APIDemo/build.gradle b/advanced/APIDemo/build.gradle
@@ -15,5 +15,8 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
diff --git a/advanced/NativeExpressRecyclerViewExample/app/build.gradle b/advanced/NativeExpressRecyclerViewExample/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.google.android.gms.example.nativeexpressrecyclerviewexample"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -20,10 +20,10 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.google.firebase:firebase-ads:11.0.0'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.android.support:cardview-v7:26.0.1'
+    compile 'com.android.support:recyclerview-v7:26.0.1'
+    compile 'com.google.firebase:firebase-ads:11.2.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/advanced/NativeExpressRecyclerViewExample/build.gradle b/advanced/NativeExpressRecyclerViewExample/build.gradle
@@ -16,6 +16,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 

diff --git a/advanced/NativeListViewExample/app/build.gradle b/advanced/NativeListViewExample/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.google.example.gms.nativeads"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -21,6 +21,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.google.android.gms:play-services-ads:11.0.0'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.google.android.gms:play-services-ads:11.2.0'
 }
diff --git a/advanced/NativeListViewExample/build.gradle b/advanced/NativeListViewExample/build.gradle
@@ -15,5 +15,8 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
diff --git a/doubleclick/BannerExample/app/build.gradle b/doubleclick/BannerExample/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.google.android.gms.example.bannerexample"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -20,7 +20,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.google.android.gms:play-services-ads:11.0.0'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.google.android.gms:play-services-ads:11.2.0'
 }
diff --git a/doubleclick/BannerExample/app/src/main/AndroidManifest.xml b/doubleclick/BannerExample/app/src/main/AndroidManifest.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.gms.example.bannerexample" >
-    <!-- Include required permissions for Google Mobile Ads to run-->
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
         android:theme="@style/AppTheme" >
-        <!--This meta-data tag is required to use Google Play Services.-->
-        <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
         <activity
             android:name=".MyActivity"
             android:label="@string/app_name" >
@@ -21,10 +18,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <!--Include the AdActivity configChanges and theme. -->
-        <activity android:name="com.google.android.gms.ads.AdActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
-            android:theme="@android:style/Theme.Translucent" />
     </application>
 
 </manifest>