Support RN 0.59 (#5050)

* Support RN 0.59

* Fix yellow box detection on Android
* Manually link jsc on iOS in playground app

* Fix android unit tests

* Add JavaScriptCore.framework to iOS unit tests

* Download licenses before unit and e2e tests

* Update gradle-wrapper.properties

babel.config.js

@@ -1,15 +1,12 @@
 module.exports = function (api) {
   api && api.cache(false);
   return {
-    env: {
-      test: {
-        presets: [
-          "module:metro-react-native-babel-preset"
-        ],
-        plugins: [
-          "@babel/plugin-proposal-class-properties"
-        ]
-      }
-    }
+    presets: [
+      "module:metro-react-native-babel-preset"
+    ],
+    plugins: [
+      "@babel/plugin-proposal-export-namespace-from",
+      "@babel/plugin-proposal-export-default-from"
+    ]
   };
 }

lib/android/app/build.gradle

@@ -5,10 +5,10 @@ def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
-def DEFAULT_COMPILE_SDK_VERSION = 26
+def DEFAULT_COMPILE_SDK_VERSION = 28
 def DEFAULT_MIN_SDK_VERSION = 19
-def DEFAULT_SUPPORT_LIB_VERSION = '26.1.0'
-def DEFAULT_TARGET_SDK_VERSION = 25
+def DEFAULT_SUPPORT_LIB_VERSION = '28.0.0'
+def DEFAULT_TARGET_SDK_VERSION = 28
 
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/YellowBoxHelper.java

@@ -1,24 +1,12 @@
 package com.reactnativenavigation.viewcontrollers;
 
-import android.support.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.facebook.react.views.view.ReactViewBackgroundDrawable;
-import com.reactnativenavigation.utils.ViewUtils;
-
-public class YellowBoxHelper {
-    private final static int YELLOW_BOX_COLOR = -218449360;
-
-    public boolean isYellowBox(View parent, View child) {
+class YellowBoxHelper {
+    boolean isYellowBox(View parent, View child) {
         return parent instanceof ViewGroup &&
                child instanceof ViewGroup &&
-               ((ViewGroup) parent).getChildCount() > 1 &&
-               !ViewUtils.findChildrenByClassRecursive((ViewGroup) child, View.class, YellowBackgroundMather()).isEmpty();
-    }
-
-    @NonNull
-    private static ViewUtils.Matcher<View> YellowBackgroundMather() {
-        return child1 -> child1.getBackground() instanceof ReactViewBackgroundDrawable && ((ReactViewBackgroundDrawable) child1.getBackground()).getColor() == YELLOW_BOX_COLOR;
+               ((ViewGroup) parent).getChildCount() > 1;
     }
 }

lib/android/app/src/test/java/com/reactnativenavigation/mocks/MockPromise.java

@@ -1,50 +0,0 @@
-package com.reactnativenavigation.mocks;
-
-import com.facebook.react.bridge.*;
-
-import javax.annotation.*;
-
-
-public class MockPromise implements Promise {
-    private boolean invoked;
-
-    @Override
-    public void resolve(@Nullable Object value) {
-        throwIfInvoked();
-        invoked = true;
-    }
-
-    @Override
-    public void reject(String code, String message) {
-        throwIfInvoked();
-        invoked = true;
-    }
-
-    @Override
-    public void reject(String code, Throwable e) {
-        throwIfInvoked();
-        invoked = true;
-    }
-
-    @Override
-    public void reject(String code, String message, Throwable e) {
-        throwIfInvoked();
-        invoked = true;
-    }
-
-    @Override
-    public void reject(String message) {
-        throwIfInvoked();
-        invoked = true;
-    }
-
-    @Override
-    public void reject(Throwable reason) {
-        throwIfInvoked();
-        invoked = true;
-    }
-
-    private void throwIfInvoked() {
-        if (invoked) throw new RuntimeException("Promise can be resolved or rejected only once");
-    }
-}

lib/android/app/src/test/java/com/reactnativenavigation/utils/TypefaceLoaderTest.java

@@ -2,7 +2,6 @@ package com.reactnativenavigation.utils;
 
 import android.content.*;
 import android.graphics.*;
-import android.test.mock.*;
 
 import com.reactnativenavigation.*;
 
@@ -12,47 +11,45 @@ import org.mockito.*;
 import static org.assertj.core.api.Java6Assertions.*;
 
 public class TypefaceLoaderTest extends BaseTest {
+    private TypefaceLoader uut;
+    @Override
+    public void beforeEach() {
+        Context context = Mockito.mock(Context.class);
+        uut = Mockito.spy(new TypefaceLoader(context));
+    }
 
     @Test
     public void loadTypefaceNoAssets() {
-        Context context = new MockContext();
-        TypefaceLoader mockedLoader = Mockito.spy(new TypefaceLoader(context));
-        Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets("Helvetica-Bold");
+        Mockito.doReturn(null).when(uut).getTypefaceFromAssets("Helvetica-Bold");
 
-        Typeface typeface = mockedLoader.getTypeFace("Helvetica-Bold");
+        Typeface typeface = uut.getTypeFace("Helvetica-Bold");
         assertThat(typeface).isNotNull();
         assertThat(typeface.getStyle()).isEqualTo(Typeface.BOLD);
     }
 
     @Test
     public void loadTypefaceWithAssets() {
-        Context context = new MockContext();
-        TypefaceLoader mockedLoader = Mockito.spy(new TypefaceLoader(context));
-        Mockito.doReturn(Typeface.create("Helvetica-Italic", Typeface.ITALIC)).when(mockedLoader).getTypefaceFromAssets("Helvetica-Italic");
+        Mockito.doReturn(Typeface.create("Helvetica-Italic", Typeface.ITALIC)).when(uut).getTypefaceFromAssets("Helvetica-Italic");
 
-        Typeface typeface = mockedLoader.getTypeFace("Helvetica-Italic");
+        Typeface typeface = uut.getTypeFace("Helvetica-Italic");
         assertThat(typeface).isNotNull();
         assertThat(typeface.getStyle()).isEqualTo(Typeface.ITALIC);
     }
 
     @Test
     public void loadTypefaceWrongName() {
-        Context context = new MockContext();
-        TypefaceLoader mockedLoader = Mockito.spy(new TypefaceLoader(context));
-        Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets("Some-name");
+        Mockito.doReturn(null).when(uut).getTypefaceFromAssets("Some-name");
 
-        Typeface typeface = mockedLoader.getTypeFace("Some-name");
+        Typeface typeface = uut.getTypeFace("Some-name");
         assertThat(typeface).isNotNull();
         assertThat(typeface.getStyle()).isEqualTo(Typeface.NORMAL);
     }
 
     @Test
     public void loadTypefaceNull() {
-        Context context = new MockContext();
-        TypefaceLoader mockedLoader = Mockito.spy(new TypefaceLoader(context));
-        Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets(null);
+        Mockito.doReturn(null).when(uut).getTypefaceFromAssets(null);
 
-        Typeface typeface = mockedLoader.getTypeFace(null);
+        Typeface typeface = uut.getTypeFace(null);
         assertThat(typeface).isNull();
     }
 }

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -213,6 +213,7 @@
 		50887C1620ECC5C200D06111 /* RNNButtonOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50887C1420ECC5C200D06111 /* RNNButtonOptions.m */; };
 		50887CA920F26BFE00D06111 /* RNNOverlayWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */; };
 		50887CAA20F26BFE00D06111 /* RNNOverlayWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */; };
