Merge remote-tracking branch 'upstream/develop' into develop

1 files changed, 8 insertions, 5 deletions

diff --git a/app/build.gradle b/app/build.gradle
index fbbc8eb8..e9fe2f60 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 21
-  buildToolsVersion "22.0.0"
+  compileSdkVersion 23
+  buildToolsVersion "23.0.3"
 
   signingConfigs {
     release {
@@ -47,14 +47,15 @@ android {
 }
 
 dependencies {
-  androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.4.1'
+  androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.5.4'
   compile 'com.jakewharton:butterknife:6.1.0'
   provided 'com.squareup.dagger:dagger-compiler:1.2.2'
   compile 'com.github.pedrovgs:renderers:1.5'
   compile 'com.intellij:annotations:12.0'
-  compile 'com.google.code.gson:gson:2.3.1'
+  compile 'com.google.code.gson:gson:2.4'
   compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0'
   compile 'mbanje.kurt:fabbutton:1.1.4'
+    compile 'com.android.support:support-annotations:23.2.1'
 }
 
 def processFileInplace(file, Closure processText) {
@@ -81,6 +82,7 @@ task copyIcsOpenVPNClasses( type: Copy ) {
     include '**/dimens.xml'
     include '**/logmenu.xml'
     include '**/core/**.java'
+      include '**/activities/BaseActivity.java'
 
     includeEmptyDirs = false
     
@@ -126,7 +128,8 @@ task copyIcsOpenVPNImages( type: Copy ) {
     include '**/ic_close*.png'
     include '**/ic_edit*.png'
     include '**/ic_check*.png'
-
+      include '**/ic_pause*.png'
+      include '**/ic_play*.png'
     includeEmptyDirs = false
   } into '.'
 }