#237: Fix android build process

sigillabs · Jun 25, 2019 · 299104c · 299104c
1 parent 86eb9ef
commit 299104c
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 584 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -168,30 +168,30 @@ android {
 }
 
 dependencies {
-    implementation project(':react-native-app-auth')
-    implementation project(':react-native-svg')
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation "com.android.support:appcompat-v7:28.0.0-alpha3"
-    implementation "com.android.support:support-v4:28.0.0-alpha3"
-    implementation "com.android.support:design:28.0.0-alpha3"
-    implementation project(':react-native-navigation')
-    implementation project(':react-native-background-timer')
-    implementation project(':react-native-uuid-generator')
-    implementation project(':react-native-restart')
-    implementation project(':react-native-device-info')
-    implementation project(':react-native-google-analytics-bridge')
-    implementation project(':react-native-exception-handler')
-    implementation project(':react-native-randombytes')
-    implementation project(':react-native-vector-icons')
-    implementation "com.github.walleth.kethereum:base58:0.53"
-    implementation "com.github.walleth.kethereum:bip39:0.53"
-    implementation "com.github.walleth.kethereum:bip32:0.53"
-    implementation "com.github.walleth.kethereum:wallet:0.53"
-    implementation "com.github.walleth.kethereum:eip155:0.53"
-    implementation "com.github.walleth.kethereum:crypto:0.53"
-    implementation "org.bouncycastle:bcprov-jdk15on:1.59"
-    implementation 'org.apache.commons:commons-lang3:3.7'
+    implementation ("com.facebook.react:react-native:+")
+    implementation ("com.android.support:appcompat-v7:28.0.0-alpha3")
+    implementation ("com.android.support:support-v4:28.0.0-alpha3")
+    implementation ("com.android.support:design:28.0.0-alpha3")
+    implementation (project(':react-native-app-auth'))
+    implementation (project(':react-native-svg'))
+    implementation (project(':react-native-navigation'))
+    implementation (project(':react-native-background-timer'))
+    implementation (project(':react-native-uuid-generator'))
+    implementation (project(':react-native-restart'))
+    implementation (project(':react-native-device-info'))
+    implementation (project(':react-native-google-analytics-bridge'))
+    implementation (project(':react-native-exception-handler'))
+    implementation (project(':react-native-randombytes'))
+    implementation (project(':react-native-vector-icons'))
+    implementation ("com.github.walleth.kethereum:base58:0.53")
+    implementation ("com.github.walleth.kethereum:bip39:0.53")
+    implementation ("com.github.walleth.kethereum:bip32:0.53")
+    implementation ("com.github.walleth.kethereum:wallet:0.53")
+    implementation ("com.github.walleth.kethereum:eip155:0.53")
+    implementation ("com.github.walleth.kethereum:crypto:0.53")
+    implementation ("org.bouncycastle:bcprov-jdk15on:1.59")
+    implementation ("org.apache.commons:commons-lang3:3.7")
 }
 
 // Run this once to be able to run the application with BUCK

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.mobidex">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="io.mobidex">
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.USE_FINGERPRINT" />
@@ -18,7 +18,9 @@
       android:label="@string/app_name"
       android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
       android:screenOrientation="portrait"
-      android:windowSoftInputMode="adjustResize">
+      android:windowSoftInputMode="adjustResize"
+      android:appComponentFactory="androidx"
+      tools:replace="android:appComponentFactory">
       <intent-filter>
           <action android:name="android.intent.action.MAIN" />
           <category android:name="android.intent.category.LAUNCHER" />

diff --git a/android/build.gradle b/android/build.gradle
@@ -7,6 +7,7 @@ buildscript {
         compileSdkVersion = 28
         targetSdkVersion = 28
         supportLibVersion = "28.0.0"
+        googlePlayServicesVersion = "16.0.0"
     }
 
     repositories {