+		508EBDBD2278746400BEC144 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 508EBDBA2278742700BEC144 /* JavaScriptCore.framework */; };
 		509B2480217873FF00C83C23 /* UINavigationController+RNNOptionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 509B247F217873FF00C83C23 /* UINavigationController+RNNOptionsTest.m */; };
 		509B258F2178BE7A00C83C23 /* RNNNavigationControllerPresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 509B258E2178BE7A00C83C23 /* RNNNavigationControllerPresenterTest.m */; };
 		50A00C37200F84D6000F01A6 /* RNNOverlayOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */; };
@@ -266,7 +267,6 @@
 		7B49FECE1E95098500DEB3EA /* RNNCommandsHandlerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B49FEC91E95098500DEB3EA /* RNNCommandsHandlerTest.m */; };
 		7B49FECF1E95098500DEB3EA /* RNNNavigationStackManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B49FECA1E95098500DEB3EA /* RNNNavigationStackManagerTest.m */; };
 		7B49FEDF1E950A7A00DEB3EA /* libcxxreact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B49FED11E950A7A00DEB3EA /* libcxxreact.a */; };
-		7B49FEE01E950A7A00DEB3EA /* libjschelpers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B49FED21E950A7A00DEB3EA /* libjschelpers.a */; };
 		7B49FEE11E950A7A00DEB3EA /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B49FED31E950A7A00DEB3EA /* libRCTActionSheet.a */; };
 		7B49FEE21E950A7A00DEB3EA /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B49FED41E950A7A00DEB3EA /* libRCTAnimation.a */; };
 		7B49FEE31E950A7A00DEB3EA /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B49FED51E950A7A00DEB3EA /* libRCTGeolocation.a */; };
