diff --git a/.gitignore b/.gitignore
index 022119d8..a7328667 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,7 @@ Android/local.properties
Android/.idea/workspace.xml
Android/.idea/libraries
Android/.idea/dictionaries
+Android/.idea/caches
Android/build
Android/jni/obj
Android/obj
diff --git a/Android/.idea/codeStyles/Project.xml b/Android/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626c..00000000
--- a/Android/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Android/.idea/encodings.xml b/Android/.idea/encodings.xml
new file mode 100644
index 00000000..15a15b21
--- /dev/null
+++ b/Android/.idea/encodings.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/Android/.idea/gradle.xml b/Android/.idea/gradle.xml
index 7ac24c77..f43d4284 100644
--- a/Android/.idea/gradle.xml
+++ b/Android/.idea/gradle.xml
@@ -3,6 +3,9 @@
\ No newline at end of file
diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml
index 71d92705..c076fcb6 120000
--- a/Android/AndroidManifest.xml
+++ b/Android/AndroidManifest.xml
@@ -1 +1 @@
-app/build/intermediates/merged_manifests/debug/processDebugManifest/merged/AndroidManifest.xml
\ No newline at end of file
+./app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
\ No newline at end of file
diff --git a/Android/app/app.iml b/Android/app/app.iml
index f0eb6d35..567a5ed8 100644
--- a/Android/app/app.iml
+++ b/Android/app/app.iml
@@ -17,7 +17,8 @@
-
+
+
@@ -28,17 +29,15 @@
-
-
+
-
+
-
-
+
-
+
@@ -84,47 +83,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/Android/build.gradle b/Android/build.gradle
index 03abe82a..44c10be6 100644
--- a/Android/build.gradle
+++ b/Android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.2.1'
+ classpath 'com.android.tools.build:gradle:3.4.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/Android/gradle.properties b/Android/gradle.properties
index 1fd964e9..c04c048e 100644
--- a/Android/gradle.properties
+++ b/Android/gradle.properties
@@ -17,4 +17,3 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
-android.useDeprecatedNdk=true
diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties
index e4d5b985..de7d3398 100644
--- a/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Nov 12 10:09:47 PST 2018
+#Wed Apr 24 08:44:26 PDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip