chore(test-app): fix CI build

* ci: fix android

* chore(test-app): don't touch gradle version

* chore(test-app): fix to [email protected]

* chore(test-app): link JSC to iOS project

* chore(e2e): better timeout logic

* chore(test-app): 5 seconds interval

Author: fathyb

.circleci/config.yml

@@ -95,7 +95,7 @@ jobs:
   test-android:
     <<: *job
     docker:
-      - image: circleci/android:api-26-node8-alpha
+      - image: circleci/android:api-26-node
     steps:
       - checkout
       - *getDeps

packages/test-app/e2e/main.spec.js

@@ -40,12 +40,15 @@ const callProperties = {
 
 async function hasMatchingCall(type, name, props) {
 	const properties = callProperties[type]
+	const interval = 10 * 1000 // 10 seconds
+	const timeout = 5 * 60 * 1000 // 5 minutes
+	const start = Date.now()
 
 	if (!properties) {
 		throw new Error(`Unknown call type ${type}`)
 	}
 
-	for (let i = 0; i < 10; i++) {
+	while (Date.now() - start < timeout) {
 		const headers = {
 			Authorization: 'Basic ' + Buffer.from(E2E_TOKEN + ':').toString('base64')
 		}
@@ -68,7 +71,7 @@ async function hasMatchingCall(type, name, props) {
 			return
 		}
 
-		await sleep(1000)
+		await sleep(interval)
 	}
 
 	throw new Error('Cannot find call')

packages/test-app/generate.sh

@@ -8,7 +8,7 @@ integrations_require=""
 
 rm -rf project
 
-yarn react-native init project
+yarn react-native init project [email protected]
 
 cp -r src/* project/
 cd project

packages/test-app/src/project.xcodeproj/project.pbxproj

@@ -36,6 +36,7 @@
 		2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
 		2DCD954D1E0B4F2C00145EB5 /* projectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* projectTests.m */; };
 		2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
+		4B24FA70224D445500D16B87 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B24FA6F224D445500D16B87 /* JavaScriptCore.framework */; };
 		4B8D0EA721BF5D040019C020 /* Analytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B8D0EA621BF5D040019C020 /* Analytics.framework */; };
 		4B8D0EA821BF5D040019C020 /* Analytics.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4B8D0EA621BF5D040019C020 /* Analytics.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
@@ -363,6 +364,7 @@
 		2D02E47B1E0B4A5D006451C7 /* project-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "project-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D02E4901E0B4A5D006451C7 /* project-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "project-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B24FA6F224D445500D16B87 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		4B8D0EA021BF3E2F0019C020 /* Analytics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Analytics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B8D0EA221BF5C890019C020 /* Analytics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Analytics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B8D0EA621BF5D040019C020 /* Analytics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Analytics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -387,6 +389,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4B24FA70224D445500D16B87 /* JavaScriptCore.framework in Frameworks */,
 				ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
 				11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */,
 				146834051AC3E58100842450 /* libReact.a in Frameworks */,
@@ -549,6 +552,7 @@
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				4B24FA6F224D445500D16B87 /* JavaScriptCore.framework */,
 				4B8D0EA021BF3E2F0019C020 /* Analytics.framework */,
 				2D16E6891FA4F8E400B85C8A /* libReact.a */,
 			);
@@ -760,6 +764,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);

packages/test-app/test_android.sh

@@ -6,9 +6,6 @@ pushd project
     pushd android
         export GRADLE_OPTS="-Xmx1024m"
 
-        # Upgrade the Gradle wrapper to 4.6
-        ./gradlew wrapper --gradle-version=4.6
-
         yarn react-native link
     popd
 popd