@@ -554,6 +554,7 @@
 		50887C1420ECC5C200D06111 /* RNNButtonOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNButtonOptions.m; sourceTree = "<group>"; };
 		50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNOverlayWindow.m; sourceTree = "<group>"; };
 		50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNOverlayWindow.h; sourceTree = "<group>"; };
+		508EBDBA2278742700BEC144 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		509B247F217873FF00C83C23 /* UINavigationController+RNNOptionsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+RNNOptionsTest.m"; sourceTree = "<group>"; };
 		509B258E2178BE7A00C83C23 /* RNNNavigationControllerPresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationControllerPresenterTest.m; sourceTree = "<group>"; };
 		50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNOverlayOptions.h; sourceTree = "<group>"; };
@@ -680,8 +681,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				508EBDBD2278746400BEC144 /* JavaScriptCore.framework in Frameworks */,
 				7B49FEDF1E950A7A00DEB3EA /* libcxxreact.a in Frameworks */,
-				7B49FEE01E950A7A00DEB3EA /* libjschelpers.a in Frameworks */,
 				7B49FEE11E950A7A00DEB3EA /* libRCTActionSheet.a in Frameworks */,
 				7B49FEE21E950A7A00DEB3EA /* libRCTAnimation.a in Frameworks */,
 				7B49FEE31E950A7A00DEB3EA /* libRCTGeolocation.a in Frameworks */,
@@ -1093,6 +1094,7 @@
 		7B49FED01E950A7A00DEB3EA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				508EBDBA2278742700BEC144 /* JavaScriptCore.framework */,
 				501214C8217741A000435148 /* libOCMock.a */,
 				7B49FED11E950A7A00DEB3EA /* libcxxreact.a */,
 				7B49FED21E950A7A00DEB3EA /* libjschelpers.a */,

metro.config.js

@@ -3,8 +3,16 @@ module.exports = {
   watchFolders: [
     __dirname
   ],
+  resolver: {
+    sourceExts: ['ts', 'tsx', 'js']
+  },
   transformer: {
-    babelTransformerPath: require.resolve('react-native-typescript-transformer')
+    babelTransformerPath: require.resolve('react-native-typescript-transformer'),
+    getTransformOptions: async () => ({
+      transform: {
+        experimentalImportSupport: false,
+        inlineRequires: false,
+      },
+    })
   }
 };
-

package.json

