Dep on Hermes only in the bridge lib

wordpress-mobile · Dec 20, 2019 · 9be1794 · 9be1794
1 parent 300f8da
commit 9be1794
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -163,14 +163,6 @@ dependencies {
     implementation "org.wordpress:utils:$wordpressUtilsVersion"
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "com.facebook.react:react-native:+"  // From node_modules
-
-    if (enableHermes) {
-        def hermesPath = "../../node_modules/hermes-engine/android/";
-        debugImplementation files(hermesPath + "hermes-debug.aar")
-        releaseImplementation files(hermesPath + "hermes-release.aar")
-    } else {
-        implementation jscFlavor
-    }
 }
 
 // Run this once to be able to run the application with BUCK

diff --git a/react-native-gutenberg-bridge/android/build.gradle b/react-native-gutenberg-bridge/android/build.gradle
@@ -80,7 +80,7 @@ group='com.github.wordpress-mobile.gutenberg-mobile'
 project.ext.buildGutenbergFromSource = false
 
 def hermesOriginalPath = "../../node_modules/hermes-engine/android/";
-def hermesPath = "../../bundle/";
+def hermesPath = hermesOriginalPath;
 
 android {
     compileSdkVersion 28
@@ -122,9 +122,6 @@ repositories {
 dependencies {
     implementation project(':react-native-aztec')
 
-    debugImplementation files(hermesPath + "hermes-debug.aar")
-    releaseImplementation files(hermesPath + "hermes-release.aar")
-
     implementation "org.wordpress:utils:1.22"
 
     // For animated GIF support
@@ -138,6 +135,8 @@ dependencies {
 
         implementation 'com.facebook.react:react-native:+'
     } else {
+        hermesPath = "../../bundle/";
+
         implementation (waitJitpack('com.github.wordpress-mobile', 'react-native-svg', readHashedVersion('../../package.json', 'react-native-svg', 'dependencies')))
         implementation (waitJitpack('com.github.wordpress-mobile', 'react-native-video', readHashedVersion('../../package.json', 'react-native-video', 'dependencies')))
         implementation (waitJitpack('com.github.wordpress-mobile', 'react-native-slider', readHashedVersion('../../package.json', '@react-native-community/slider', 'dependencies')))
@@ -146,6 +145,8 @@ dependencies {
         implementation "com.facebook.react:react-native:${rnVersion}"
     }
 
+    debugImplementation files(hermesPath + "hermes-debug.aar")
+    releaseImplementation files(hermesPath + "hermes-release.aar")
 }
 
 if (isJitPack) {