Merge pull request #37 from deerparker/master

Changes to support Android build errors

.gitignore

@@ -35,6 +35,7 @@ project.xcworkspace
 .gradle
 local.properties
 *.iml
+android/app/src/main/assets/index.android.bundle
 
 # node.js
 #

android/build.gradle

@@ -2,18 +2,18 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "27.0.3"
+        buildToolsVersion = "28.0.3"
         minSdkVersion = 16
-        compileSdkVersion = 27
-        targetSdkVersion = 26
+        compileSdkVersion = 28
+        targetSdkVersion = 28
         supportLibVersion = "27.1.1"
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.5.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -33,7 +33,7 @@ allprojects {
 }
 
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.4'
+wrapper {
+    gradleVersion = '5.4.1'
     distributionUrl = distributionUrl.replace("bin", "all")
 }

android/gradle.properties

@@ -16,3 +16,6 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
+android.useAndroidX=true
+android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

package.json

@@ -57,10 +57,10 @@
         "redux-persist-electron-storage": "^2.0.0",
         "redux-persist-sensitive-storage": "^1.0.0",
         "redux-thunk": "^2.3.0",
-        "resolve": "1.8.1"
+        "resolve": "1.8.1",
+        "scripts": "^0.1.0"
     },
     "devDependencies": {
-        "core-js": "3",
         "@babel/core": "^7.2.2",
         "@babel/preset-typescript": "^7.6.0",
         "@svgr/webpack": "2.4.1",
@@ -81,6 +81,7 @@
         "bfj": "6.1.1",
         "case-sensitive-paths-webpack-plugin": "2.1.2",
         "chalk": "2.4.1",
+        "core-js": "3",
         "cross-env": "^5.2.0",
         "css-loader": "1.0.0",
         "dotenv": "6.0.0",