@@ -53,21 +53,23 @@
     "tslib": "1.9.3"
   },
   "devDependencies": {
+    "@babel/plugin-proposal-export-default-from": "7.2.0",
+    "@babel/plugin-proposal-export-namespace-from": "7.2.0",
     "@types/hoist-non-react-statics": "^3.0.1",
     "@types/jest": "23.x.x",
     "@types/lodash": "4.x.x",
     "@types/react": "16.x.x",
     "@types/react-native": "0.57.7",
     "@types/react-test-renderer": "16.x.x",
-    "jsc-android": "236355.x.x",
     "detox": "12.x.x",
     "react-native-ui-lib": "3.24.2",
     "handlebars": "4.x.x",
-    "jest": "23.x.x",
-    "metro-react-native-babel-preset": "0.50.0",
-    "react": "16.6.1",
-    "react-native": "0.57.7",
-    "react-native-typescript-transformer": "^1.2.10",
+    "jest": "24.0.0-alpha.6",
+    "jsc-android": "236355.x.x",
+    "metro-react-native-babel-preset": "0.52.x",
+    "react": "16.8.3",
+    "react-native": "0.59.5",
+    "react-native-typescript-transformer": "1.2.12",
     "react-native-view-overflow": "0.0.3",
     "react-redux": "5.x.x",
     "react-test-renderer": "16.6.1",

playground/android/build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = '1.3.21'
+    ext.kotlinVersion = '1.3.31'
     ext.detoxKotlinVersion = ext.kotlinVersion
 
     repositories {
@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
         // NOTE: Do not place your application dependencies here; they belong

playground/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

playground/ios/playground.xcodeproj/project.pbxproj

@@ -13,7 +13,6 @@
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		50451D35204451A900695F00 /* RNNCustomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50451D34204451A800695F00 /* RNNCustomViewController.m */; };
 		7B8F30491E84151300110AEC /* libcxxreact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8F2FDE1E840F3600110AEC /* libcxxreact.a */; };
-		7B8F304A1E84151300110AEC /* libjschelpers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8F2FE21E840F3600110AEC /* libjschelpers.a */; };
 		7B8F304B1E84151300110AEC /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8F2FFA1E8411A800110AEC /* libRCTActionSheet.a */; };
 		7B8F304C1E84151300110AEC /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8F2FEB1E840F6700110AEC /* libRCTAnimation.a */; };
 		7B8F304D1E84151300110AEC /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8F300C1E84124A00110AEC /* libRCTGeolocation.a */; };
@@ -27,6 +26,7 @@
 		7B8F30551E84151300110AEC /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8F2FD61E840F3600110AEC /* libReact.a */; };
 		7B8F30561E84151300110AEC /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8F2FC91E840F1A00110AEC /* libReactNativeNavigation.a */; };
 		7B8F30571E84151300110AEC /* libyoga.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8F2FDA1E840F3600110AEC /* libyoga.a */; };
+		E5046080227748EA00212BD8 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E504607F227748EA00212BD8 /* JavaScriptCore.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -44,13 +44,6 @@
 			remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
 			remoteInfo = "fishhook-tvOS";
 		};
-		501223FD2173591A000F5F98 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
-			remoteInfo = "privatedata-tvOS";
-		};
 		7B49FF081E950AF400DEB3EA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B8F2FC41E840F1A00110AEC /* ReactNativeNavigation.xcodeproj */;
@@ -107,20 +100,6 @@
 			remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
 			remoteInfo = "cxxreact-tvOS";
 		};
-		7B8F2FE11E840F3600110AEC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
-			remoteInfo = jschelpers;
-		};
-		7B8F2FE31E840F3600110AEC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
-			remoteInfo = "jschelpers-tvOS";
-		};
 		7B8F2FEA1E840F6700110AEC /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B8F2FE51E840F6700110AEC /* RCTAnimation.xcodeproj */;
@@ -240,12 +219,47 @@
 			remoteGlobalIDString = 2D2A28881D9B049200D4039D;
 			remoteInfo = "RCTWebSocket-tvOS";
 		};
