From c552639de6e6192654c9aea02e89d6541baa3857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 10 Jul 2014 11:05:58 +0200
Subject: Minor gradle updates, due to Android L.

- Build tools update to latest version (20).
- testPackageName is correctly calculated by default, doing nothing.
- support library needs some tweaks to support pre Android L versions.
---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/build.gradle')

diff --git a/app/build.gradle b/app/build.gradle
index a57a2763..82f71bc8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,13 +2,12 @@ apply plugin: 'android'
 
 android {
   compileSdkVersion 19
-  buildToolsVersion "19.1.0"
+  buildToolsVersion "20"
 
   defaultConfig {
     minSdkVersion 14
     targetSdkVersion 19
 
-    testPackageName "se.leap.bitmaskclient.test"
     testInstrumentationRunner "android.test.InstrumentationTestRunner"
   }
 
@@ -47,7 +46,8 @@ android {
 }
 
 dependencies {
-  androidTestCompile 'com.android.support:support-v4:+'
+  androidTestCompile 'com.android.support:support-v4:20+'
+  androidTestCompile 'com.android.support:appcompat-v7:20.+'
   androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1'
   compile 'com.intellij:annotations:12.0'
 }
-- 
cgit v1.2.3


From 629a0b279a80938212b01c096e55c402d91739d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 10 Jul 2014 12:40:26 +0200
Subject: We don't need support library from Robotium.

I've also fixed a simple test that wasn't letting the suite to finish
correctly.
---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/build.gradle')

diff --git a/app/build.gradle b/app/build.gradle
index 82f71bc8..c4fdc44b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,9 +46,9 @@ android {
 }
 
 dependencies {
-  androidTestCompile 'com.android.support:support-v4:20+'
-  androidTestCompile 'com.android.support:appcompat-v7:20.+'
-  androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1'
+  // androidTestCompile 'com.android.support:support-v4:20+'
+  // androidTestCompile 'com.android.support:appcompat-v7:20.+'
+  androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.2.1'
   compile 'com.intellij:annotations:12.0'
 }
 
-- 
cgit v1.2.3


From 0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 31 Jul 2014 12:09:49 +0200
Subject: Updated ics-openvpn to rev 859 + no 2nd notification.

---
 app/build.gradle | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'app/build.gradle')

diff --git a/app/build.gradle b/app/build.gradle
index c4fdc44b..f2ddd9cd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -144,4 +144,15 @@ task mergeUntranslatable( type: Copy, dependsOn: 'removeDuplicatedStrings') {
 
   delete ics_openvpn_untranslatable
 }
+
+task updateIcsOpenVpn( type: Copy, dependsOn: 'mergeUntranslatable') {
+  from('../ics-openvpn-stripped/main') { 
+    include 'openvpn/**'
+    include 'lzo/**'
+    include 'jni/**'
+    include 'misc/**'
+    include 'ovpn3/**'
+    include 'snappy/**'
+  } into '.'
+}
 //build.dependsOn ':app:mergeUntranslatable'
\ No newline at end of file
-- 
cgit v1.2.3