[sdk] Extract LinearGradient and KeepAwake (expo#3287)

dyna-dot · Jan 25, 2019 · b6f8472 · b6f8472
1 parent 40da063
commit b6f8472
Show file tree

Hide file tree

Showing 118 changed files with 42,926 additions and 40,462 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -279,6 +279,8 @@ dependencies {
   api 'host.exp.exponent:expo-secure-store:1.0.0'
   api 'host.exp.exponent:expo-sensors:2.0.0'
   api 'host.exp.exponent:expo-sms:2.0.0'
+  api 'host.exp.exponent:expo-linear-gradient:1.0.0'
+  api 'host.exp.exponent:expo-keep-awake:1.0.0'
   api 'host.exp.exponent:expo-background-fetch:1.0.0'
   api 'host.exp.exponent:expo-mail-composer:1.0.0'
   api 'host.exp.exponent:expo-speech:1.0.0'

diff --git a/android/app/src/main/java/host/exp/exponent/MainApplication.java b/android/app/src/main/java/host/exp/exponent/MainApplication.java
@@ -24,6 +24,8 @@
 import expo.modules.font.FontLoaderPackage;
 import expo.modules.gl.GLPackage;
 import expo.modules.google.signin.GoogleSignInPackage;
+import expo.modules.keepawake.KeepAwakePackage;
+import expo.modules.lineargradient.LinearGradientPackage;
 import expo.modules.localauthentication.LocalAuthenticationPackage;
 import expo.modules.localization.LocalizationPackage;
 import expo.modules.location.LocationPackage;
@@ -62,35 +64,37 @@ public List<ReactPackage> getPackages() {
 
   public List<Package> getExpoPackages() {
     return Arrays.<Package>asList(
+        new AVPackage(),
         new AdMobPackage(),
         new AppAuthPackage(),
-        new AVPackage(),
         new BackgroundFetchPackage(),
         new BarCodeScannerPackage(),
         new BlurViewPackage(),
         new CameraPackage(),
         new ConstantsPackage(),
         new ContactsPackage(),
         new DocumentPickerPackage(),
-        new FacebookPackage(),
         new FaceDetectorPackage(),
+        new FacebookPackage(),
         new FileSystemPackage(),
         new FontLoaderPackage(),
         new GLPackage(),
         new GoogleSignInPackage(),
+        new KeepAwakePackage(),
+        new LinearGradientPackage(),
         new LocalAuthenticationPackage(),
         new LocalizationPackage(),
         new LocationPackage(),
         new MailComposerPackage(),
         new MediaLibraryPackage(),
         new PermissionsPackage(),
         new PrintPackage(),
+        new SMSPackage(),
+        new SQLitePackage(),
         new SecureStorePackage(),
         new SegmentPackage(),
         new SensorsPackage(),
-        new SMSPackage(),
         new SpeechPackage(),
-        new SQLitePackage(),
         new TaskManagerPackage()
     );
   }

diff --git a/android/expoview/build.gradle b/android/expoview/build.gradle
@@ -93,7 +93,9 @@ task generateDynamicMacros(type: Exec) {
     workingDir '../../tools-public'
     commandLine 'cmd.exe', '/c', 'generate-dynamic-macros-cli.js --buildConstantsPath ./src/main/java/host/exp/exponent/generated/ExponentBuildConstants.java --platform android'
   } else {
-    commandLine '../../tools-public/generate-dynamic-macros-cli.js', '--buildConstantsPath', './src/main/java/host/exp/exponent/generated/ExponentBuildConstants.java', '--platform', 'android'
+    // NOTE(brentvatne): this is a common install path for node
+    environment 'PATH', "${environment.PATH}:/usr/local/bin"
+    commandLine '../../tools-public/generate-dynamic-macros-android.sh'
   }
 }
 preBuild.dependsOn generateDynamicMacros
@@ -138,6 +140,8 @@ dependencies {
   compileOnly 'host.exp.exponent:expo-gl:2.0.0'
   compileOnly 'host.exp.exponent:expo-gl-cpp:2.0.0'
   compileOnly 'host.exp.exponent:expo-sms:2.0.0'
+  compileOnly 'host.exp.exponent:expo-keep-awake:1.0.0'
+  compileOnly 'host.exp.exponent:expo-linear-gradient:1.0.0'
   compileOnly 'host.exp.exponent:expo-print:2.0.0'
   compileOnly 'host.exp.exponent:expo-media-library:2.0.0'
   compileOnly 'host.exp.exponent:expo-analytics-segment:2.0.0'
@@ -206,6 +210,8 @@ dependencies {
   api project(':expo-gl-cpp')
   api project(':expo-google-sign-in')
   api project(':expo-image-loader-interface')
+  api project(':expo-keep-awake')
+  api project(':expo-linear-gradient')
   api project(':expo-local-authentication')
   api project(':expo-localization')
   api project(':expo-location')

diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/ExperiencePackagePicker.java b/android/expoview/src/main/java/versioned/host/exp/exponent/ExperiencePackagePicker.java
@@ -23,6 +23,8 @@
 import expo.modules.font.FontLoaderPackage;
 import expo.modules.gl.GLPackage;
 import expo.modules.google.signin.GoogleSignInPackage;
+import expo.modules.keepawake.KeepAwakePackage;
+import expo.modules.lineargradient.LinearGradientPackage;
 import expo.modules.localauthentication.LocalAuthenticationPackage;
 import expo.modules.localization.LocalizationPackage;
 import expo.modules.location.LocationPackage;
@@ -40,35 +42,37 @@
 
 public class ExperiencePackagePicker {
   private static final List<Package> EXPO_MODULES_PACKAGES = Arrays.<Package>asList(
+      new AVPackage(),
       new AdMobPackage(),
       new AppAuthPackage(),
-      new AVPackage(),
       new BackgroundFetchPackage(),
       new BarCodeScannerPackage(),
       new BlurViewPackage(),
       new CameraPackage(),
       new ConstantsPackage(),
       new ContactsPackage(),
       new DocumentPickerPackage(),
-      new FacebookPackage(),
       new FaceDetectorPackage(),
+      new FacebookPackage(),
       new FileSystemPackage(),
       new FontLoaderPackage(),
       new GLPackage(),
       new GoogleSignInPackage(),
+      new KeepAwakePackage(),
+      new LinearGradientPackage(),
       new LocalAuthenticationPackage(),
       new LocalizationPackage(),
       new LocationPackage(),
       new MailComposerPackage(),
       new MediaLibraryPackage(),
       new PermissionsPackage(),
       new PrintPackage(),
+      new SMSPackage(),
+      new SQLitePackage(),
       new SecureStorePackage(),
       new SegmentPackage(),
       new SensorsPackage(),
-      new SMSPackage(),
       new SpeechPackage(),
-      new SQLitePackage(),
       new StripePackage(),
       new TaskManagerPackage()
   );

diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/ExponentPackage.java b/android/expoview/src/main/java/versioned/host/exp/exponent/ExponentPackage.java
@@ -37,7 +37,6 @@
 import versioned.host.exp.exponent.modules.api.ImageManipulatorModule;
 import versioned.host.exp.exponent.modules.api.ImagePickerModule;
 import versioned.host.exp.exponent.modules.api.IntentLauncherModule;
-import versioned.host.exp.exponent.modules.api.KeepAwakeModule;
 import versioned.host.exp.exponent.modules.api.KeyboardModule;
 import versioned.host.exp.exponent.modules.api.PedometerModule;
 import versioned.host.exp.exponent.modules.api.ScreenOrientationModule;
@@ -47,7 +46,6 @@
 import versioned.host.exp.exponent.modules.api.UpdatesModule;
 import versioned.host.exp.exponent.modules.api.WebBrowserModule;
 import versioned.host.exp.exponent.modules.api.cognito.RNAWSCognitoModule;
-import versioned.host.exp.exponent.modules.api.components.LinearGradientManager;
 import versioned.host.exp.exponent.modules.api.components.gesturehandler.react.RNGestureHandlerModule;
 import versioned.host.exp.exponent.modules.api.components.gesturehandler.react.RNGestureHandlerPackage;
 import versioned.host.exp.exponent.modules.api.components.lottie.LottiePackage;
@@ -182,7 +180,6 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
         nativeModules.add(new ImageManipulatorModule(reactContext, scopedContext));
         nativeModules.add(new AmplitudeModule(reactContext, scopedContext));
         nativeModules.add(new RNViewShotModule(reactContext, scopedContext));
-        nativeModules.add(new KeepAwakeModule(reactContext));
         nativeModules.add(new ExponentTestNativeModule(reactContext));
         nativeModules.add(new WebBrowserModule(reactContext));
         nativeModules.add(new NativeAdManager(reactContext));
@@ -220,7 +217,6 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
   @Override
   public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
     List<ViewManager> viewManagers = new ArrayList<>(Arrays.<ViewManager>asList(
-        new LinearGradientManager(),
         new NativeAdViewManager(),
         new BannerViewManager(),
         new MediaViewManager(),

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -45,9 +45,9 @@ def includeUniversalModule = { name ->
     'expo-core',
     'expo-document-picker',
     'expo-errors',
-    'expo-facebook',
     'expo-face-detector',
     'expo-face-detector-interface',
+    'expo-facebook',
     'expo-file-system',
     'expo-file-system-interface',
     'expo-font',
@@ -56,6 +56,8 @@ def includeUniversalModule = { name ->
     'expo-gl-cpp',
     'expo-google-sign-in',
     'expo-image-loader-interface',
+    'expo-keep-awake',
+    'expo-linear-gradient',
     'expo-local-authentication',
     'expo-localization',
     'expo-location',

diff --git a/apps/native-component-list/package.json b/apps/native-component-list/package.json
@@ -41,9 +41,9 @@
     "react-native-paper": "github:brentvatne/react-native-paper#@brent/fix-bottom-navigation-rn-57",
     "react-native-platform-touchable": "^1.1.1",
     "react-native-web": "^0.9.6",
-    "react-navigation": "3.0.0-rc.2",
+    "react-navigation": "3.1.0",
     "react-navigation-header-buttons": "^1.2.1",
-    "react-navigation-material-bottom-tabs": "1.0.0-alpha.4",
+    "react-navigation-material-bottom-tabs": "1.0.0",
     "regl": "^1.3.0",
     "three": "^0.88.0",
     "url": "^0.11.0",

diff --git a/home/package.json b/home/package.json
@@ -40,8 +40,8 @@
     "react-native": "0.57.1",
     "react-native-deprecated-custom-components": "^0.1.0",
     "react-native-infinite-scroll-view": "^0.4.5",
-    "react-navigation": "3.0.0-rc.2",
-    "react-navigation-material-bottom-tabs": "1.0.0-alpha.2",
+    "react-navigation": "3.1.0",
+    "react-navigation-material-bottom-tabs": "1.0.0",
     "react-redux": "^5.0.1",
     "react-timer-mixin": "^0.13.3",
     "redux": "^3.5.1",