-		E506412420A3138100EC769F /* PBXContainerItemProxy */ = {
+		E5046070227748DD00212BD8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
-			remoteInfo = privatedata;
+			remoteGlobalIDString = EBF21BDC1FC498900052F4D5;
+			remoteInfo = jsinspector;
+		};
+		E5046072227748DD00212BD8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5;
+			remoteInfo = "jsinspector-tvOS";
+		};
+		E5046074227748DD00212BD8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EDEBC6D6214B3E7000DD5AC8;
+			remoteInfo = jsi;
+		};
+		E5046076227748DD00212BD8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EDEBC73B214B45A300DD5AC8;
+			remoteInfo = jsiexecutor;
+		};
+		E5046078227748DD00212BD8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = ED296FB6214C9A0900B7C4FE;
+			remoteInfo = "jsi-tvOS";
+		};
+		E504607A227748DD00212BD8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7B8F2FCA1E840F3600110AEC /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = ED296FEE214C9CF800B7C4FE;
+			remoteInfo = "jsiexecutor-tvOS";
 		};
 		E8CB6AA71FF10BC4007C82EF /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -299,6 +313,7 @@
 		7B8F30311E8412A600110AEC /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
 		7B8F303A1E8412B700110AEC /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = "<group>"; };
 		7B8F30401E8412E100110AEC /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; };
+		E504607F227748EA00212BD8 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -306,8 +321,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E5046080227748EA00212BD8 /* JavaScriptCore.framework in Frameworks */,
 				7B8F30491E84151300110AEC /* libcxxreact.a in Frameworks */,
-				7B8F304A1E84151300110AEC /* libjschelpers.a in Frameworks */,
 				7B8F304B1E84151300110AEC /* libRCTActionSheet.a in Frameworks */,
 				7B8F304C1E84151300110AEC /* libRCTAnimation.a in Frameworks */,
 				7B8F304D1E84151300110AEC /* libRCTGeolocation.a in Frameworks */,
@@ -360,14 +375,16 @@
 				7B8F2FDC1E840F3600110AEC /* libyoga.a */,
 				7B8F2FDE1E840F3600110AEC /* libcxxreact.a */,
 				7B8F2FE01E840F3600110AEC /* libcxxreact.a */,
-				7B8F2FE21E840F3600110AEC /* libjschelpers.a */,
-				7B8F2FE41E840F3600110AEC /* libjschelpers.a */,
+				E5046071227748DD00212BD8 /* libjsinspector.a */,
+				E5046073227748DD00212BD8 /* libjsinspector-tvOS.a */,
 				E8CB6AA81FF10BC4007C82EF /* libthird-party.a */,
 				E8CB6AAA1FF10BC4007C82EF /* libthird-party.a */,
 				E8CB6AAC1FF10BC4007C82EF /* libdouble-conversion.a */,
 				E8CB6AAE1FF10BC4007C82EF /* libdouble-conversion.a */,
-				E506412520A3138100EC769F /* libprivatedata.a */,
-				501223FE2173591A000F5F98 /* libprivatedata-tvOS.a */,
+				E5046075227748DD00212BD8 /* libjsi.a */,
+				E5046077227748DD00212BD8 /* libjsiexecutor.a */,
+				E5046079227748DD00212BD8 /* libjsi-tvOS.a */,
+				E504607B227748DD00212BD8 /* libjsiexecutor-tvOS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -486,6 +503,7 @@
 				13B07FAE1A68108700A75B9A /* playground */,
 				832341AE1AAA6A7D00B99B32 /* Libraries */,
 				83CBBA001A601CBA00E9B192 /* Products */,
+				E504607E227748E900212BD8 /* Frameworks */,
 			);
 			indentWidth = 4;
 			sourceTree = "<group>";
