Merge remote-tracking branch 'origin/master' into @shwanton/turbomodule-ios-working

# Conflicts:
#	example/android/build.gradle
#	example/android/gradle/wrapper/gradle-wrapper.properties
#	package.json
#	yarn.lock

Author: Shawn Dempsey

.github/workflows/ci.yml

@@ -8,6 +8,9 @@ jobs:
   review:
     name: Review
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test-name: [lint, ts]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -17,14 +20,9 @@ jobs:
           node-version: 16
           cache: yarn
       - name: Install JS dependencies
-        run: |
-          yarn
-      - name: Lint
-        run: |
-          yarn test:lint
-      - name: TypeScript
-        run: |
-          yarn test:ts
+        run: yarn
+      - name: Run test ${{ matrix.test-name }}
+        run: yarn test:${{ matrix.test-name }}
   android:
     name: Android
     runs-on: ubuntu-22.04
@@ -83,6 +81,7 @@ jobs:
         run: |
           yarn build:e2e:ios
       - name: Test
+        if: false
         run: |
           yarn test:e2e:ios
   macos:
@@ -112,12 +111,16 @@ jobs:
         run: |
           pod install
         working-directory: example/macos
-      - name: Build and test
+      - name: Build
+        run: |
+          yarn build:e2e:macos
+      - name: Test
+        if: false
         run: |
           yarn test:e2e:macos
   windows:
     name: Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@v1.3
@@ -142,6 +145,7 @@ jobs:
   release:
     name: Release
     needs: [review, android, ios, macos, windows]
+    if: github.event_name == 'push'
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout

.yarnrc.yml

@@ -8,4 +8,17 @@ logFilters:
     level: discard
 nodeLinker: node-modules
 npmRegistryServer: "https://registry.npmjs.org"
+packageExtensions:
+  "@expo/cli@*":
+    peerDependencies:
+      "expo-modules-autolinking": "*"
+  "babel-preset-expo@*":
+    peerDependencies:
+      "@babel/core": "^7.0.0-0"
+  "expo@*":
+    peerDependencies:
+      "@babel/core": "^7.0.0-0"
+  "expo-asset@*":
+    peerDependencies:
+      "expo": "*"
 yarnPath: .yarn/releases/yarn-3.4.1.cjs

example/App.tsx

