Updating samples for Studio 3.0 and SDK 11.6.0.

README.md

@@ -20,23 +20,23 @@ technical SDK support for our [Android developers](https://groups.google.com/for
 
 ## AdMob
 
-* [Banner](https://github.com/googleads/googleads-mobile-android-examples/tree/master/admob/BannerExample)
-* [Interstitial](https://github.com/googleads/googleads-mobile-android-examples/tree/master/admob/InterstitialExample)
-* [Native Advanced](https://github.com/googleads/googleads-mobile-android-examples/tree/master/admob/NativeAdvancedExample)
-* [Native Express](https://github.com/googleads/googleads-mobile-android-examples/tree/master/admob/NativeExpressExample)
-* [Rewarded Video](https://github.com/googleads/googleads-mobile-android-examples/tree/master/admob/RewardedVideoExample)
+* Banner: [Java](https://github.com/googleads/googleads-mobile-android-examples/tree/master/java/admob/BannerExample), [Kotlin](https://github.com/googleads/googleads-mobile-android-examples/tree/master/kotlin/admob/BannerExample)
+* Interstitial: [Java](https://github.com/googleads/googleads-mobile-android-examples/tree/master/java/admob/InterstitialExample), [Kotlin](https://github.com/googleads/googleads-mobile-android-examples/tree/master/kotlin/admob/InterstitialExample)
+* Rewarded Video: [Java](https://github.com/googleads/googleads-mobile-android-examples/tree/master/java/admob/RewardedVideoExample), [Kotlin](https://github.com/googleads/googleads-mobile-android-examples/tree/master/kotlin/admob/RewardedVideoExample)
+* Native Advanced: [Java](https://github.com/googleads/googleads-mobile-android-examples/tree/master/java/admob/NativeAdvancedExample), [Kotlin](https://github.com/googleads/googleads-mobile-android-examples/tree/master/kotlin/admob/NativeAdvancedExample)
+* Native Express: [Java](https://github.com/googleads/googleads-mobile-android-examples/tree/master/java/admob/NativeExpressExample), [Kotlin](https://github.com/googleads/googleads-mobile-android-examples/tree/master/kotlin/admob/NativeExpressExample)
 
 ## Advanced
 
-* [API Demo](https://github.com/googleads/googleads-mobile-android-examples/tree/master/advanced/APIDemo) - Provides additional examples for both AdMob and DoubleClick to help improve your mobile app integration of the Google Mobile Ads SDK.
-* [Native Express RecyclerView](https://github.com/googleads/googleads-mobile-android-examples/tree/master/advanced/NativeExpressRecyclerViewExample) - Provides an example for displaying ads from AdMob Native Ads Express in a RecyclerView widget.
-* [Native ListView](https://github.com/googleads/googleads-mobile-android-examples/tree/master/advanced/NativeListViewExample) - Provides an example for displaying ads from DFP Custom Rendering in a ListView.
+* API Demo: [Java](https://github.com/googleads/googleads-mobile-android-examples/tree/master/java/advanced/APIDemo), [Kotlin](https://github.com/googleads/googleads-mobile-android-examples/tree/master/kotlin/advanced/APIDemo) - Provides additional examples for both AdMob and DoubleClick to help improve your mobile app integration of the Google Mobile Ads SDK.
+* Native Express RecyclerView: [Java](https://github.com/googleads/googleads-mobile-android-examples/tree/master/advanced/NativeExpressRecyclerViewExample) - Provides an example for displaying ads from AdMob Native Ads Express in a RecyclerView widget.
+* Native ListView: [Java](https://github.com/googleads/googleads-mobile-android-examples/tree/master/advanced/NativeListViewExample) - Provides an example for displaying ads from DFP Custom Rendering in a ListView.
 
 ## DoubleClick
 
-* [Banner](https://github.com/googleads/googleads-mobile-android-examples/tree/master/doubleclick/BannerExample)
-* [Interstitial](https://github.com/googleads/googleads-mobile-android-examples/tree/master/doubleclick/InterstitialExample)
-* [Custom Rendering](https://github.com/googleads/googleads-mobile-android-examples/tree/master/doubleclick/CustomRenderingExample)
+* Banner: [Java](https://github.com/googleads/googleads-mobile-android-examples/tree/master/java/doubleclick/BannerExample), [Kotlin](https://github.com/googleads/googleads-mobile-android-examples/tree/master/kotlin/doubleclick/BannerExample)
+* Interstitial: [Java](https://github.com/googleads/googleads-mobile-android-examples/tree/master/java/doubleclick/InterstitialExample), [Kotlin](https://github.com/googleads/googleads-mobile-android-examples/tree/master/kotlin/doubleclick/InterstitialExample)
+* Custom Rendering: [Java](https://github.com/googleads/googleads-mobile-android-examples/tree/master/java/doubleclick/CustomRenderingExample), [Kotlin](https://github.com/googleads/googleads-mobile-android-examples/tree/master/kotlin/doubleclick/CustomRenderingExample)
 
 # Downloads
 

java/admob/BannerExample/app/build.gradle

@@ -2,8 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
-
+    buildToolsVersion "26.0.2"
     defaultConfig {
         applicationId "com.google.android.gms.example.bannerexample"
         minSdkVersion 14
@@ -21,7 +20,5 @@ android {
 
 dependencies {
     compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.google.firebase:firebase-ads:11.4.0'
+    compile 'com.google.android.gms:play-services-ads:11.6.0'
 }
-
-apply plugin: 'com.google.gms.google-services'

java/admob/BannerExample/app/src/main/AndroidManifest.xml

@@ -1,17 +1,12 @@
 <?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: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 +16,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>

java/admob/BannerExample/app/src/main/java/com/google/android/gms/example/bannerexample/MyActivity.java

@@ -41,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // Gets the ad view defined in layout/ad_fragment.xml with ad unit ID set in
         // values/strings.xml.
-        mAdView = (AdView) findViewById(R.id.ad_view);
+        mAdView = findViewById(R.id.ad_view);
 
         // Create an ad request. Check your logcat output for the hashed device ID to
         // get test ads on a physical device. e.g.

java/admob/BannerExample/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">BannerExample</string>
+    <string name="app_name">AdMob Banner Example</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
 

java/admob/BannerExample/build.gradle

@@ -2,19 +2,17 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath 'com.google.gms:google-services:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.0.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
+        google()
     }
 }

java/admob/BannerExample/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 24 09:52:21 PST 2017
+#Fri Oct 27 15:02:35 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-4.0.1-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-4.1-all.zip

java/admob/InterstitialExample/app/build.gradle

@@ -2,8 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
-
+    buildToolsVersion "26.0.2"
     defaultConfig {
         applicationId "com.google.android.gms.example.interstitialexample"
         minSdkVersion 14
@@ -21,7 +20,5 @@ android {
 
 dependencies {
     compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.google.firebase:firebase-ads:11.4.0'
+    compile 'com.google.android.gms:play-services-ads:11.6.0'
 }
-
-apply plugin: 'com.google.gms.google-services'

java/admob/InterstitialExample/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.interstitialexample" >
-    <!-- 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:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         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>

java/admob/InterstitialExample/app/src/main/java/com/google/android/gms/example/interstitialexample/MyActivity.java

@@ -62,7 +62,7 @@ public void onAdClosed() {
         });
 
         // Create the "retry" button, which tries to show an interstitial between game plays.
-        mRetryButton = ((Button) findViewById(R.id.retry_button));
+        mRetryButton = findViewById(R.id.retry_button);
         mRetryButton.setVisibility(View.INVISIBLE);
         mRetryButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -81,7 +81,7 @@ private void createTimer(final long milliseconds) {
             mCountDownTimer.cancel();
         }
 
-        final TextView textView = ((TextView) findViewById(R.id.timer));
+        final TextView textView = findViewById(R.id.timer);
 
         mCountDownTimer = new CountDownTimer(milliseconds, 50) {
             @Override

java/admob/InterstitialExample/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">InterstitialExample</string>
+    <string name="app_name">AdMob Interstitial Example</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
     <string name="impossible_game">Impossible Game</string>

java/admob/InterstitialExample/build.gradle

@@ -3,18 +3,16 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath 'com.google.gms:google-services:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.0.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
+        google()
     }
 }

java/admob/InterstitialExample/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 24 11:31:32 PST 2017
+#Fri Oct 27 15:15:04 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-4.0.1-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-4.1-all.zip

java/admob/NativeAdvancedExample/app/build.gradle

@@ -2,8 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
-
+    buildToolsVersion "26.0.2"
     defaultConfig {
         applicationId "com.google.example.gms.nativeadvancedexample"
         minSdkVersion 14
@@ -21,7 +20,5 @@ android {
 
 dependencies {
     compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.google.firebase:firebase-ads:11.4.0'
+    compile 'com.google.android.gms:play-services-ads:11.6.0'
 }
-
-apply plugin: 'com.google.gms.google-services'