From fb74ab8377ad2e28cd2b7dc5a218fbf8dc7d47c3 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Fri, 4 Aug 2017 14:27:35 +0200
Subject: [PATCH] Update sdk version to Android O

---
 AndroidManifest.xml                    | 2 +-
 build.gradle                           | 8 ++++----
 libLinphoneAndroidSdk.gradle           | 4 ++--
 liblinphone_tester/AndroidManifest.xml | 2 +-
 liblinphone_tester/build.gradle        | 6 +++---
 linphoneAndroidSdk.gradle              | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6c54bd81b..4afeb088e 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="16"
-        android:targetSdkVersion="25"/>
+        android:targetSdkVersion="26"/>
 
     <!-- Permissions for Push Notification -->
     <!-- <uses-permission android:name="org.linphone.permission.C2D_MESSAGE"/> GCM permission -->
diff --git a/build.gradle b/build.gradle
index cead73e63..a0b7766c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,8 +84,8 @@ excludePackage.add('**/LICENSE.txt')
 
 android {
   defaultConfig {
-    compileSdkVersion 23
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.0"
     applicationId getPackageName()
     multiDexEnabled true
 
@@ -169,7 +169,7 @@ android {
 // Grant permissions
 android.applicationVariants.all { variant ->
   def applicationId = getPackageName()
-  def adb = android.getAdbExe().toString()
+  def adb = android.getAdbExecutable().toString()
   def variantName = variant.name.capitalize()
   def grantPermissionTask = tasks.create("grant${variantName}Permissions").doLast({
     "${adb} devices".execute().text.eachLine {
@@ -185,7 +185,7 @@ android.applicationVariants.all { variant ->
 
 task runApplication() {
   def result = exec {
-    executable = android.getAdbExe().toString()
+    executable = android.getAdbExecutable().toString()
     ignoreExitValue true
     args = ['shell', 'monkey', '-p', getPackageName(), '-c', 'android.intent.category.LAUNCHER', '1']
   }
diff --git a/libLinphoneAndroidSdk.gradle b/libLinphoneAndroidSdk.gradle
index 60067c99e..25c13513a 100644
--- a/libLinphoneAndroidSdk.gradle
+++ b/libLinphoneAndroidSdk.gradle
@@ -46,8 +46,8 @@ excludePackage.add('**/LICENSE.txt')
 
 android {
     defaultConfig {
-        compileSdkVersion 23
-        buildToolsVersion "25.0.2"
+        compileSdkVersion 26
+        buildToolsVersion "26.0.0"
         multiDexEnabled true
     }
 
diff --git a/liblinphone_tester/AndroidManifest.xml b/liblinphone_tester/AndroidManifest.xml
index dd1217b66..eef56e227 100644
--- a/liblinphone_tester/AndroidManifest.xml
+++ b/liblinphone_tester/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="16"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="26" />
 
     <instrumentation
         android:targetPackage="org.linphone.tester"
diff --git a/liblinphone_tester/build.gradle b/liblinphone_tester/build.gradle
index 8b3ab56ac..401d8de68 100644
--- a/liblinphone_tester/build.gradle
+++ b/liblinphone_tester/build.gradle
@@ -40,8 +40,8 @@ dependencies {
 
 android {
   defaultConfig {
-    compileSdkVersion 23
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.0"
     applicationId getPackageName()
     multiDexEnabled true
   }
@@ -104,7 +104,7 @@ android {
 android.applicationVariants.all { variant ->
   def applicationId = getPackageName()
   def applicationIdtest = "${getPackageName()}.test"
-  def adb = android.getAdbExe().toString()
+  def adb = android.getAdbExecutable().toString()
   def variantName = variant.name.capitalize()
   def grantPermissionTask = tasks.create("grant${variantName}Permissions") << {
     "${adb} devices".execute().text.eachLine {
diff --git a/linphoneAndroidSdk.gradle b/linphoneAndroidSdk.gradle
index 76b1f1cc4..81524b67b 100644
--- a/linphoneAndroidSdk.gradle
+++ b/linphoneAndroidSdk.gradle
@@ -70,8 +70,8 @@ excludePackage.add('**/LICENSE.txt')
 
 android {
     defaultConfig {
-        compileSdkVersion 23
-        buildToolsVersion "25.0.2"
+        compileSdkVersion 26
+        buildToolsVersion "26.0.0"
         multiDexEnabled true
     }