@@ -31,7 +31,7 @@ export default function App(): JSX.Element {
   const [iteration, setIteration] = useState(0);
   const [currentTest, setCurrentTest] = useState(SCREENS.Functional);
 
-  const dismissKeyboard = useCallback(Keyboard.dismiss, []);
+  const dismissKeyboard = useCallback(() => Keyboard.dismiss(), []);
   const simulateRestart = useCallback(
     () => setIteration(iteration + 1),
     [iteration]

example/android/build.gradle

@@ -64,13 +64,6 @@ allprojects {
         }
     }
 
-    repositories {
-        maven {
-            url("$rootDir/../../node_modules/detox/Detox-android")
-        }
-        mavenCentral()
-        google()
-    }
     afterEvaluate { project ->
         def androidExtension = project.extensions.findByName('android')
 
@@ -100,13 +93,8 @@ allprojects {
             }
             androidExtension.testBuildType = 'release'
             androidExtension.sourceSets.androidTest.java.srcDirs += "$rootDir/app/src/androidTest/java"
-            if(System.getenv("CIRCLECI") == "true") {
-                // explicitly apply NDK version available in CI image
-                androidExtension.ndkVersion = "20.1.5948944"
-            }
-            project.dependencies {
-                androidTestImplementation('com.wix:detox:+')
 
+            project.dependencies {
                 def hermesDir = file('../../node_modules/hermes-engine/android').absolutePath
                 nextImplementation files("$hermesDir/hermes-release.aar")
             }

example/android/gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

example/android/gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

example/android/gradlew.bat

@@ -80,15 +80,15 @@ async function execute(steps: TestStep[]): Promise<void> {
 function Functional(): JSX.Element {
   const [results, setResults] = useState<[string, TestResult?][]>([]);
   useEffect(() => {
-    const results: [string, TestResult?][] = [];
+    const testResults: [string, TestResult?][] = [];
     Promise.resolve()
       .then(async () => {
         for (const [name, test] of Object.entries(tests)) {
           try {
             await execute(test);
-            results.push([name, undefined]);
+            testResults.push([name, undefined]);
           } catch (e: any) {
-            results.push([name, e]);
+            testResults.push([name, e]);
           }
         }
       })
@@ -100,15 +100,15 @@ function Functional(): JSX.Element {
           const name = currentName + ' with delegate';
 
           if (!AsyncStorageTestSupport?.test_setDelegate) {
-            results.push([name, SKIP_TEST]);
+            testResults.push([name, SKIP_TEST]);
             continue;
           }
 
           const isNativeDelegateSet = await new Promise((resolve) => {
             AsyncStorageTestSupport.test_setDelegate(resolve);
           });
           if (!isNativeDelegateSet) {
-            results.push([
+            testResults.push([
               name,
               {
                 step: 0,
@@ -121,27 +121,31 @@ function Functional(): JSX.Element {
 
           try {
             await execute(test);
-            results.push([name, undefined]);
+            testResults.push([name, undefined]);
           } catch (e: any) {
-            results.push([name, e]);
+            testResults.push([name, e]);
             await new Promise((resolve) => {
               AsyncStorageTestSupport.test_unsetDelegate(resolve);
             });
           }
         }
       })
-      .then(() => setResults(results));
+      .then(() => setResults(testResults));
   }, []);
   return (
-    <ScrollView contentContainerStyle={{ flexGrow: 1 }}>
+    <ScrollView contentContainerStyle={styles.container}>
       <View>
         {results.map(([name, result]) => {
           const testID = 'test:' + name;
           if (!result) {
             return (
               <View key={name} style={styles.passed}>
                 <Text style={styles.testLabel}>{name}</Text>
-                <Text accessibilityLabel="Pass" testID={testID}>
+                <Text
+                  accessibilityLabel="Pass"
+                  testID={testID}
+                  style={styles.testResult}
+                >
                   Pass
                 </Text>
               </View>
@@ -152,7 +156,11 @@ function Functional(): JSX.Element {
             return (
               <View key={name} style={styles.skipped}>
                 <Text style={styles.testLabel}>{name}</Text>
-                <Text accessibilityLabel="Skip" testID={testID}>
+                <Text
+                  accessibilityLabel="Skip"
+                  testID={testID}
+                  style={styles.testResult}
+                >
                   Skip
                 </Text>
               </View>
@@ -163,9 +171,15 @@ function Functional(): JSX.Element {
             <View key={name} style={styles.failed}>
               <Text style={styles.testLabel}>{name}</Text>
               <View accessibilityLabel="Fail" testID={testID}>
-                <Text>{`Step: ${result.step + 1}`}</Text>
-                <Text>{`Expected: ${stringify(result.expected)}`}</Text>
-                <Text>{`Actual: ${result.actual}`}</Text>
+                <Text style={styles.testResult}>{`Step: ${
+                  result.step + 1
+                }`}</Text>
+                <Text style={styles.testResult}>{`Expected: ${stringify(
+                  result.expected
+                )}`}</Text>
+                <Text
+                  style={styles.testResult}
+                >{`Actual: ${result.actual}`}</Text>
               </View>
             </View>
           );
@@ -176,6 +190,9 @@ function Functional(): JSX.Element {
 }
 
 const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+  },
   failed: {
     backgroundColor: '#e53935',
     flex: 1,
@@ -193,8 +210,12 @@ const styles = StyleSheet.create({
     padding: 4,
   },
   testLabel: {
+    color: '#000000',
     flex: 1,
   },
+  testResult: {
+    color: '#000000',
+  },
 });
 
 export default {