upgrade sdk

x-falcon · Sep 12, 2017 · 99ea49f · 99ea49f
1 parent be9444a
commit 99ea49f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
     defaultConfig {
         applicationId "com.github.xfalcon.vhosts"
         minSdkVersion 19
@@ -31,7 +31,10 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile files('libs/Baidu_Mtj_3.8.0.51.jar')
+    compile 'com.android.support:appcompat-v7:26.0.0-alpha1'
+    compile 'com.android.support:cardview-v7:26.0.0-alpha1'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.github.zcweng:switch-button:0.0.3@aar'
     testCompile 'junit:junit:4.12'
 }
diff --git a/app/libs/Baidu_Mtj_3.8.0.2.jar b/app/libs/Baidu_Mtj_3.8.0.2.jar
diff --git a/app/libs/Baidu_Mtj_3.8.0.51.jar b/app/libs/Baidu_Mtj_3.8.0.51.jar
diff --git a/app/src/main/java/com/github/xfalcon/vhosts/vservice/VhostsService.java b/app/src/main/java/com/github/xfalcon/vhosts/vservice/VhostsService.java
@@ -121,7 +121,7 @@ private void setupVPN() {
         if (vpnInterface == null) {
             Builder builder = new Builder();
             builder.addAddress(VPN_ADDRESS, 32);
-//            builder.addRoute(VPN_ROUTE, 0);
+            builder.addRoute(VPN_ROUTE, 0);
             VPN_DNS=getString(R.string.dns_server);
             Log.d(TAG,"use dns:"+VPN_DNS);
             builder.addRoute(VPN_DNS, 32);

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-all.zip