fix up the android build scripts a little

StoDevX · Sep 8, 2019 · b092202 · b092202
1 parent c78b3ee
commit b092202
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/android/app/src/main/java/com/allaboutolaf/MainApplication.java b/android/app/src/main/java/com/allaboutolaf/MainApplication.java
@@ -9,25 +9,25 @@
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 
 // keep these sorted alphabetically
-import com.avishayil.rnrestart.ReactNativeRestartPackage;
-import com.BV.LinearGradient.LinearGradientPackage;
-import com.calendarevents.CalendarEventsPackage;
-import com.facebook.react.ReactApplication;
-import com.github.reactnativecommunity.location.RNLocationPackage;
-import com.reactnativecommunity.webview.RNCWebViewPackage;
-import com.reactnativecommunity.netinfo.NetInfoPackage;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.shell.MainReactPackage;
-import com.facebook.soloader.SoLoader;
-import com.github.droibit.android.reactnative.customtabs.CustomTabsPackage;
-import com.learnium.RNDeviceInfo.RNDeviceInfo;
-import com.mapbox.rctmgl.RCTMGLPackage;
-import com.oblador.keychain.KeychainPackage;
-import com.oblador.vectoricons.VectorIconsPackage;
-import com.pusherman.networkinfo.RNNetworkInfoPackage;
-import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
-import io.sentry.RNSentryPackage;
+// import com.avishayil.rnrestart.ReactNativeRestartPackage;
+// import com.BV.LinearGradient.LinearGradientPackage;
+// import com.calendarevents.CalendarEventsPackage;
+// import com.facebook.react.ReactApplication;
+// import com.github.reactnativecommunity.location.RNLocationPackage;
+// import com.reactnativecommunity.webview.RNCWebViewPackage;
+// import com.reactnativecommunity.netinfo.NetInfoPackage;
+// import com.facebook.react.ReactNativeHost;
+// import com.facebook.react.ReactPackage;
+// import com.facebook.react.shell.MainReactPackage;
+// import com.facebook.soloader.SoLoader;
+// import com.github.droibit.android.reactnative.customtabs.CustomTabsPackage;
+// import com.learnium.RNDeviceInfo.RNDeviceInfo;
+// import com.mapbox.rctmgl.RCTMGLPackage;
+// import com.oblador.keychain.KeychainPackage;
+// import com.oblador.vectoricons.VectorIconsPackage;
+// import com.pusherman.networkinfo.RNNetworkInfoPackage;
+// import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
+// import io.sentry.RNSentryPackage;
 
 import java.io.File;
 import java.io.IOException;
@@ -51,18 +51,18 @@ protected List<ReactPackage> getPackages() {
       return packages;
       // return Arrays.asList(
       //   new MainReactPackage(),
-            new RNLocationPackage(),
-            new RNCWebViewPackage(),
-            new NetInfoPackage(),
       //   // please keep these sorted alphabetically
       //   new CalendarEventsPackage(),
       //   new CustomTabsPackage(),
       //   new KeychainPackage(),
       //   new LinearGradientPackage(),
+      //   new NetInfoPackage(),
       //   new RCTMGLPackage(),
       //   new ReactNativeRestartPackage(),
+      //   new RNCWebViewPackage(),
       //   new RNDeviceInfo(),
       //   new RNGestureHandlerPackage(),
+      //   new RNLocationPackage(),
       //   new RNNetworkInfoPackage(),
       //   new RNSentryPackage(),
       //   new VectorIconsPackage()

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,8 +1,4 @@
 rootProject.name = 'AllAboutOlaf'
-include ':react-native-location'
-project(':react-native-location').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-location/android')
-include ':react-native-webview'
-project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 
@@ -28,6 +24,9 @@ project(':react-native-keychain').projectDir = new File(rootProject.projectDir,
 include ':react-native-linear-gradient'
 project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
 
+include ':react-native-location'
+project(':react-native-location').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-location/android')
+
 include ':react-native-network-info'
 project(':react-native-network-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-network-info/android')
 
@@ -40,5 +39,8 @@ project(':react-native-sentry').projectDir = new File(rootProject.projectDir, '.
 include ':react-native-vector-icons'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 
+include ':react-native-webview'
+project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
+
 include ':@react-native-community_netinfo'
 project(':@react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')