summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle2
-rw-r--r--gradle/wrapper/gradle-wrapper.properties9
-rw-r--r--main/build.gradle6
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java1
4 files changed, 7 insertions, 11 deletions
diff --git a/build.gradle b/build.gradle
index 0f1e6dee..462f6e89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.2.0-alpha6'
+ classpath 'com.android.tools.build:gradle:2.2.0-beta3'
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5111e520..90a1a2cd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,11 +1,6 @@
-#
-# Copyright (c) 2012-2016 Arne Schwabe
-# Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-#
-
-#Tue Nov 24 09:17:10 CET 2015
+#Thu Aug 04 16:24:55 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/main/build.gradle b/main/build.gradle
index 40745c29..eb61b85b 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -12,9 +12,9 @@ repositories {
}
dependencies {
- compile 'com.android.support:support-annotations:24.0.0'
- compile 'com.android.support:cardview-v7:24.0.0'
- compile 'com.android.support:recyclerview-v7:24.0.0'
+ compile 'com.android.support:support-annotations:24.2.0'
+ compile 'com.android.support:cardview-v7:24.2.0'
+ compile 'com.android.support:recyclerview-v7:24.2.0'
// compile 'ch.acra:acra:4.5.0'
testCompile 'junit:junit:4.12'
diff --git a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
index b216f6d9..9b6089bb 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
@@ -251,6 +251,7 @@ public class ConfigParser {
"route-up",
"route-pre-down",
"auth-user-pass-verify",
+ "block-outside-dns",
"dhcp-release",
"dhcp-renew",
"dh",