diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f4427996..fe7d2ac0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,7 +30,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
 
 </manifest>
 
diff --git a/build.gradle b/build.gradle
index a3e0ccca..d9f9cdbf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }
 
@@ -18,8 +18,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     sourceSets {
         main {
diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml
index 568299b0..ee94e2f0 100644
--- a/sample_client/AndroidManifest.xml
+++ b/sample_client/AndroidManifest.xml
@@ -30,7 +30,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
         <activity 	android:name="MainActivity"
                   	android:label="@string/app_name"
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index ab862f2b..770e79ca 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -9,8 +9,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     sourceSets {
         main {
diff --git a/test_client/AndroidManifest.xml b/test_client/AndroidManifest.xml
index 018d7259..d16f156a 100644
--- a/test_client/AndroidManifest.xml
+++ b/test_client/AndroidManifest.xml
@@ -39,7 +39,7 @@
 
 	<uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
 
     <application
         android:allowBackup="true"
diff --git a/test_client/build.gradle b/test_client/build.gradle
index 38beb6ae..98eb672d 100644
--- a/test_client/build.gradle
+++ b/test_client/build.gradle
@@ -20,8 +20,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     sourceSets {
         main {