@@ -500,6 +518,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		E504607E227748E900212BD8 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				E504607F227748EA00212BD8 /* JavaScriptCore.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -618,13 +644,6 @@
 			remoteRef = 39D599B0200F3D5C00A3B2ED /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		501223FE2173591A000F5F98 /* libprivatedata-tvOS.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libprivatedata-tvOS.a";
-			remoteRef = 501223FD2173591A000F5F98 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		7B49FF091E950AF400DEB3EA /* ReactNativeNavigationTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
@@ -681,20 +700,6 @@
 			remoteRef = 7B8F2FDF1E840F3600110AEC /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		7B8F2FE21E840F3600110AEC /* libjschelpers.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libjschelpers.a;
-			remoteRef = 7B8F2FE11E840F3600110AEC /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		7B8F2FE41E840F3600110AEC /* libjschelpers.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libjschelpers.a;
-			remoteRef = 7B8F2FE31E840F3600110AEC /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		7B8F2FEB1E840F6700110AEC /* libRCTAnimation.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -814,11 +819,46 @@
 			remoteRef = 7B8F30471E8412E100110AEC /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		E506412520A3138100EC769F /* libprivatedata.a */ = {
+		E5046071227748DD00212BD8 /* libjsinspector.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjsinspector.a;
+			remoteRef = E5046070227748DD00212BD8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		E5046073227748DD00212BD8 /* libjsinspector-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libjsinspector-tvOS.a";
+			remoteRef = E5046072227748DD00212BD8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		E5046075227748DD00212BD8 /* libjsi.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjsi.a;
+			remoteRef = E5046074227748DD00212BD8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		E5046077227748DD00212BD8 /* libjsiexecutor.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjsiexecutor.a;
+			remoteRef = E5046076227748DD00212BD8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		E5046079227748DD00212BD8 /* libjsi-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libjsi-tvOS.a";
+			remoteRef = E5046078227748DD00212BD8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		E504607B227748DD00212BD8 /* libjsiexecutor-tvOS.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = libprivatedata.a;
-			remoteRef = E506412420A3138100EC769F /* PBXContainerItemProxy */;
+			path = "libjsiexecutor-tvOS.a";
+			remoteRef = E504607A227748DD00212BD8 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		E8CB6AA81FF10BC4007C82EF /* libthird-party.a */ = {
@@ -876,7 +916,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh ./index.js";
+			shellScript = "export NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh ./index.js\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

playground/src/screens/LifecycleScreen.js

@@ -37,7 +37,9 @@ class LifecycleScreen extends React.Component {
   }
 
   componentWillUnmount() {
-    alert('componentWillUnmount'); // eslint-disable-line no-alert
+    setTimeout(() => {
+      alert('componentWillUnmount'); // eslint-disable-line no-alert
+    }, 100); 
   }
 
   navigationButtonPressed(id) {

scripts/test-e2e.js

@@ -10,17 +10,11 @@ const multi = _.includes(process.argv, '--multi');
 run();
 
 function run() {
-    const platform = android ? `android` : `ios`;
     const prefix = android ? `android.emu` : `ios.sim`;
     const suffix = release ? `release` : `debug`;
     const configuration = `${prefix}.${suffix}`;
     const headless$ = android ? headless ? `--headless` : `` : ``;
     const workers = multi ? 3 : 1;
-    
-    if (platform === 'android' && process.env.JENKINS_CI) {
-        const sdkmanager = '/usr/local/share/android-sdk/tools/bin/sdkmanager';
-        exec.execSync(`echo y | ${sdkmanager} --update && echo y | ${sdkmanager} --licenses`);
-    }
 
     if (!skipBuild) {
         exec.execSync(`detox build --configuration ${configuration}`);

scripts/test-unit.js

@@ -14,7 +14,11 @@ function run() {
 
 function runAndroidUnitTests() {
   const conf = release ? 'testReactNative57_5ReleaseUnitTest' : 'testReactNative57_5DebugUnitTest';
-
+  if (android && process.env.JENKINS_CI) {
+    const sdkmanager = '/usr/local/share/android-sdk/tools/bin/sdkmanager';
+    exec.execSync(`yes | ${sdkmanager} --licenses`);
+    // exec.execSync(`echo y | ${sdkmanager} --update && echo y | ${sdkmanager} --licenses`);
+  }
   exec.execSync(`cd lib/android && ./gradlew ${conf}`);
 }