diff --git a/.travis.yml b/.travis.yml
index e7a1149a5..726330636 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,12 @@ sudo: false
 jdk: oraclejdk7
 env:
   matrix:
-    - ANDROID_SDKS=android-22,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
+    - ANDROID_SDKS=android-23,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
 android:
   components:
-    - android-22
-    - platform-tools-22
-    - build-tools-22.0.1
+    - android-23
+    - platform-tools-23.0.1
+    - build-tools-23.0.1
     - extra-android-m2repository
     - extra-google-m2repository
   licenses:
diff --git a/build.gradle b/build.gradle
index ce8c3319d..64a710f2b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 
@@ -23,8 +23,8 @@ android {
         lintConfig file("lint.xml")
     }
 
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         versionCode 375
@@ -74,7 +74,7 @@ android {
 android.applicationVariants.all { variant ->
     variant.mergeResources.doLast {
         if (project.hasProperty('gapiKey')) {
-            File values = file("${buildDir}/intermediates/res/${variant.dirName}/values/values.xml")
+            File values = file("${buildDir}/intermediates/res/merged/${variant.dirName}/values/values.xml")
             values.write(
                     values.getText('UTF-8').replaceAll(/<string name="gapi_key">.*<\/string>/, "<string name=\"gapi_key\">${project.property('gapiKey')}</string>"),
                     'UTF-8')