Fix android build

.circleci/config.yml

@@ -455,10 +455,6 @@ workflows:
   build:
     jobs:
       - test
-      - check-deps:
-          context: sast-webhook
-          requires:
-            - test
 
       - build-android-release:
           context: mattermost-mobile-android-release

android/app/build.gradle

@@ -187,12 +187,6 @@ android {
             }
         }
     }
-
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
-
 }
 
 repositories {

android/app/src/main/java/com/mattermost/helpers/Credentials.java

@@ -3,7 +3,9 @@ package com.mattermost.helpers;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.WritableMap;
 import com.oblador.keychain.KeychainModule;
 
 
@@ -12,7 +14,7 @@ public class Credentials {
 
     public static void getCredentialsForCurrentServer(ReactApplicationContext context, ResolvePromise promise) {
         final KeychainModule keychainModule = new KeychainModule(context);
-        final AsyncStorageHelper asyncStorage = new AsyncStorageHelper(context);
+        final AsyncStorage asyncStorage = new AsyncStorage(context);
         final ArrayList<String> keys = new ArrayList<String>(1);
         keys.add(CURRENT_SERVER_URL);
         KeysReadableArray asyncStorageKeys = new KeysReadableArray() {

android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java

@@ -48,7 +48,6 @@ import org.unimodules.adapters.react.ModuleRegistryAdapter;
 import org.unimodules.adapters.react.ReactModuleRegistryProvider;
 import org.unimodules.core.interfaces.SingletonModule;
 
-import com.nozbe.watermelondb.WatermelonDBPackage;
 import com.swmansion.reanimated.ReanimatedJSIModulePackage;
 
 public class MainApplication extends NavigationApplication implements INotificationsApplication, INotificationsDrawerApplication {
@@ -82,7 +81,6 @@ public class MainApplication extends NavigationApplication implements INotificat
         // Packages that cannot be autolinked yet can be added manually here, for example:
         // packages.add(new MyReactNativePackage());
         packages.add(new RNNotificationsPackage(MainApplication.this));
-        packages.add(new WatermelonDBPackage());
 
         // Add unimodules
         List<ReactPackage> unimodules = Arrays.<ReactPackage>asList(
@@ -231,7 +229,7 @@ public class MainApplication extends NavigationApplication implements INotificat
          We use reflection here to pick up the class that initializes Flipper,
         since Flipper library is not available in release mode
         */
-        Class<?> aClass = Class.forName("com.rndiffapp.ReactNativeFlipper");
+        Class<?> aClass = Class.forName("com.rn.ReactNativeFlipper");
         aClass
             .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
             .invoke(null, context, reactInstanceManager);

android/build.gradle

@@ -29,19 +29,6 @@ buildscript {
     }
 }
 
-subprojects {
-    afterEvaluate {
-        android {
-            compileSdkVersion rootProject.ext.compileSdkVersion
-            buildToolsVersion rootProject.ext.buildToolsVersion
-            defaultConfig {
-                minSdkVersion rootProject.ext.minSdkVersion
-                targetSdkVersion rootProject.ext.targetSdkVersion
-            }
-        }
-    }
-}
-
 allprojects {
     repositories {
         google()

app/screens/server/index.tsx

@@ -69,7 +69,6 @@ const styles = StyleSheet.create({
         backgroundColor: Colors.lighter,
     },
     engine: {
-        position: 'absolute',
         right: 0,
     },
     body: {

metro.config.js

@@ -17,9 +17,7 @@ const config = {
             console.log('BUILDING MODULES FOR', platform);
             const moduleMap = {};
             let modulePaths = [];
-            if (platform === 'android') {
-                modulePaths = require('./packager/modules.android');
-            } else {
+            if (platform === 'ios') {
                 modulePaths = require('./packager/modules.ios');
             }
             modulePaths.forEach((path) => {