From 069be623eb8e75049d64f1419849b3e92aab1c81 Mon Sep 17 00:00:00 2001
From: Hana Kim <hakim@google.com>
Date: Mon, 8 Jan 2018 18:13:06 -0500
Subject: [PATCH] example: update android examples to use 0.2.10 plugin

Also, modernize the build.gradle configurations
to work with recent Android plugin (>=3.0.0)

https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html

Update golang/go#21594

Change-Id: Ic2162db7367b60ad873149ab62767f36481fa80f
Reviewed-on: https://go-review.googlesource.com/86795
Reviewed-by: Elias Naur <elias.naur@gmail.com>
---
 example/bind/android/app/build.gradle   | 11 +++++------
 example/bind/android/build.gradle       |  7 +++----
 example/bind/android/hello/build.gradle |  2 +-
 example/ivy/android/app/build.gradle    |  7 +++----
 example/ivy/android/build.gradle        |  7 +++----
 example/ivy/android/ivy/build.gradle    |  2 +-
 6 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/example/bind/android/app/build.gradle b/example/bind/android/app/build.gradle
index 3a11456..75d8e66 100644
--- a/example/bind/android/app/build.gradle
+++ b/example/bind/android/app/build.gradle
@@ -6,13 +6,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 27
 
     defaultConfig {
         applicationId "org.golang.example.android"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -24,7 +23,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:22.1.1'
-    compile project(':hello')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:22.1.1'
+    implementation project(':hello')
 }
diff --git a/example/bind/android/build.gradle b/example/bind/android/build.gradle
index 2804747..696b36e 100644
--- a/example/bind/android/build.gradle
+++ b/example/bind/android/build.gradle
@@ -5,18 +5,17 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
diff --git a/example/bind/android/hello/build.gradle b/example/bind/android/hello/build.gradle
index 92fb0bd..f0483e7 100644
--- a/example/bind/android/hello/build.gradle
+++ b/example/bind/android/hello/build.gradle
@@ -4,7 +4,7 @@
  */
 
 plugins {
-    id "org.golang.mobile.bind" version "0.2.9"
+    id "org.golang.mobile.bind" version "0.2.10"
 }
 
 gobind {
diff --git a/example/ivy/android/app/build.gradle b/example/ivy/android/app/build.gradle
index 5e87d10..f0ac8cb 100644
--- a/example/ivy/android/app/build.gradle
+++ b/example/ivy/android/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.3"
     defaultConfig {
         applicationId 'org.golang.ivy'
         minSdkVersion 15
@@ -21,7 +20,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile project(':ivy')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:23.3.0'
+    implementation project(':ivy')
 }
diff --git a/example/ivy/android/build.gradle b/example/ivy/android/build.gradle
index b193299..f77fe35 100644
--- a/example/ivy/android/build.gradle
+++ b/example/ivy/android/build.gradle
@@ -2,18 +2,17 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
diff --git a/example/ivy/android/ivy/build.gradle b/example/ivy/android/ivy/build.gradle
index 04b9a07..1211d00 100644
--- a/example/ivy/android/ivy/build.gradle
+++ b/example/ivy/android/ivy/build.gradle
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 plugins {
-    id "org.golang.mobile.bind" version "0.2.9"
+    id "org.golang.mobile.bind" version "0.2.10"
 }
 
 gobind {