Merge pull request #27 from Psiphon-Inc/v3.2.0

adam-p · web-flow · commit 837d61ce0c7a · 2020-04-27T14:05:25.000-04:00
v3.2.0
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 09 16:34:14 EDT 2019
+#Mon Apr 27 13:24:08 EDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/psicashlib/src/main/cpp/psicashlib b/psicashlib/src/main/cpp/psicashlib
@@ -1 +1 @@
-Subproject commit c346a455c46cf95f5f0f0e1430fde865e39de58a
+Subproject commit 858acba6ecaae0b18cd8796126fb48b5ec2f9b86

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`jcenter()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.5.1'`
	`10`	`+ classpath 'com.android.tools.build:gradle:3.6.3'`
`11`	`11`
`12`	`12`
`13`	`13`	`// NOTE: Do not place your application dependencies here; they belong`